diff --git a/Android.mk b/Android.mk
index cafe3bffa26e7e47e97a4fbb2567b022a0aba2a0..c59d938f31937cc5e7cc18b2da3ffb58fa18d420 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,9 +22,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 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 7057413a8ddf89193694af2a3c6457fc7d609d83..3be956217d3a42f9874d110ea50589d2a86e2ac1 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" />
@@ -82,6 +83,7 @@
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.DELETE_PACKAGES"/>
     <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
+    <uses-permission android:name="android.permission.NETWORK_SETTINGS" />
 
     <application android:label="@string/settings_label"
             android:icon="@drawable/ic_launcher_settings"
@@ -166,8 +168,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 +193,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 +208,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 +267,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">
@@ -407,6 +406,18 @@
                 android:value="com.android.settings.bluetooth.BluetoothSettings" />
         </activity>
 
+        <activity android:name="Settings$AssistGestureSettingsActivity"
+            android:label="@string/assist_gesture_title"
+            android:icon="@drawable/ic_settings_gestures"
+            android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.settings.ASSIST_GESTURE_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.gestures.AssistGestureSettings" />
+        </activity>
+
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".bluetooth.BluetoothSettings"
                 android:label="@string/bluetooth_settings_title"
@@ -545,7 +556,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 +632,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">
@@ -761,25 +772,6 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name="Settings$ZenModeAutomationSuggestionActivity"
-                android:label="@string/zen_mode_automation_settings_title"
-                android:icon="@drawable/ic_settings_notifications"
-                android:exported="true"
-                android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
-            </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" />
-            <meta-data android:name="com.android.settings.title"
-                android:resource="@string/zen_mode_automation_suggestion_title" />
-            <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/zen_mode_automation_suggestion_summary" />
-        </activity>
-
         <activity android:name="Settings$WallpaperSettingsActivity"
                   android:label="@string/wallpaper_settings_fragment_title"
                   android:icon="@drawable/ic_wallpaper"
@@ -792,14 +784,37 @@
                   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.FIRST_IMPRESSION" />
+            </intent-filter>
+            <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.PERSONALIZE" />
             </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" />
+            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
+        </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"
@@ -895,6 +910,11 @@
                 android:enabled="@*android:bool/config_nightDisplayAvailable"
                 android:icon="@drawable/ic_settings_night_display"
                 android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -958,11 +978,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"
@@ -1424,6 +1439,7 @@
         </activity>
 
         <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
+                android:icon="@drawable/ic_accessibility_suggestion"
                 android:label="@string/vision_settings_title"
                 android:theme="@style/SetupWizardAccessibilityTheme"
                 android:taskAffinity="com.android.wizard" >
@@ -1431,6 +1447,14 @@
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.DISPLAY_SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.title"
+                android:resource="@string/vision_settings_suggestion_title" />
+            <meta-data android:name="com.android.settings.icon_tintable"
+                android:value="true" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1502,17 +1526,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 +1561,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" />
@@ -1540,10 +1569,11 @@
                        android:resource="@string/notification_suggestion_title" />
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/notification_suggestion_summary" />
+            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
         </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,30 +1583,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"/>
-
-        <activity
-            android:name=".Settings$FingerprintSuggestionActivity"
-            android:label="@string/security_settings_fingerprint_preference_title"
-            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" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.dismiss"
-                android:value="10,30" />
-            <meta-data android:name="com.android.settings.require_feature"
-                android:value="android.hardware.fingerprint" />
-            <meta-data android:name="com.android.settings.title"
-                android:resource="@string/suggestion_additional_fingerprints" />
-            <meta-data android:name="com.android.settings.summary"
-                android:resource="@string/suggestion_additional_fingerprints_summary" />
-        </activity>
+            android:theme="@style/GlifTheme.Light"/>
 
         <activity android:name=".fingerprint.FingerprintSettings" android:exported="false"/>
         <activity android:name=".fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
@@ -1590,27 +1602,51 @@
         <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" />
             </intent-filter>
         </activity>
 
+        <activity android:name=".fingerprint.FingerprintSuggestionActivity"
+            android:exported="true"
+            android:permission="android.permission.MANAGE_FINGERPRINT"
+            android:icon="@drawable/ic_suggestion_fingerprint"
+            android:theme="@style/GlifTheme.Light">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.FINGERPRINT_ENROLL" />
+            </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="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"
+                android:resource="@string/suggestion_additional_fingerprints" />
+            <meta-data android:name="com.android.settings.summary"
+                android:resource="@string/suggestion_additional_fingerprints_summary" />
+            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
+        </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 +1654,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" />
@@ -1647,16 +1683,17 @@
                        android:resource="@string/suggested_lock_settings_title" />
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/suggested_lock_settings_summary" />
+            <meta-data android:name="com.android.settings.icon_tintable" android:value="true" />
         </activity>
 
         <activity android:name=".Settings$FingerprintEnrollSuggestionActivity"
             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 +1702,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"
@@ -1961,6 +1998,7 @@
 
         <activity android:name=".bluetooth.BluetoothPairingDialog"
                   android:excludeFromRecents="true"
+                  android:windowSoftInputMode="stateVisible|adjustResize"
                   android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
@@ -2366,7 +2404,7 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.DreamSettings" />
+                android:value="com.android.settings.dream.DreamSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
         </activity>
@@ -2535,8 +2573,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 +2636,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 +2651,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 +2820,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 +2933,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 +2998,12 @@
                        android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />
         </activity>
 
+        <activity android:name="Settings$LegacySupportActivity"
+                  android:label="@string/page_tab_title_support">
+            <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 +3053,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.DeviceDefault.Light.Panel"
                   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 +3131,99 @@
             android:permission="android.permission.DUMP"
             android:enabled="@bool/config_has_help" />
 
+
+        <!-- Activities for moves/gestures suggestions -->
+        <activity
+            android:name=".Settings$DoubleTapPowerSuggestionActivity"
+            android:label="@string/double_tap_power_for_camera_title"
+            android:icon="@drawable/ic_suggestion_gesture">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.GESTURE" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="4,8,30" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.gestures.DoubleTapPowerSettings"/>
+            <meta-data android:name="com.android.settings.title"
+                       android:resource="@string/double_tap_power_for_camera_suggestion_title" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/double_tap_power_for_camera_suggestion_summary" />
+        </activity>
+
+        <activity
+            android:name=".Settings$DoubleTwistSuggestionActivity"
+            android:label="@string/double_twist_for_camera_mode_title"
+            android:icon="@drawable/ic_suggestion_gesture">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.GESTURE" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="4,8,30" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.gestures.DoubleTwistGestureSettings"/>
+            <meta-data android:name="com.android.settings.title"
+                       android:resource="@string/double_twist_for_camera_suggestion_title" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/double_twist_for_camera_suggestion_summary" />
+        </activity>
+
+        <activity
+            android:name=".Settings$AmbientDisplaySuggestionActivity"
+            android:label="@string/ambient_display_title"
+            android:icon="@drawable/ic_suggestion_gesture">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.GESTURE" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="9,13,30" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.gestures.DoubleTapScreenSettings"/>
+            <meta-data android:name="com.android.settings.title"
+                       android:resource="@string/ambient_display_title" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/ambient_display_suggestion_summary" />
+        </activity>
+
+        <activity
+            android:name=".Settings$AmbientDisplayPickupSuggestionActivity"
+            android:label="@string/ambient_display_pickup_title"
+            android:icon="@drawable/ic_suggestion_gesture">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.GESTURE" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="9,13,30" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.gestures.PickupGestureSettings"/>
+            <meta-data android:name="com.android.settings.title"
+                       android:resource="@string/ambient_display_pickup_title" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/ambient_display_pickup_suggestion_summary" />
+        </activity>
+
+        <activity
+            android:name=".Settings$SwipeToNotificationSuggestionActivity"
+            android:label="@string/fingerprint_swipe_for_notifications_title"
+            android:icon="@drawable/ic_suggestion_gesture">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.suggested.category.GESTURE" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="9,13,30" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.gestures.SwipeToNotificationSettings"/>
+            <meta-data android:name="com.android.settings.title"
+                       android:resource="@string/fingerprint_swipe_for_notifications_suggestion_title" />
+            <meta-data android:name="com.android.settings.summary"
+                       android:resource="@string/fingerprint_swipe_for_notifications_suggestion_summary" />
+        </activity>
+        <!-- End activities for moves/gestures suggestions -->
+
         <activity android:name=".applications.autofill.AutofillPickerActivity"
                 android:excludeFromRecents="true"
                 android:launchMode="singleInstance"
diff --git a/res/drawable/ic_music_note_vd_theme_24.xml b/res/drawable/ic_accessibility_suggestion.xml
similarity index 74%
rename from res/drawable/ic_music_note_vd_theme_24.xml
rename to res/drawable/ic_accessibility_suggestion.xml
index f31b023c2d462c21ac7959fec1a089177e450a8b..e21bd9f149d62974b82a98acf83cd9cc00d692d4 100644
--- a/res/drawable/ic_music_note_vd_theme_24.xml
+++ b/res/drawable/ic_accessibility_suggestion.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2017 The Android Open Source Project
 
@@ -13,13 +14,13 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
+        android:viewportHeight="24.0">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
-</vector>
\ No newline at end of file
+        android:fillColor="#ff767c81"
+        android:pathData="M9,4v3h5v12h3L17,7h5L22,4L9,4zM3,12h3v7h3v-7h3L12,9L3,9v3z"/>
+</vector>
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index 20146035b415ebf155de3a432da911107a9f7fde..f87a882a74bff52306a60c5288309c7f3bae1bc4 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 0000000000000000000000000000000000000000..cadd882ecc533cfb861fb20bb380f3a81b8f5420
--- /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 0000000000000000000000000000000000000000..63532cbe95a2657c6f8bd32fe2ae94a18e090dd4
--- /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 714a05e11b22b0bef7dbfa6ed93bda2fff69e7f9..e52f0f5e6bb9222be6616888735074b6d4630841 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_theaters_vd_theme_24.xml b/res/drawable/ic_local_movies.xml
similarity index 74%
rename from res/drawable/ic_theaters_vd_theme_24.xml
rename to res/drawable/ic_local_movies.xml
index d0bad1900919e5ef397ee6eb14b0f89dbe118ca3..99977237452a25c8523aae2a45e551dfba979ff1 100644
--- a/res/drawable/ic_theaters_vd_theme_24.xml
+++ b/res/drawable/ic_local_movies.xml
@@ -20,6 +20,6 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,3v2h-2L16,3L8,3v2L6,5L6,3L4,3v18h2v-2h2v2h8v-2h2v2h2L20,3h-2zM8,17L6,17v-2h2v2zM8,13L6,13v-2h2v2zM8,9L6,9L6,7h2v2zM18,17h-2v-2h2v2zM18,13h-2v-2h2v2zM18,9h-2L16,7h2v2z"/>
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M18,3v2h-2V3H8v2H6V3H5C4.45,3 4,3.45 4,4v16c0,0.55 0.45,1 1,1h1v-2h2v2h8v-2h2v2h1c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1H18zM8,17H6v-2h2V17zM8,13H6v-2h2V13zM8,9H6V7h2V9zM18,17h-2v-2h2V17zM18,13h-2v-2h2V13zM18,9h-2V7h2V9z"/>
+</vector>
diff --git a/res/drawable/ic_apps_vd_theme_24.xml b/res/drawable/ic_media_stream.xml
similarity index 76%
rename from res/drawable/ic_apps_vd_theme_24.xml
rename to res/drawable/ic_media_stream.xml
index ba59e838a965c26446eae4a74bae4d05f74a0457..4eb78bcf35b9f771659f76f669307bbf0504389d 100644
--- a/res/drawable/ic_apps_vd_theme_24.xml
+++ b/res/drawable/ic_media_stream.xml
@@ -20,6 +20,6 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"/>
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M18,3h-5c-0.55,0 -1,0.45 -1,1v8.3a3.88,3.88 0,0 0,-2.9 -0.04c-1.79,0.67 -3.11,2.35 -3.1,4.26A4.483,4.483 0,0 0,10.5 21c2.5,0 4.5,-2.3 4.5,-4.5V6h3c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1z"/>
+</vector>
diff --git a/res/drawable/ic_new_releases_24dp.xml b/res/drawable/ic_new_releases_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b8fbb201601b2311cd2d8c1e03e0608b381705cf
--- /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 0000000000000000000000000000000000000000..57591c2e8721cbe8489e6db40751361c3c11434a
--- /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 0000000000000000000000000000000000000000..003111ea6a7c2c5260ec99c07bbece7ba8bc4138
--- /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_photo_library_vd_theme_24.xml b/res/drawable/ic_photo_library.xml
similarity index 71%
rename from res/drawable/ic_photo_library_vd_theme_24.xml
rename to res/drawable/ic_photo_library.xml
index 3cd97fcf0a376ffd2becde60c1feec38ab0709d5..732a34858ae3dfe738ea3763e86c3863253b63e0 100644
--- a/res/drawable/ic_photo_library_vd_theme_24.xml
+++ b/res/drawable/ic_photo_library.xml
@@ -20,6 +20,6 @@
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/white"
-        android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
-</vector>
\ No newline at end of file
+        android:fillColor="#FF000000"
+        android:pathData="M22,16V4c0,-1.11 -0.9,-2 -2,-2H8C6.89,2 6,2.89 6,4v12c0,1.1 0.89,2 2,2h12C21.1,18 22,17.1 22,16zM11,12l2.03,2.71L16,11l4,5H8L11,12zM2,7v13c0,1.1 0.9,2 2,2h13c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H4.5C4.22,20 4,19.78 4,19.5V7c0,-0.55 -0.45,-1 -1,-1h0C2.45,6 2,6.45 2,7z"/>
+</vector>
diff --git a/res/drawable/ic_pin.xml b/res/drawable/ic_pin.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0176019e8a7050d2512c6f5258b7117a799c2353
--- /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 34c0bddec50d09d36d2a9de1e6202ef8a9b01259..15703123b6982155ad829c8309f9226a4d0c93c5 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_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml
index 7f161e2cce65b793ce7654e51454cd6588a155b4..178b131554586a40711dc68d25e2009c930e265a 100644
--- a/res/drawable/ic_settings_night_display.xml
+++ b/res/drawable/ic_settings_night_display.xml
@@ -16,12 +16,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
     android:tint="?android:attr/colorControlNormal">
-
     <path
         android:fillColor="#FFF"
-        android:pathData="M6,12c0,5.5,4.5,10,10,10c1,0,2-0.2,3-0.5c-4.1-1.3-7-5.1-7-9.5s2.9-8.3,7-9.5C18.1,2.2,17.1,2,16,2C10.5,2,6,6.5,6,12z" />
-
-</vector>
+        android:pathData="M13,12c0,-3.57 2.2,-6.62 5.31,-7.87 0.89,-0.36 0.75,-1.69 -0.19,-1.9 -1.1,-0.24 -2.27,-0.3 -3.48,-0.14 -4.51,0.6 -8.12,4.31 -8.59,8.83C5.43,16.93 10.12,22 16,22c0.73,0 1.43,-0.08 2.12,-0.23 0.95,-0.21 1.1,-1.53 0.2,-1.9A8.471,8.471 0,0 1,13 12z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_storage.xml b/res/drawable/ic_settings_storage.xml
index 9bf6a278a3e20dac4a7a106d54ca749bf2363890..36dcc3870ebf936a5dea75984329cc5636ee631d 100644
--- a/res/drawable/ic_settings_storage.xml
+++ b/res/drawable/ic_settings_storage.xml
@@ -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.
@@ -14,12 +14,12 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24.0dp"
-        android:height="24.0dp"
+        android:width="24dp"
+        android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
         android:tint="?android:attr/colorControlNormal">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M2.0,20.0l20.0,0.0l0.0,-4.0L2.0,16.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,19.0l0.0,-2.0zM2.0,4.0l0.0,4.0l20.0,0.0L22.0,4.0L2.0,4.0zm4.0,3.0L4.0,7.0L4.0,5.0l2.0,0.0l0.0,2.0zm-4.0,7.0l20.0,0.0l0.0,-4.0L2.0,10.0l0.0,4.0zm2.0,-3.0l2.0,0.0l0.0,2.0L4.0,13.0l0.0,-2.0z"/>
+        android:fillColor="#FF000000"
+        android:pathData="M20,16L4,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,19.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1zM4,8h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2zM5,4.9c0.61,0 1.1,0.49 1.1,1.1 0,0.61 -0.49,1.1 -1.1,1.1S3.9,6.61 3.9,6c0,-0.61 0.49,-1.1 1.1,-1.1zM20,10L4,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,13.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1z"/>
 </vector>
diff --git a/res/drawable/ic_storage.xml b/res/drawable/ic_storage.xml
new file mode 100644
index 0000000000000000000000000000000000000000..36dcc3870ebf936a5dea75984329cc5636ee631d
--- /dev/null
+++ b/res/drawable/ic_storage.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/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,16L4,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,19.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1zM4,8h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2L4,4c-1.1,0 -2,0.9 -2,2s0.9,2 2,2zM5,4.9c0.61,0 1.1,0.49 1.1,1.1 0,0.61 -0.49,1.1 -1.1,1.1S3.9,6.61 3.9,6c0,-0.61 0.49,-1.1 1.1,-1.1zM20,10L4,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2h16c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2zM5,13.1c-0.61,0 -1.1,-0.49 -1.1,-1.1 0,-0.61 0.49,-1.1 1.1,-1.1s1.1,0.49 1.1,1.1c0,0.61 -0.49,1.1 -1.1,1.1z"/>
+</vector>
diff --git a/res/drawable/ic_storage_apps.xml b/res/drawable/ic_storage_apps.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7b86b8965538074c96d3c45b5d74870f837f967c
--- /dev/null
+++ b/res/drawable/ic_storage_apps.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/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM6,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM6,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM16,6c0,1.1 0.9,2 2,2s2,-0.9 2,-2 -0.9,-2 -2,-2 -2,0.9 -2,2zM12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,14c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,20c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
+</vector>
diff --git a/res/drawable/ic_suggested_notifications.xml b/res/drawable/ic_suggested_notifications.xml
index 00bd7368469980826479da1cd5c262d8e1bb5af6..5a8f0e943420f6a470dfcf1e5bb9f4c5c931a830 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 feebd94ddc6bfa8eb42c4984f4ca164549f777b6..bf5ee2effe715e6d25caeccd83919c6a1cdc25bb 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/drawable/ic_suggestion_gesture.xml b/res/drawable/ic_suggestion_gesture.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b90ad942e481c526dc846bfad2c5cd6258a5db96
--- /dev/null
+++ b/res/drawable/ic_suggestion_gesture.xml
@@ -0,0 +1,28 @@
+<!--
+    Copyright (C) 2017 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT 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="32.0"
+    android:viewportHeight="32.0"
+    android:autoMirrored="true">
+    <path
+        android:fillColor="@color/material_grey_600"
+        android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>
+    <path
+        android:fillColor="@color/material_grey_600"
+        android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>
+</vector>
diff --git a/res/drawable/ic_translate_24dp.xml b/res/drawable/ic_translate_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4df035c39bec463fc000468db28c62a0e14b25e5
--- /dev/null
+++ b/res/drawable/ic_translate_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:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.87,15.07l-2.54,-2.51 0.03,-0.03c1.74,-1.94 2.98,-4.17 3.71,-6.53L17,6L17,4h-7L10,2L8,2v2L1,4v1.99h11.17C11.5,7.92 10.44,9.75 9,11.35 8.07,10.32 7.3,9.19 6.69,8h-2c0.73,1.63 1.73,3.17 2.98,4.56l-5.09,5.02L4,19l5,-5 3.11,3.11 0.76,-2.04zM18.5,10h-2L12,22h2l1.12,-3h4.75L21,22h2l-4.5,-12zM15.88,17l1.62,-4.33L19.12,17h-3.24z"/>
+</vector>
diff --git a/res/drawable/ic_bt_imaging.xml b/res/drawable/selectable_card.xml
similarity index 55%
rename from res/drawable/ic_bt_imaging.xml
rename to res/drawable/selectable_card.xml
index 01e78c0d4137f065e99883d67b02024440d81ba0..9c1987731b92ae65b0d082c5b0f8410a4b3b55dc 100644
--- a/res/drawable/ic_bt_imaging.xml
+++ b/res/drawable/selectable_card.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2016 The Android Open Source Project
 
@@ -13,15 +14,9 @@
      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/colorAccent">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,8L5,8c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3
-            -3,-3zM16,19L8,19v-5h8v5zM19,12c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1
-            -1,1zM18,3L6,3v4h12L18,3z"/>
-</vector>
\ No newline at end of file
+
+<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 63b7e48dfd837d16408d7dd4f8a34da3793595dd..218192c21d7d15006d56927f9895d78c37a774ab 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,30 @@
                 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"
+                    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_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index b321519d8126b8284d440f2f4096a52e234d64e8..10fea84f7d28b3f771fd2569db3ee5d3e5ce358a 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -23,89 +23,111 @@
     android:layout="@layout/suw_glif_blank_template"
     style="?attr/fingerprint_layout_theme">
 
-    <LinearLayout
-        style="@style/SuwContentFrame"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:clipToPadding="false"
-        android:clipChildren="false"
-        android:paddingBottom="0dp">
-
-        <!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
-             See layouts/fingerprint_enroll_enrolling_base.xml. -->
+        android:fillViewport="true">
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
+            style="@style/SuwContentFrame"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginStart="?attr/suwMarginSides"
-            android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
-            android:clipChildren="false"
+            android:orientation="horizontal"
             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_marginStart="0dp"
-                android:layout_marginEnd="0dp"
-                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_marginStart="0dp"
-                android:layout_marginEnd="0dp" />
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+            android:clipChildren="false"
+            android:paddingBottom="0dp">
 
-                <TextView
-                    style="@style/SuwDescription.Glif"
-                    android:id="@+id/start_message"
-                    android:layout_width="match_parent"
+            <!-- Both texts are kept as separate text views so it doesn't jump around in portrait.
+                 See layouts/fingerprint_enroll_enrolling_base.xml. -->
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:layout_marginStart="?attr/suwMarginSides"
+                android:layout_marginBottom="@dimen/suw_content_frame_padding_bottom"
+                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:text="@string/security_settings_fingerprint_enroll_start_message"/>
+                    android:layout_gravity="?attr/suwGlifHeaderGravity"
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="0dp"
+                    android:src="@drawable/ic_fingerprint_header" />
 
                 <TextView
-                    style="@style/SuwDescription.Glif"
-                    android:id="@+id/repeat_message"
+                    android:id="@+id/suw_layout_title"
+                    style="@style/SuwGlifHeaderTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_repeat_message"
-                    android:visibility="invisible"/>
-
-            </FrameLayout>
+                    android:layout_marginStart="0dp"
+                    android:layout_marginEnd="0dp" />
 
-        </LinearLayout>
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        style="@style/SuwDescription.Glif"
+                        android:id="@+id/start_message"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/security_settings_fingerprint_enroll_start_message"/>
+
+                    <TextView
+                        style="@style/SuwDescription.Glif"
+                        android:id="@+id/repeat_message"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/security_settings_fingerprint_enroll_repeat_message"
+                        android:visibility="invisible"/>
+
+                </FrameLayout>
+
+                <Space
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1" />
+
+                <Button
+                    android:id="@+id/skip_button"
+                    style="@style/SuwGlifButton.Secondary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
 
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="match_parent">
+            </LinearLayout>
 
-            <include layout="@layout/fingerprint_enroll_enrolling_content"
-                android:layout_width="match_parent"
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:layout_gravity="center"/>
+                android:gravity="center"
+                android:orientation="vertical">
 
-            <TextView
-                style="@style/TextAppearance.FingerprintErrorText"
-                android:id="@+id/error_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
-                android:layout_gravity="center_horizontal|bottom"
-                android:accessibilityLiveRegion="polite"
-                android:visibility="invisible"/>
+                <include layout="@layout/fingerprint_enroll_enrolling_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"/>
 
-        </FrameLayout>
+                <TextView
+                    style="@style/TextAppearance.FingerprintErrorText"
+                    android:id="@+id/error_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dp"
+                    android:layout_gravity="center_horizontal|bottom"
+                    android:accessibilityLiveRegion="polite"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="5dp"
+                    android:paddingStart="5dp"
+                    android:visibility="invisible"/>
 
-    </LinearLayout>
+            </LinearLayout>
 
+        </LinearLayout>
+    </ScrollView>
 </com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
index 72525b551247e1d983df87b49288e95063d8b589..8712ad70e34880f965d44dcb34d939c5f91677ff 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -44,7 +44,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:clipChildren="false"
-                android:clipToPadding="false">
+                android:clipToPadding="false"
+                android:fillViewport="true">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -58,6 +59,7 @@
                         style="@style/SuwGlifIcon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="?attr/suwGlifHeaderGravity"
                         android:layout_marginStart="0dp"
                         android:layout_marginEnd="0dp"
                         android:src="@drawable/ic_fingerprint_header" />
@@ -76,13 +78,18 @@
                         android:layout_height="wrap_content"
                         android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
 
+                    <Space
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
+
                     <Button
-                        style="@style/SetupWizardButton.Positive"
-                        android:id="@+id/next_button"
+                        style="@style/SetupWizardButton.Negative"
+                        android:id="@+id/skip_button"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp"
-                        android:text="@string/fingerprint_enroll_button_next" />
+                        android:text="@string/skip_label" />
 
                 </LinearLayout>
 
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index ca1a2d26339e035771f5efc2461ba1d113a20174..0b673b872b268291ad5e5d51bda43ffe2fec98a7 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -20,91 +20,108 @@
     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
-        style="@style/SuwContentFrame"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:clipToPadding="false"
-        android:clipChildren="false"
-        android:paddingBottom="0dp">
+        android:fillViewport="true">
 
         <LinearLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:clipChildren="false"
+            style="@style/SuwContentFrame"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
             android:clipToPadding="false"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/message"
-                style="@style/SuwDescription.Glif"
-                android:layout_width="match_parent"
-                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" />
+            android:clipChildren="false">
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
                 android:clipChildren="false"
                 android:clipToPadding="false"
-                android:orientation="horizontal">
+                android:orientation="vertical">
 
-                <Button
-                    style="@style/SetupWizardButton.Negative"
-                    android:id="@+id/add_another_button"
+                <ImageView
+                    android:id="@+id/suw_layout_icon"
+                    style="@style/SuwGlifIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8dp"
-                    android:text="@string/fingerprint_enroll_button_add" />
+                    android:layout_gravity="?attr/suwGlifHeaderGravity"
+                    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"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/security_settings_fingerprint_enroll_finish_message"/>
 
                 <Space
                     android:layout_width="0dp"
                     android:layout_height="0dp"
                     android:layout_weight="1" />
 
-                <Button
-                    style="@style/SetupWizardButton.Positive"
-                    android:id="@+id/next_button"
-                    android:layout_width="wrap_content"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/security_settings_fingerprint_enroll_done" />
+                    android:layout_marginTop="8dp"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    android:orientation="horizontal">
+
+                    <Button
+                        style="@style/SetupWizardButton.Negative"
+                        android:id="@+id/add_another_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="8dp"
+                        android:text="@string/fingerprint_enroll_button_add" />
+
+                    <Space
+                        android:layout_width="0dp"
+                        android:layout_height="0dp"
+                        android:layout_weight="1" />
+
+                    <Button
+                        style="@style/SetupWizardButton.Positive"
+                        android:id="@+id/next_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/security_settings_fingerprint_enroll_done" />
+
+                </LinearLayout>
 
             </LinearLayout>
 
-        </LinearLayout>
-
-        <FrameLayout
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical">
+            <com.android.setupwizardlib.view.FillContentLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                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"
-                android:contentDescription="@android:string/fingerprint_icon_content_description"
-                android:src="@drawable/fp_app_indicator" />
+                <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" />
 
-        </FrameLayout>
-
-    </LinearLayout>
+            </com.android.setupwizardlib.view.FillContentLayout>
 
+        </LinearLayout>
+    </ScrollView>
 </com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/account_header.xml b/res/layout/account_header.xml
deleted file mode 100755
index 818d47c469e524702fd136904bf501990ac4532a..0000000000000000000000000000000000000000
--- 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 2db23e40ac80cf862b5b2ec38c1df995b40a25a8..0000000000000000000000000000000000000000
--- 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 f9c6b6453debb5525a4fb90b7f9b3bc9c1b8fc87..d006027451b42f7196a6886cb16bed67bbc00116 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 e2ccbd3deecfc6ea86caa641a09584a70bc70e85..5aa9cfa677d2f175dedcd78be8d93b92be8b3e20 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 15a901427cfd2137bff63980548b2bb32b0a1a54..d53afc965e83755a956e1d7669cad2bf2e503215 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 97cc016a5f945956d9b6082f06150c64133bed1b..db90e2e0fc87214ff67a313fbde6ce06f46696e6 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"
@@ -28,24 +28,32 @@
     style="@style/EntityHeader">
 
     <LinearLayout
-        android:layout_width="216dp"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="48dp"
-        android:layout_marginEnd="12dp"
+        android:layout_weight="1"
+        android:layout_marginStart="56dp"
         android:orientation="vertical">
 
         <TextView
             android:id="@+id/battery_percent"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
+            android:fontFamily="@*android:string/config_headlineFontFamily"
             android:textAppearance="@android:style/TextAppearance.Material.Display1"/>
 
         <TextView
             android:id="@+id/summary1"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:minLines="2"
+            android:textAppearance="@android:style/TextAppearance.Material.Small"/>
+
+        <TextView
+            android:id="@+id/summary2"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
             android:textAppearance="@android:style/TextAppearance.Material.Small"/>
 
     </LinearLayout>
@@ -54,7 +62,6 @@
         android:id="@+id/battery_header_icon"
         android:layout_width="@dimen/battery_meter_width"
         android:layout_height="@dimen/battery_meter_height"
-        android:layout_gravity="end"
-        android:layout_marginEnd="24dp"/>
+        android:layout_marginEnd="16dp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/battery_history_detail.xml b/res/layout/battery_history_detail.xml
index b782e397c66571378c0326dbee7429de7ca302c2..ea758655231fa16410bb481593d12947db411b27 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 80f966b176d0fca4f07465259fca334fb4fc78b2..f46ac6afae870f9aeb7fffee44a0d7451a97f168 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"
@@ -42,4 +43,11 @@
         android:gravity="end"
         settings:textColor="?android:attr/textColorSecondary" />
 
+    <TextView
+        android:id="@+id/bottom_summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
 </LinearLayout>
diff --git a/res/layout/choose_lock_dialog_item.xml b/res/layout/choose_lock_dialog_item.xml
new file mode 100644
index 0000000000000000000000000000000000000000..46ad539fe0d40eeaf50fe87ece120e632e21a73f
--- /dev/null
+++ b/res/layout/choose_lock_dialog_item.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.
+-->
+
+<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:textAlignment="viewStart"
+    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 0888b5e201f15f363174098e47cc0c6292145e75..7ce30344d585616b2a48d63b3ae8cd7e852fb021 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -32,41 +32,50 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <!-- header text ('Enter Pin') -->
         <TextView
-            android:id="@+id/headerText"
+            android:id="@+id/fingerprint_backup_message"
+            style="@style/SuwDescription.Glif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:accessibilityLiveRegion="polite"
-            android:gravity="center"
-            android:lines="2"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
+            android:visibility="gone" />
 
-        <!-- Password entry field -->
-        <EditText android:id="@+id/password_entry"
+        <LinearLayout
+            android:id="@+id/password_container"
             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"/>
+            android:layout_marginTop="16dp"
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            android:orientation="vertical"
+            android:layoutMode="opticalBounds"
+            android:paddingBottom="8dp">
 
-        <LinearLayout
-                android:id="@+id/bottom_container"
+            <!-- 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"
+                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_password_footer.xml b/res/layout/choose_lock_password_footer.xml
index 57be3201e4de13086a32a494f2aedc82fc17ded6..323a884cae994d052bd5547c00e96cc5cd3bad6c 100644
--- a/res/layout/choose_lock_password_footer.xml
+++ b/res/layout/choose_lock_password_footer.xml
@@ -38,6 +38,6 @@
         style="@style/SuwGlifButton.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/lockpassword_continue_label" />
+        android:text="@string/next_label" />
 
 </LinearLayout>
diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
index a54987dcaaa4995309c6eff2d396d4258def67a0..3ea960d1a7d7cfddda62ae88fb1e673d9a56ea70 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/condition_card.xml b/res/layout/condition_card.xml
deleted file mode 100644
index 4edd0f2981357e81fd8c219debb59e39a57ed2da..0000000000000000000000000000000000000000
--- a/res/layout/condition_card.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clipChildren="false"
-    android:clipToPadding="false">
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="?android:attr/colorAccent"
-        android:elevation="2dp"
-        android:clickable="true"
-        android:focusable="true">
-
-        <LinearLayout
-            android:id="@+id/collapsed_group"
-            android:layout_width="match_parent"
-            android:layout_height="56dp"
-            android:background="?android:attr/selectableItemBackground"
-            android:orientation="horizontal"
-            android:gravity="center">
-
-            <ImageView
-                android:id="@android:id/icon"
-                android:layout_width="24dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="32dp"
-                android:tint="?android:attr/textColorPrimaryInverse" />
-
-            <TextView
-                android:id="@android:id/title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textColor="?android:attr/textColorPrimaryInverse" />
-
-            <ImageView
-                android:id="@+id/expand_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:padding="16dp"
-                android:tint="?android:attr/textColorPrimaryInverse"/>
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/detail_group"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="72dp"
-            android:visibility="gone"
-            android:orientation="vertical">
-
-            <!-- TODO: Don't set alpha here, and do proper themeing that
-                 handles night mode -->
-            <TextView
-                android:id="@android:id/summary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-                android:paddingBottom="16dp"
-                android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-                android:alpha=".7"
-                android:textColor="?android:attr/textColorPrimaryInverse" />
-
-            <!-- TODO: Better background -->
-            <View
-                android:id="@+id/divider"
-                android:layout_width="match_parent"
-                android:layout_height=".25dp"
-                android:background="@android:color/white" />
-
-            <com.android.internal.widget.ButtonBarLayout
-                android:id="@+id/buttonBar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                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/textColorPrimaryInverse"
-                    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/textColorPrimaryInverse"
-                    style="?android:attr/buttonBarButtonStyle" />
-
-            </com.android.internal.widget.ButtonBarLayout>
-
-        </LinearLayout>
-
-    </LinearLayout>
-</FrameLayout>
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 f7ba859fe333f9c28de540a5dc1ef4d66f401ff1..4f93f547c22b93a7847f549987804379337a94de 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.xml b/res/layout/condition_tile.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e2f9b4938c91d4807eea22f261f74099c75cdfa
--- /dev/null
+++ b/res/layout/condition_tile.xml
@@ -0,0 +1,95 @@
+<?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="@color/condition_card_background"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        android:background="?android:attr/selectableItemBackground"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@dimen/dashboard_tile_image_size"
+            android:layout_height="@dimen/dashboard_tile_image_size"
+            android:layout_marginTop="12dp"
+            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:layout_marginTop="14dp"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorPrimary" />
+
+    </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="1dp"
+        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/textColorPrimary"
+            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/textColorPrimary"
+            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 6942863bb0a280f00ff2270adf673ec18f618303..05e90d223d69ab7d1339cb50c18271a06d96d4ff 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,35 @@
               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"
+                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 0652e7eb11e9464a1d0fe36cacca37ad315f7ada..558522cf96ce1bdacfa310fb78a1d50ab6b7aebd 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,35 @@
             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"
+                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 e20d04d39226b940964d207dcdd3ce6b112fce0c..758fc0da3390a87705e7f8fc1e85ce4e17d4d20e 100644
--- a/res/layout/confirm_lock_pattern_internal_base.xml
+++ b/res/layout/confirm_lock_pattern_internal_base.xml
@@ -27,77 +27,62 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <ScrollView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="2">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <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" />
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
-                <TextView
-                    android:id="@+id/headerText"
-                    style="@style/SuwGlifHeaderTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+            <ImageView
+                android:id="@+id/suw_layout_icon"
+                style="@style/LockPatternIconStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="?attr/suwGlifHeaderGravity"
+                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" />
 
-            </LinearLayout>
+            <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" />
 
-        </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">
-
-            <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"/>
+            android:layout_weight="4"
+            android:layout_gravity="center_horizontal"/>
 
-            <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>
+        <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_marginBottom="24dp"
+            android:contentDescription="@string/confirm_fingerprint_icon_content_description"
+            android:visibility="gone"/>
 
         <Button
             android:id="@+id/cancelButton"
diff --git a/res/layout/connection_detail_pref.xml b/res/layout/connection_detail_pref.xml
deleted file mode 100644
index 182f2cb9ef684a731673404e28eef04bf44655b9..0000000000000000000000000000000000000000
--- a/res/layout/connection_detail_pref.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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/connection_detail_layout"
-    android:background="?android:attr/colorAccent"
-    android:layout_width="match_parent"
-    android:layout_height="144dp"
-    android:gravity="center_vertical"
-    android:orientation="horizontal">
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/ic_settings_widget_background"
-        android:layout_marginLeft="72dp"
-        android:elevation="2dp">
-
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"/>
-
-    </FrameLayout>
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="false"
-        android:paddingLeft="20dp"
-        android:textAppearance="@android:style/TextAppearance.Material.Medium"
-        android:textColor="@android:color/white"/>
-
-</LinearLayout>
diff --git a/res/layout/convert_fbe.xml b/res/layout/convert_fbe.xml
index 4a9d7c05d11c3019abbc222683931edd858e3630..d1e0ceae20aca7aaae140b0c778fc6508b47e5ed 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/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index 1ec1730059885b86b12a0db6516a4e9b630b97a3..e35dbff8d524ec70b756b5bf4eb6ebb47470a20a 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 dc0559de15474ce84c03c1b346bb223011bc1c6c..8f83d1436697a3f224264c610a852d27f56c79bd 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/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index c534bf19dd07b5a86aa0ed010307e1e35cbf969a..22729b66ef2481a821122f59985063eea9e06c1f 100644
--- a/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.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.
@@ -14,20 +14,20 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
     android:paddingTop="16dp"
-    android:paddingBottom="12dp"
-    >
+    android:paddingBottom="12dp">
 
     <EditText
         android:id="@+id/edittext"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:inputType="textCapSentences"
         android:maxLength="50"
-        android:singleLine="true"
-    />
+        android:singleLine="true" />
 </LinearLayout>
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
deleted file mode 100644
index fd70ad543ff13bef9cf6711354cd7c43144112dd..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..7d5e0c9261886df51baf869cbf70b179ea16f9f0
--- /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 f17e67c28fb3ab5fc6e04da049f21f8b75e813b9..729dfd9919113ed972689ac3170c986f3e81a9d3 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_enrolling_base.xml b/res/layout/fingerprint_enroll_enrolling_base.xml
index 7f8eb1bee9b9eafd2b52391efd12ff31312a7196..60ca601d4e5d657a33e4909cc83877f81dbdd333 100644
--- a/res/layout/fingerprint_enroll_enrolling_base.xml
+++ b/res/layout/fingerprint_enroll_enrolling_base.xml
@@ -17,10 +17,12 @@
 
 <com.android.setupwizardlib.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    style="?attr/fingerprint_layout_theme">
+    style="?attr/fingerprint_layout_theme"
+    app:suwFooter="@layout/fingerprint_enroll_enrolling_base_footer">
 
     <LinearLayout
         style="@style/SuwContentFrame"
@@ -34,14 +36,14 @@
              switch the text -->
         <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/suw_description_glif_margin_top">
+            android:layout_height="wrap_content">
 
             <TextView
                 style="@style/SuwDescription.Glif"
                 android:id="@+id/start_message"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:minLines="3"
                 android:text="@string/security_settings_fingerprint_enroll_start_message"/>
 
             <TextView
@@ -49,27 +51,36 @@
                 android:id="@+id/repeat_message"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:minLines="3"
                 android:text="@string/security_settings_fingerprint_enroll_repeat_message"
                 android:visibility="invisible"/>
 
         </FrameLayout>
 
-        <include layout="@layout/fingerprint_enroll_enrolling_content"
-            android:layout_width="@dimen/fingerprint_progress_bar_max_size"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/fingerprint_enrolling_content_margin_top"/>
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <include layout="@layout/fingerprint_enroll_enrolling_content"
+                android:layout_width="@dimen/fingerprint_progress_bar_max_size"
+                android:layout_height="@dimen/fingerprint_progress_bar_max_size"
+                android:layout_gravity="center"
+                android:layout_marginVertical="24dp"/>
+
+            <TextView
+                style="@style/TextAppearance.FingerprintErrorText"
+                android:id="@+id/error_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal|bottom"
+                android:accessibilityLiveRegion="polite"
+                android:gravity="center"
+                android:visibility="invisible"/>
 
-        <TextView
-            style="@style/TextAppearance.FingerprintErrorText"
-            android:id="@+id/error_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:layout_gravity="center_horizontal"
-            android:accessibilityLiveRegion="polite"
-            android:visibility="invisible"/>
+        </LinearLayout>
 
     </LinearLayout>
 
diff --git a/res/layout/fingerprint_enroll_enrolling_base_footer.xml b/res/layout/fingerprint_enroll_enrolling_base_footer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b4ed37e7404557364768310b6a06c2f5e7d79677
--- /dev/null
+++ b/res/layout/fingerprint_enroll_enrolling_base_footer.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+
+<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SuwGlifButtonBar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <Button
+        style="@style/SuwGlifButton.Secondary"
+        android:id="@+id/skip_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/security_settings_fingerprint_enroll_enrolling_skip" />
+
+</LinearLayout>
diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index fa344abba5fab5f1fbd626dfbc49e78d6b93a2e0..ea518a7c63c222cc9f9fd872b4b4066784b279dd 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -17,28 +17,24 @@
 
 <com.android.setupwizardlib.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/setup_wizard_layout"
     style="?attr/fingerprint_layout_theme"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:clipToPadding="false"
         android:clipChildren="false">
 
-        <include
-            layout="@layout/fingerprint_enroll_find_sensor_graphic"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal|bottom"/>
-
         <LinearLayout
             style="@style/SuwContentFrame"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             android:clipToPadding="false"
             android:clipChildren="false">
@@ -49,21 +45,18 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/suw_description_glif_margin_top"
                 android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
+        </LinearLayout>
 
-            <View
-                android:layout_height="0dp"
-                android:layout_width="match_parent"
-                android:layout_weight="1"/>
+        <Space
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            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" />
+        <include
+            layout="@layout/fingerprint_enroll_find_sensor_graphic"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"/>
 
-        </LinearLayout>
-    </FrameLayout>
+    </LinearLayout>
 </com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/fingerprint_enroll_find_sensor_base_footer.xml b/res/layout/fingerprint_enroll_find_sensor_base_footer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e93fae99fcf7e91defc3b998074216a4d4802d82
--- /dev/null
+++ b/res/layout/fingerprint_enroll_find_sensor_base_footer.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+
+<!-- TODO: Use aapt:attr when it is fixed (b/36809755) -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SuwGlifButtonBar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <Button
+        style="@style/SuwGlifButton.Secondary"
+        android:id="@+id/skip_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/skip_label" />
+
+</LinearLayout>
diff --git a/res/layout/fingerprint_enroll_finish_base.xml b/res/layout/fingerprint_enroll_finish_base.xml
index 6d9cf709db3010a27139470aff32d2e4e8d4123d..ba3d07fd023ae7902453d08e86de1a6c8e28c992 100644
--- a/res/layout/fingerprint_enroll_finish_base.xml
+++ b/res/layout/fingerprint_enroll_finish_base.xml
@@ -38,40 +38,25 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/suw_description_glif_margin_top"
+            android:minLines="3"
             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" />
-
-        <View
-            android:layout_height="24dp"
-            android:layout_width="match_parent"
-            android:layout_weight="1"/>
-
-        <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"/>
+            android:layout_weight="1"
+            android:maxWidth="@dimen/fingerprint_finish_max_size"
+            android:maxHeight="@dimen/fingerprint_finish_max_size">
+
+            <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" />
+
+        </com.android.setupwizardlib.view.FillContentLayout>
 
     </LinearLayout>
 
diff --git a/res/layout/horizontal_divider.xml b/res/layout/horizontal_divider.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e4a277dbca72f1bf7ebeef08227069d7d3cc62b7
--- /dev/null
+++ b/res/layout/horizontal_divider.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.
+-->
+
+<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 662b7db825b7a3d905cd4611779b077b92b90200..ec2aaeaaf492a6ea14052e985235fcb3a9e5bd14 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -45,6 +45,13 @@
                 android:visibility="gone"
                 android:textSize="18sp"
                 android:text="@string/master_clear_desc_also_erases_external" />
+            <TextView android:id="@+id/also_erases_esim"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="false"
+                android:visibility="gone"
+                android:textSize="18sp"
+                android:text="@string/master_clear_desc_also_erases_esim" />
             <TextView android:id="@+id/accounts_label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -65,6 +72,12 @@
                 android:visibility="gone"
                 android:textSize="18sp"
                 android:text="@string/master_clear_other_users_present" />
+            <TextView android:id="@+id/no_cancel_mobile_plan"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:textSize="18sp"
+                android:text="@string/master_clear_desc_no_cancel_mobile_plan" />
             <TextView android:id="@+id/erase_external_option_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/password_requirement_item.xml b/res/layout/password_requirement_item.xml
index df7f45c941a340f9bfefc06c7754711ab3b6e067..8080f10fa89d0bd42dd41e3b623c1376212872d6 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_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
index 5a1043dce381e390610f0117c1cc6723146e20d4..3334bbb7b471d05adc2603f959c519fd5deee206 100644
--- a/res/layout/preference_category_material_settings.xml
+++ b/res/layout/preference_category_material_settings.xml
@@ -51,6 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAppearance="@android:style/TextAppearance.Material.Body2"
+            android:textAlignment="viewStart"
             android:textColor="?android:attr/colorAccent"
             android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>
         <TextView
diff --git a/res/layout/preference_footer.xml b/res/layout/preference_footer.xml
deleted file mode 100644
index 39b2f1c935a8a0b4312bc839b2c948d40f83f89d..0000000000000000000000000000000000000000
--- 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="16dp"
-        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 f3abb9ccb38c00f1b5618b6704a768ebef4ca3a4..0000000000000000000000000000000000000000
--- 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 9682e32e65dff05615d235f4114b97bc6dbef7b1..e2ab3bbedbad26ac7e33e95ff58589cd178961b2 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 0000000000000000000000000000000000000000..e734b4b8ae209febe232ef829f27cb5fac0f6956
--- /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 3eb0c97257f27c5f1bd8282dceffb83f8f49bf6d..107a8ae9b5393daed939aa819d50bf4e5a08e1da 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_seekbar_settings.xml b/res/layout/preference_widget_seekbar_settings.xml
index c25c598d5041b8fc4449ae7f9c2e96ed4c317e41..fb1e9c8b21006db722bd20dde67628b4c915427c 100644
--- a/res/layout/preference_widget_seekbar_settings.xml
+++ b/res/layout/preference_widget_seekbar_settings.xml
@@ -58,6 +58,6 @@
         android:layout_alignParentEnd="true"
         android:layout_below="@android:id/summary"
         android:paddingStart="56dp"
-        android:paddingEnd="8dp" />
+        android:paddingEnd="12dp" />
 
 </RelativeLayout>
diff --git a/res/layout/preference_widget_summary.xml b/res/layout/preference_widget_summary.xml
index 2d7ed1d2bea566494614555886e371e4e5703d14..fae50273053a183fccabd67dcd025a244e7bb907 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 e11e99743041068a52a5e9c534e34d9f78352faf..e7d08cca9886a9219d5b3f199bcee753e087fd5f 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/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index ecc122fd98401aac7c4fe0527ccc0243d0c097c2..939ff92b9ac99f9b51cf743e2f02e9f1a57b11f9 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -21,7 +21,7 @@
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:icon="@drawable/ic_lock"
+    android:icon="@drawable/ic_suggested_notifications"
     settings:suwFooter="@layout/redaction_interstitial_footer"
     settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
 
@@ -52,6 +52,8 @@
                 style="@style/SuwRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/lock_screen_notifications_summary_show" />
 
             <com.android.settings.RestrictedRadioButton
@@ -59,6 +61,8 @@
                 style="@style/SuwRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/lock_screen_notifications_summary_hide" />
 
             <RadioButton
@@ -66,6 +70,8 @@
                 style="@style/SuwRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:minHeight="?android:attr/listPreferredItemHeight"
                 android:text="@string/lock_screen_notifications_summary_disable" />
 
         </RadioGroup>
diff --git a/res/layout/search_icon_view.xml b/res/layout/search_icon_view.xml
index 7df064971d12cd3ae610d47714553bfd04c43b98..ef99bee0fdffb7eb4ebc8690ff456ef3b232822d 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 526f9fdc0c6265e84169f13e7e5ec0bcade9759e..8f050a35d847ef15cba2a8896fe0379d570cd931 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 98e2a9b12dfee4e60b081ec9f625de008df16b32..6bc00ad06b9100da72d21ba1f927041745714331 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 ab728cd1720df0a295adb106b04f62a9fca51d12..6de344debbe27d1d17b7d55b7d37f83b957aee59 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 9445e0c162a1f4df9aaba17445d1ed794bb53c44..48a1d4ce1e5a9c9c1712d8df9374f0642a5e0bcd 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -13,73 +13,95 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout
+<LinearLayout
     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">
+    android:orientation="vertical">
 
-    <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">
-
-        <!-- 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>
+    <FrameLayout
+        android:id="@+id/search_bar_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/suggestion_condition_background">
+        <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_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/search_bar_height"
+                android:background="?android:attr/selectableItemBackground"
+                android:contentInsetStart="0dp"
+                android:contentInsetStartWithNavigation="0dp"
+                android:theme="?android:attr/actionBarTheme">
+                <SearchView
+                    android:id="@+id/search_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:iconifiedByDefault="false"
+                    android:imeOptions="actionSearch|flagNoExtractUi"
+                    android:searchIcon="@null"/>
+            </Toolbar>
+        </android.support.v7.widget.CardView>
+    </FrameLayout>
 
-    <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">
+    <FrameLayout
+        android:id="@+id/layout_results"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        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>
+
+    </FrameLayout>
 
     <include layout="@layout/search_feedback"/>
-</RelativeLayout>
+
+</LinearLayout>
diff --git a/res/layout/settings_entity_header.xml b/res/layout/settings_entity_header.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9c4ca93a0a2a23db532ba0a4fbf53083a66f3dfc
--- /dev/null
+++ b/res/layout/settings_entity_header.xml
@@ -0,0 +1,111 @@
+<?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:textAlignment="viewStart"
+            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 c10193cda9010bb41f6e518b81da8b9a35951ed5..8e83cff101f3a7f9bd05c2bce4fc481ae2d120e0 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -17,8 +17,39 @@
 */
 -->
 
-<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"
-             />
+<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="match_parent"
+    android:orientation="vertical">
+    <FrameLayout
+        android:id="@+id/search_bar_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/suggestion_condition_background">
+        <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="@dimen/search_bar_height"
+                android:background="?android:attr/selectableItemBackground"
+                android:contentInsetStartWithNavigation="64dp"
+                android:navigationIcon="@drawable/ic_search_24dp"
+                android:navigationContentDescription="@string/search_menu"
+                android:title="@string/search_menu"
+                android:titleTextAppearance="@style/TextAppearance.SearchBar"
+                android:theme="?android:attr/actionBarTheme"/>
+        </android.support.v7.widget.CardView>
+    </FrameLayout>
+    <FrameLayout
+        android:id="@+id/main_content"
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"/>
+</LinearLayout>
diff --git a/res/layout/settings_summary_preference.xml b/res/layout/settings_summary_preference.xml
index a5dee5283b3c1c3927ee4a288a392136b391a68a..7d550b5e9e367a1ec00efdccd792b0a9bc18f88e 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 0c1f60c08138811d05b8dd51791fc3daab1538af..4b14bb36807ce7c3d3f66026b8a75925e8a218e2 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:paddingTop="14dp"
+              android:paddingBottom="14dp"
+              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"
@@ -50,37 +52,41 @@
                 android:maxHeight="24dp"/>
         </LinearLayout>
 
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="0dp"
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:singleLine="true"
-            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
-            android:textAlignment="viewStart"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
+            android:gravity="center_vertical" >
 
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="viewStart"
-            android:textAppearance="@android:style/TextAppearance.Material.Body1"
-            android:textColor="?android:attr/textColorSecondaryNoDisable"
-            android:maxLines="10" />
-
-    </LinearLayout>
+            <TextView
+                android:id="@android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                android:textAlignment="viewStart"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal" />
 
-    <ProgressBar
-        android:id="@android:id/progress"
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:layout_marginStart="60dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="8dp"
-        android:visibility="gone"
-        android:max="100"
-        style="?android:attr/progressBarStyleHorizontal" />
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAlignment="viewStart"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondaryNoDisable"
+                android:maxLines="10"
+                android:layout_alignParentEnd="true"/>
 
+            <ProgressBar
+                android:id="@android:id/progress"
+                android:layout_width="match_parent"
+                android:layout_height="8dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="4dp"
+                android:max="100"
+                android:layout_below="@android:id/title"
+                android:layout_alignStart="@android:id/title"
+                style="?android:attr/progressBarStyleHorizontal" />
+        </RelativeLayout>
+    </LinearLayout>
 </LinearLayout>
diff --git a/res/layout/storage_summary.xml b/res/layout/storage_summary.xml
index 1beb49f94d33a1af96ccef9fe3297b09b686deba..d48d62d6ce611e19dc2238df4cb8ca21a41d1bd3 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 eb26077895196d10548dc85895645a7e75cdf371..8e11d71f360a42262c2ed0832947ee7fa994df1f 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 570cec6bf67d522ad9844a56ee37eafeb9c1feff..39a6f857510cc2772b012c89abf4769ceaacbfef 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 0000000000000000000000000000000000000000..a4c60ad26a86bebd37c8121ac0067d5a69c7f922
--- /dev/null
+++ b/res/layout/suggestion_condition_container.xml
@@ -0,0 +1,43 @@
+<?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="5dp"
+    android:paddingEnd="5dp"
+    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:background="@color/material_grey_300"
+            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 0000000000000000000000000000000000000000..3eea6a51b783ab0f95c11febe62bb162c2081882
--- /dev/null
+++ b/res/layout/suggestion_condition_footer.xml
@@ -0,0 +1,34 @@
+<?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="44dp"
+    android:paddingTop="10dp"
+    android:paddingEnd="10dp"
+    android:orientation="horizontal"
+    android:gravity="end">
+
+    <ImageView
+        android:id="@+id/collapse_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        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 0000000000000000000000000000000000000000..2551b6550338ddec64f5426b269f71e34d5351f3
--- /dev/null
+++ b/res/layout/suggestion_condition_header.xml
@@ -0,0 +1,87 @@
+<?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="wrap_content"
+    android:paddingTop="10dp"
+    android:paddingBottom="10dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="36dp"
+        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:paddingTop="4dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="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>
+
+</LinearLayout>
diff --git a/res/layout/suggestion_header.xml b/res/layout/suggestion_header.xml
deleted file mode 100644
index f3f39ff1dc839fa01e98170920344ab87cdbb5ac..0000000000000000000000000000000000000000
--- a/res/layout/suggestion_header.xml
+++ /dev/null
@@ -1,52 +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="@dimen/dashboard_category_height"
-    android:clickable="true"
-    android:focusable="true"
-    android:background="@drawable/selectable_card_grey"
-    android:gravity="center_vertical"
-    android:paddingTop="4dp">
-    <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="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
-        android:src="@drawable/ic_expand_more"/>
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.SuggestionTitle"
-        android:textColor="?android:attr/colorAccent"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal"/>
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:gravity="end"
-        android:paddingEnd="18dp"
-        android:textAppearance="@style/TextAppearance.SuggestionTitle"
-        android:textColor="?android:attr/colorAccent"/>
-</LinearLayout>
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
index 9e17e38be5afb3e7fbfef7e96d6c689c7f4eedf9..e2dd13af18d89e7b3e06c288ea5da21d4d72dff4 100644
--- a/res/layout/suggestion_tile.xml
+++ b/res/layout/suggestion_tile.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 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,41 +18,46 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selectable_card_grey"
-    android:clickable="true"
-    android:focusable="true"
-    android:gravity="center_vertical"
-    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="@dimen/dashboard_tile_image_margin_start"
-        android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
-        android:scaleType="centerInside"/>
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1">
-
-        <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:layout_below="@android:id/title"
-                  android:layout_alignStart="@android:id/title"
-                  android:textAppearance="@style/TextAppearance.Small"
-                  android:textColor="?android:attr/textColorSecondary"/>
-
-    </RelativeLayout>
+        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/suggestion_tile_remote_container.xml b/res/layout/suggestion_tile_remote_container.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fd19b80eac63bc148108ceaaefa3b0c12eaa017c
--- /dev/null
+++ b/res/layout/suggestion_tile_remote_container.xml
@@ -0,0 +1,24 @@
+<?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:background="@android:color/white"
+    android:clickable="true"
+    android:focusable="true"
+    android:minHeight="@dimen/dashboard_tile_minimum_height" />
diff --git a/res/layout/support_tile.xml b/res/layout/support_tile.xml
index c2081c7e07c1ecc6ed2c908f8710ca4cc7baf735..a42faf0e4c7884cb247c5c7b272f36c853d3cdbf 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 0000000000000000000000000000000000000000..6c168806338e567c996648453388caf6538dc38d
--- /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 0000000000000000000000000000000000000000..6c168806338e567c996648453388caf6538dc38d
--- /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 0000000000000000000000000000000000000000..8e9c5802bbf93409c652b2df8c98fea717898aff
--- /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 47be3689c60325e555b130b20e43de8f2f799091..71ce0adedf473efe24fcf8cc67a61b77f6807705 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 ba1f6fc10b08e0c9e6e1c7b0d4d4f771836e0e4f..cfb6d9a6a5b88d524b0e7bcb85bc6dfe42fcacd8 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/values-af/arrays.xml b/res/values-af/arrays.xml
index 61a647677658690e50387edfa244f27e6388a779..d959cefc9c28176e3b1956ba9d0389ff3fc23757 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 baf74ceab953b50baafad0aed7e5cfcdf35689c2..57f8e345194057b3d7a6f12bc9c8a00651757ec5 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Doen dit later"</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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Skakel Wi-Fi outomaties aan"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi sal weer aanskakel naby gestoorde netwerke van hoë gehalte, soos jou tuisnetwerk"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nie beskikbaar nie want Wi-Fi-skandering is afgeskakel"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Kies \'n netwerkgraderingverskaffer om dit te gebruik"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vermy swak verbindings"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Moenie \'n Wi-Fi-netwerk gebruik tensy dit \'n goeie internetverbinding het nie"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Gebruik net netwerke wat \'n goeie internetverbinding het"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Koppel aan oop netwerke"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Koppel outomaties aan publieke netwerke van hoë gehalte"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Kies \'n netwerkgraderingverskaffer om dit te gebruik"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Kies \'n versoenbare netwerkgraderingverskaffer om dit te gebruik"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installeer sertifikate"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Om liggingakkuraatheid te verbeter, kan stelselprogramme en -dienste steeds vir Wi-Fi-netwerke soek. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Skakel Wi-Fi-skandering in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skanderinginstellings<xliff:g id="LINK_END_1">LINK_END</xliff:g> aan om liggingakkuraatheid te verbeter."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Altyd aan / verhoogde batterygebruik"</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="6978257596231155345">"Wys tyd, kennisgewingikone en ander inligting. Verhoogde batterygebruik."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Daar is ander gebruikers op hierdie toestel teenwoordig.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiek"</li>\n<li>"Foto\'s"</li>\n<li>"Ander gebruikerdata"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Diensverskaffers op e-SIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dit sal nie jou mobiele diensplan kanselleer nie."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Vee USB-berging uit"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skermlesers, skerm, interaksiekontroles"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Visie-instellings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Jy kan hierdie toestel pasmaak om by jou behoeftes te pas. Hierdie toeganklikheidkenmerke kan later in Instellings verander word."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Vergroot lettergrootte"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skermlesers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Oudio en teks op skerm"</string>
     <string name="display_category_title" msgid="685461049938269166">"Vertoon"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Jou foon kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou foon wakker hou.\n\nOm te probeer om hierdie kwessie op te los, kan jy die program stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Jou tablet kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou tablet wakker hou.\n\nOm te probeer om hierdie kwessie op te los, kan jy die program stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Jou toestel kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou toestel wakker hou.\n\nOm te probeer om hierdie kwessie op te los, kan jy die program stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Jou foon kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP_0">%1$s</xliff:g> aanhou om jou foon wakker te maak.\n\nOm te probeer om hierdie kwessie op te los, kan jy <xliff:g id="APP_1">%1$s</xliff:g> stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Jou tablet kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP_0">%1$s</xliff:g> aanhou om jou tablet wakker te maak.\n\nOm te probeer om hierdie kwessie op te los, kan jy <xliff:g id="APP_1">%1$s</xliff:g> stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Jou toestel kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP_0">%1$s</xliff:g> aanhou om jou toestel wakker te maak.\n\nOm te probeer om hierdie kwessie op te los, kan jy <xliff:g id="APP_1">%1$s</xliff:g> stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stop program"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Skakel agtergrondgebruik af en stop program?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Jou foon kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP_0">%1$s</xliff:g> aanhou om jou foon wakker te maak.\n\nOm te probeer om hierdie kwessie op te los, kan jy <xliff:g id="APP_1">%1$s</xliff:g> stop en dit verhoed om op die agtergrond te werk."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Jou tablet kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP_0">%1$s</xliff:g> aanhou om jou tablet wakker te maak.\n\nOm te probeer om hierdie kwessie op te los, kan jy <xliff:g id="APP_1">%1$s</xliff:g> stop en dit verhoed om op die agtergrond te werk."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Jou toestel kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP_0">%1$s</xliff:g> aanhou om jou toestel wakker te maak.\n\nOm te probeer om hierdie kwessie op te los, kan jy <xliff:g id="APP_1">%1$s</xliff:g> stop en dit verhoed om op die agtergrond te werk."</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="7774807745601479888">"Jou foon kan nie die battery op normale wyse 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\nOm hierdie kwessie reg te stel, kan jy ligging vir hierdie program afskakel."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Jou tablet kan nie die battery op normale wyse 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\nOm hierdie kwessie reg te stel, kan jy ligging vir hierdie program afskakel."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Jou toestel kan nie die battery op normale wyse 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\nOm hierdie kwessie reg te stel, kan jy ligging vir hierdie program afskakel."</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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ontleding sedert battery laas volgelaai is"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Laas volgelaai"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Oorblywende batterytyd is benaderd en kan op grond van gebruik verander"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Battery se gebruikdata is benaderd en kan op grond van gebruik verander"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Terwyl dit aktief gebruik word"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"In die agtergrond"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batterygebruik"</string>
@@ -2349,7 +2430,7 @@
     <string name="data_usage_restrict_background" msgid="434093644726734586">"As jy mobiele agtergronddata beperk, sal sommige programme en dienste nie werk nie tensy jy aan Wi-Fi gekoppel is."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"As jy mobiele agtergronddata beperk, sal sommige programme en dienste nie werk nie tensy jy aan Wi-Fi gekoppel is.\n\nHierdie instelling raak alle gebruikers van hierdie tablet."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"As jy mobiele agtergronddata beperk, sal sommige programme en dienste nie werk nie tensy jy aan Wi-Fi gekoppel is.\n\nHierdie instelling raak alle gebruikers van hierdie foon."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"waarsku"</font></string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"waarskuwing"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limiet"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Verwyderde programme"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Verwyderde programme en gebruikers"</string>
@@ -2358,7 +2439,7 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> is gebruik, soos gemeet deur jou tablet. Jou diensverskaffer kan datagebruik dalk anders bereken."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> is gebruik, soos gemeet deur jou foon. Jou diensverskaffer kan datagebruik dalk anders bereken."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Netwerkbeperkinge"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Beperkte netwerke word soos mobiele netwerke gehanteer as agtergronddata beperk word. Programme sal dalk waarsku voordat hulle hierdie netwerke vir groot aflaaie gebruik."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Beperkte netwerke word soos mobiele netwerke hanteer as agtergronddata beperk word. Programme sal dalk waarsku voordat hulle hierdie netwerke vir groot aflaaie gebruik."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Selnetwerke"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Beperkte Wi-Fi-netwerke"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Skakel Wi-Fi aan om beperkte netwerke te kies."</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"gly om te ontsluit, wagwoord, patroon, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"werkuitdaging, werk, profiel"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"werkprofiel, bestuurde profiel, verenig, vereniging, werk, profiel"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gebaar"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gebare"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"betaal, tik, betalings"</string>
     <string name="keywords_backup" msgid="470070289135403022">"rugsteun, rugsteun"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gebaar"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Net van gesterde kontakte af"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Geen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wekkers"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Wekkers is altyd \'n prioriteit en maak \'n geluid"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Onthounotas"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Geleenthede"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle bellers"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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 geoptimeer nie"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nie geoptimeer nie"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimaliseer batterygebruik"</string>
@@ -3187,8 +3280,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>
@@ -3225,7 +3318,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Dinsdag 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Dinsdag 18:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"Nie gekoppel nie"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> van die data is gebruik"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> se data is gebruik"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">Af vir <xliff:g id="COUNT">%d</xliff:g> programme</item>
       <item quantity="one">Af vir 1 program</item>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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 na tyd, kennisgewingikone en ander inligting te kyk."</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Aan"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Af"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Selflaaiprogram is reeds ontsluit"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sinkroniseer werkdata outomaties"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Laat programme data outomaties herlaai"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Rekeningsinkronisering"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinkronisering aan vir <xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$d</xliff:g> items"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sinkronisering aan vir alle items"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sinkronisering af vir alle items"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Inligting oor bestuurde toestel"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Veranderinge en instellings wat deur jou organisasie bestuur word"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Veranderinge en instellings wat deur <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> bestuur word"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Wat is nuut en opwindend?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Kyk na die top-5-kenmerke"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-registrasiestaat"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Geregistreer"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nie geregistreer nie"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 2e991b8a1fcec2b8ed40674e7063ba3d086e1436..b20d7915ab4a9d0ccb4caa9a6f595fcaf347edca 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 3cb9341b34a7ea69b9378c0de67c6e7bd03ddbba..309de05bc06022c81c7cad22cb2ca9d5871a0215 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">"ደህንነት እና ሥፍራ"</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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"በኋላ ላይ ያድርጉት"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"የጣት አሻራን ማቀናበር ይዘለል?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"የእርስዎን ስልክ ለመክፈት የጣት አሻራዎችዎን እንደ አንድ መንገድ መርጠዋል። አሁን ከዘለሉት ይህንን በኋላ ላይ ማዘጋጀት ይኖርብዎታል። ማዘጋጀት አንድ ወይም ሁለት ደቂቃ ብቻ ነው የሚወስደው።"</string>
     <string name="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="1688030823464420974">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ ሥርዓተ ጥለት ካስገቡ የዚህ መሣሪያ ውሂብ ይሰረዛል"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ ፒን ካስገቡ የዚህ መሣሪያ ውሂብ ይሰረዛል"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"በሚቀጥለው ሙከራ ላይ ትክክል ያልሆነ የይለፍ ቃል ካስገቡ የዚህ መሣሪያ ውሂብ ይሰረዛል"</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="5047439819181833824">"በጣም ብዙ ትክክል ያልሆኑ ሙከራዎች። የዚህ መሣሪያ ውሂብ ይሰረዛል።"</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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fiን በራስ-ሰር አብራ"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"እንደ የቤትዎ አውታረ መረብ ካሉ የተቀመጡ አውታረ መረቦች አጠገብ ሲሆኑ Wi‑Fi ተመልሶ ይበራል"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"የWi‑Fi ቅኝት ስለጠፋ አይገኝም"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ለመጠቀም፣ የአውታረ መረብ ደረጃ ሰጪ አቅራቢ ይምረጡ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ደካማ ግንኙነቶችን አስወግድ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ጥሩ የበይነመረብ ግንኙነት ከሌለው በስተቀር የWi-Fi አውታረ መረብ አይጠቀሙ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ጥሩ የበይነመረብ ግንኙነት ያላቸው አውታረ መረቦችን ብቻ ተጠቀም"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ከክፍት አውታረ መረቦች ጋር ተገናኝ"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"በራስ-ሰር ከባለከፍተኛ ጥራት ይፋዊ አውታረ መረቦች ጋር ተገናኝ"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ለመጠቀም፣ የአውታረ መረብ ደረጃ ሰጪ አቅራቢ ይምረጡ"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ለመጠቀም፣ ተኳዃኝ የሆነ የአውታረ መረብ ደረጃ ሰጪ አቅራቢ ይምረጡ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"የእውቅና ማረጋገጫዎችን ይጫኑ"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"የአካባቢ ትክክለኛነትን ለማሻሻል የስርዓት መተግበሪያዎች እና አገልግሎቶች አሁንም የ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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"የአካባቢ ትክክለኝነትን ለማሻሻል በ<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>የቅንት ቅንብሮች<xliff:g id="LINK_END_1">LINK_END</xliff:g> ውስጥ የWi-Fi ማብራትን ያብሩ።"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"ሁልጊዜ እንደበራ ይሆናል / የባትሪ አጠቃቀምን ይጨምራል"</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="6978257596231155345">"ሰዓት፣ የማሳወቂያ አዶዎች እና ሌላ መረጃ አሳይ። የባትሪ አጠቃቀምን ይጨምራል።"</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 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"በዚህ መሣሪያ ላይ ያሉ ሌሎች ተጠቃሚዎች አሉ።\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"በeSIM ላይ ያሉ የአገልግሎት አቅራቢዎች"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ይሄ የተንቀሳቃሽ ስልክ አገልግሎት እቅድዎን አይሰርዘውም።"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ \n\nለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ማከማቻ አጥፋ"</string>
     <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 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"የማያ ገጽ አንባቢዎች፣ ማሳያ፣ የመስተጋብር መቆጣጠሪያዎች"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"የእይታ ቅንብሮች"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ይህን መሣሪያ ከእርስዎ ፍላጎቶች ጋር እንዲጣጣም ማበጀት ይችላሉ። እነዚህ የተደራሽነት ባህሪያት በኋላ ላይ በቅንብሮች ውስጥ ሊቀየሩ ይችላሉ።"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"የቁምፊ መጠን ጨምር"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"የማያ ገጽ አንባቢዎች"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ኦዲዮ እና የማያ ገጽ ላይ ጽሑፍ"</string>
     <string name="display_category_title" msgid="685461049938269166">"አሳይ"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> ስልክዎን እንደነቃ እያቆየው ስለሆነ ስልክዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት መተግበሪያውን ማቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማራገፍ ሊኖርብዎት ይችላል።"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> ጡባዊዎን እንደነቃ እያቆየው ስለሆነ ጡባዊዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት መተግበሪያውን ማቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማራገፍ ሊኖርብዎት ይችላል።"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> መሣሪያዎን እንደነቃ እያቆየው ስለሆነ መሣሪያዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት መተግበሪያውን ማቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማራገፍ ሊኖርብዎት ይችላል።"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> ዝም ብሎ ስልክዎን እያነቃው ስለሆነ ስልክዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት ለመሞከር <xliff:g id="APP_1">%1$s</xliff:g>ን ማስቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማረገፍ ሊኖርብዎ ይችላል።"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> ዝም ብሎ ጡባዊዎን እያነቃው ስለሆነ ጡባዊዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት ለመሞከር <xliff:g id="APP_1">%1$s</xliff:g>ን ማስቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማረገፍ ሊኖርብዎ ይችላል።"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> ዝም ብሎ መሣሪያዎን እያነቃው ስለሆነ መሣሪያዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት ለመሞከር <xliff:g id="APP_1">%1$s</xliff:g>ን ማስቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማረገፍ ሊኖርብዎ ይችላል።"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"መተግበሪያን አስቁም"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"ከበስተጀርባ መጠቀም ይጥፋና መተግበሪያ ይቁም?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> ዝም ብሎ ስልክዎን ስለሚያነቃው ያለው የስልክዎን ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልተቻለም።\n\nይህን ችግር ለመፍታት ይሞክሩ፣ <xliff:g id="APP_1">%1$s</xliff:g>ን ማስቆም እና በበስተጀርባ ማሄዱን እንዳይቀጥል ማድረግ ይችላሉ።"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> ዝም ብሎ የእርስዎን ጡባዊ ስለሚያነቃው ያለው የጡባዊዎን ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልተቻለም።\n\nይህን ችግር ለመፍታት ይሞክሩ፣ <xliff:g id="APP_1">%1$s</xliff:g>ን ማስቆም እና በበስተጀርባ ማሄዱን እንዳይቀጥል ማድረግ ይችላሉ።"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> ዝም ብሎ መሣሪያዎን ስለሚያነቃው ያለው መሣሪያዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልተቻለም።\n\nይህን ችግር ለመፍታት ይሞክሩ፣ <xliff:g id="APP_1">%1$s</xliff:g>ን ማስቆም እና በበስተጀርባ ማሄዱን እንዳይቀጥል ማድረግ ይችላሉ።"</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="7774807745601479888">"<xliff:g id="APP">%1$s</xliff:g> በማይጠቀሙበት ጊዜ የእርስዎን አካባቢ ዝም ብሎ ስለሚጠይቅ ስልክዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልተቻለም።\n\nይህን ችግር ለመፍታት ለዚህ መተግበሪያ አካባቢን ማጥፋት ይችላሉ።"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"<xliff:g id="APP">%1$s</xliff:g> በማይጠቀሙበት ጊዜ የእርስዎን አካባቢ ዝም ብሎ ስለሚጠይቅ ጡባዊዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልተቻለም።\n\nይህን ችግር ለመፍታት ለዚህ መተግበሪያ አካባቢን ማጥፋት ይችላሉ።"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"<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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"መጨረሻ ላይ ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ያለው ትንታኔ"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"ሙሉ ኃይል የነበረበት መጨረሻ ጊዜ"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ቀሪ የባትሪ አጠቃቀም ግምታዊ ሲሆን በአጠቃቀም መሠረት ሊቀየር ይችላል"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"የባትሪ አጠቃቀም ውሂብ ተቀራራቢ ግምት ሲሆን በአጠቃቀም ላይ በመመስረት ሊለወጥ ይችላል"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"በንቁ አጠቃቀም ላይ እያለ"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"በጀርባ ውስጥ ሳለ"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"የባትሪ አጠቃቀም"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"ለማስከፈት ያንሸራትቱ፣ የይለፍ ቃል፣ ስርዓተ-ጥለት፣ ፒን"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"የስራ ፈተና፣ ስራ፣ መገለጫ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"የሥራ መገለጫ፣ የሚተዳደር መገለጫ፣ አዋህድ፣ ውህደት፣ ሥራ፣ መገለጫ"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"የጣት ምልክት"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"የጣት ምልክቶች"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ይክፈሉ፣ መታ ያድርጉ፣ ክፍያዎች"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ምትኬ"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"የጣት ምልክት"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ኮከብ ከተደረገባቸው እውቂያዎች ብቻ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ምንም"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ማንቂያዎች"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ማንቂያዎች ሁልጊዜ ቅድሚያ የሚሰጣቸው ሲሆን ድምጽ ይፈጥራሉ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"አስታወሾች"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ክስተቶች"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ሁሉም ደዋዮች"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,14 +3398,13 @@
     <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>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ገደቦች</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"የአገልግሎት አቅራቢ ውሂብ የሂሳብ አከፋፈል ከመሳስሪያ የሂሳብ አከፋፈል የተለየ ሊሆን ይችላል"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"የአገልግሎት አቅራቢ ውሂብ የሂሳብ አከፋፈል ከመሳሪያ የሂሳብ አከፋፈል የተለየ ሊሆን ይችላል"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> ጥቅም ላይ ውሏል"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"የውሂብ ማስጠንቀቂያ አዘጋጅ"</string>
     <string name="data_warning" msgid="209133958008062117">"የውሂብ ማስጠንቀቂያ"</string>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"የእጅ ውዝዋዜ ረዳት"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ትብነት"</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="gesture_setting_on" msgid="3455094265233870280">"በርቷል"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ጠፍቷል"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ማስነሻ አስቀድሞ ተከፍቷል"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"የስራ ውሂብን በራስ-ሰር አስምር"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"መተግበሪያዎች በራስ-ሰር ያድሱ"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"የመለያ ስምሪት"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"ለ<xliff:g id="ID_1">%1$d</xliff:g> ከ<xliff:g id="ID_2">%2$d</xliff:g> ንጥሎች ስምረትን አብራ"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"ለሁሉም ንጥሎች ስምረትን አብራ"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"ለሁሉም ንጥሎች ስምረትን አጥፋ"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"የሚተዳደር መሣሪያ መረጃ"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"በእርስዎ ድርጅት የሚተዳደሩ ለውጦች እና ቅንብሮች"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"በ<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> የሚተዳደሩ ለውጦች እና ቅንብሮች"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"ምን አዲስ እና አስደሳች ነገር አለ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ከፍተኛዎቹን 5 ባህሪያት ይሞክሩዋቸው"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"የIMS ምዝገባ ቀን"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"የተመዘገበ"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"አልተመዘገበም"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index e98eee2570a32c102ff2d8582e74525cff3a975a..a31ead4e93feec64b62a8e1418bbb480fdfd8d7a 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -33,7 +33,7 @@
     <item msgid="3342301044271143016">"١٥ ثانية"</item>
     <item msgid="8881760709354815449">"۳۰ ثانية"</item>
     <item msgid="7589406073232279088">"دقيقة واحدة"</item>
-    <item msgid="7001195990902244174">"۲ دقائق"</item>
+    <item msgid="7001195990902244174">"دقيقتان"</item>
     <item msgid="7489864775127957179">"٥ دقائق"</item>
     <item msgid="2314124409517439288">"۱۰ دقائق"</item>
     <item msgid="6864027152847611413">"۳۰ دقيقة"</item>
@@ -61,7 +61,7 @@
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"صغير"</item>
-    <item msgid="6986443533756848935">"الإعداد الافتراضي"</item>
+    <item msgid="6986443533756848935">"الإعداد التلقائي"</item>
     <item msgid="38373998008112077">"كبير"</item>
     <item msgid="7635254317531872272">"الأكبر"</item>
   </string-array>
@@ -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>
@@ -386,7 +376,7 @@
     <item msgid="2372711992605524591">"طويلة"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
-    <item msgid="1319652728542138112">"افتراضي"</item>
+    <item msgid="1319652728542138112">"تلقائي"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"‏Sans-serif مكثف"</item>
     <item msgid="7247838127505318669">"Sans-serif monospace"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 4c6c2612cc452a51b80d3b4b28fa5b7519870bb0..9fc81553fa1aab0be437f4eb8a1e0fce6753b516 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) -->
@@ -289,7 +301,7 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"السماح باستخدام البيانات عبر شبكة الجوال"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"السماح باستخدام بيانات التجوال"</string>
     <string name="roaming" msgid="3596055926335478572">"تجوال البيانات"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"اتصال بخدمات البيانات عند التجوال"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"الاتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"اتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"لقد فقدت اتصال البيانات نظرًا لأنك أوقفت تشغيل تجوال البيانات بشبكتك الرئيسية."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"تشغيل"</string>
@@ -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,39 @@
     <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="skip_anyway_button_label" msgid="2323522873558834513">"التخطي على أي حال"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"تنفيذ ذلك لاحقًا"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"هل تريد تخطي إعداد بصمة الإصبع؟"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"لقد اخترت استخدام بصمة الإصبع كوسيلة لإلغاء تأمين هاتفك. إذا تخطيت ذلك الآن، فستحتاج إلى إعداده لاحقًا. لن يستغرق منك الإعداد سوى دقيقة تقريبًا."</string>
     <string name="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 +472,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,15 +544,23 @@
     <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="1688030823464420974">"عند إدخال نقش غير صحيح في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"عند إدخال رقم تعريف شخصي غير صحيح في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"عند إدخال كلمة مرور غير صحيحة في المحاولة التالية، سيتم حذف بيانات هذا الجهاز"</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="5047439819181833824">"لقد استنفدت عدد المحاولات غير الصحيحة وسيتم حذف بيانات هذا الجهاز."</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_pin_too_short" msgid="3638188874397727648">"يجب أن يحتوي رقم التعريف الشخصي على <xliff:g id="COUNT">%d</xliff:g> أرقام على الأقل"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
     <string name="lockpassword_password_too_long" msgid="4591720174765403476">"يجب ألا تزيد كلمة المرور عن <xliff:g id="NUMBER">%d</xliff:g> من الأحرف"</string>
     <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"يجب ألا يزيد رقم التعريف الشخصي عن <xliff:g id="NUMBER">%d</xliff:g> من الأرقام"</string>
@@ -670,6 +691,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>
@@ -730,16 +759,19 @@
     <string name="wifi_error" msgid="3207971103917128179">"خطأ"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"لا يتوفر التردد ٥ غيغاهرتز في هذا البلد"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"في وضع الطائرة"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"إشعار الشبكات المفتوحة"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"الإشعار بوجود شبكات مفتوحة"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"الإشعار عند توفر شبكة عامة عالية الجودة"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"‏تشغيل شبكة Wi‑Fi تلقائيًا"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"‏ستتم إعادة تشغيل شبكة Wi‑Fi بالقرب من الشبكات المحفوظة العالية الجودة، مثل الشبكة المنزلية"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‏غير متاح لأنه تم إيقاف فحص شبكات Wi‑Fi"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"لاستخدام الميزة، اختر مقدِّم خدمة تقييم شبكة"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"تجنب الاتصالات الضعيفة"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"‏عدم استخدام شبكات Wi-Fi ما لم يكن لها اتصال إنترنت جيد"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"استخدام الشبكات ذات اتصال الإنترنت الجيد فقط"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"التوصيل بالشبكات المفتوحة"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"الاتّصال بالشبكات المفتوحة"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"الاتصال تلقائيًا بالشبكات العامة العالية الجودة"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"لاستخدام الميزة، اختر مقدِّم خدمة تقييم شبكة"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"لاستخدام الميزة، اختر مقدِّم خدمة تقييم شبكة متوافق"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"تثبيت شهادات"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"‏لتحسين دقة الموقع، سيظل بإمكان تطبيقات وخدمات النظام البحث عن شبكات 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"‏لتحسين دقة تحديد الموقع، يمكنك تشغيل البحث عن شبكات Wi-Fi من خلال <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>إعدادات البحث<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -771,7 +803,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"حذف الشبكة"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"تعديل الشبكة"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏الكتابة في علامة NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"‏لمشاهدة الشبكات المتاحة، شغّل Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"‏لمعرفة الشبكات المتاحة، يُرجى تشغيل Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"‏جارٍ البحث عن شبكات Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"‏ليس لديك إذن لتغيير شبكة Wi‑Fi."</string>
     <string name="wifi_more" msgid="3195296805089107950">"المزيد"</string>
@@ -823,6 +855,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>
@@ -858,7 +891,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>
@@ -895,9 +927,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>
@@ -944,6 +984,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>
@@ -1001,6 +1042,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>
@@ -1028,23 +1070,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>
@@ -1068,8 +1109,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="7337555569694794132">"قيد التشغيل دائمًا / زيادة استخدام البطارية"</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="6978257596231155345">"عرض الوقت ورموز الإشعارات وغيرها من المعلومات. يؤدي ذلك إلى زيادة استخدام البطارية."</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>
@@ -1149,7 +1196,7 @@
     <string name="status_data_state" msgid="5503181397066522950">"حالة شبكة الجوال"</string>
     <string name="status_service_state" msgid="2323931627519429503">"حالة الخدمة"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"قوة الإشارة"</string>
-    <string name="status_roaming" msgid="2638800467430913403">"تجوال"</string>
+    <string name="status_roaming" msgid="2638800467430913403">"التجوال"</string>
     <string name="status_operator" msgid="2274875196954742087">"الشبكة"</string>
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"‏عنوان Mac لشبكة Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"عنوان البلوتوث"</string>
@@ -1325,6 +1372,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>
@@ -1352,12 +1400,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"تم تسجيل دخولك حاليًا في الحسابات التالية:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"هناك مستخدمون آخرون موجودون على هذا الجهاز.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">"‏"<li>"شركات تشغيل شبكة الجوّال على eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"لن يؤدي هذا إلى إلغاء خطة خدمة الجوّال."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"وحدة تخزين USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب مسح "<b>"بطاقة SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"‏محو وحدة تخزين USB"</string>
     <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>
@@ -1380,26 +1433,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>
@@ -1432,7 +1474,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>
@@ -1453,7 +1495,7 @@
     <string name="location_access_summary" msgid="69031404093194341">"السماح للتطبيقات التي طلبت إذنك باستخدام معلومات موقعك"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"مصادر الموقع"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"حول الجهاز اللوحي"</string>
-    <string name="about_settings" product="default" msgid="1743378368185371685">"حول الهاتف"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"لمحة عن الهاتف"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"حول الجهاز في وضع المحاكاة"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"عرض المعلومات القانونية والحالة وإصدار البرنامج"</string>
     <string name="legal_information" msgid="5769301644270604095">"المعلومات القانونية"</string>
@@ -1477,8 +1519,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>
@@ -1508,7 +1553,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"‏تغيير رمز PIN لإلغاء التأمين"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ارسم نقش إلغاء التأمين"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"اضغط على \"القائمة\" للمساعدة."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"حرر الإصبع عند الانتهاء"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ارفع الإصبع عن الشاشة عند الانتهاء"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"صل <xliff:g id="NUMBER">%d</xliff:g> من النقاط على الأقل. أعد المحاولة."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"تم تسجيل النقش"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ارسم النقش مرة أخرى للتأكيد"</string>
@@ -1547,6 +1592,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>
@@ -1599,7 +1647,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"تطبيق الطوارئ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"إعادة تعيين تفضيلات التطبيقات"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"هل تريد إعادة تعيين تفضيلات التطبيقات؟"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"سيؤدي هذا إلى إعادة تعيين كل التفضيلات لما يلي:\n\n "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات الافتراضية للإجراءات"</li>\n" "<li>"قيود البيانات الخلفية للتطبيقات"</li>\n" "<li>"أي قيود أذونات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"سيؤدي هذا إلى إعادة تعيين كل التفضيلات لما يلي:\n\n "<li>"التطبيقات المعطلة"</li>\n" "<li>"إشعارات التطبيقات المعطلة"</li>\n" "<li>"التطبيقات التلقائية للإجراءات"</li>\n" "<li>"القيود على البيانات الخلفية للتطبيقات"</li>\n" "<li>"القيود على الأذونات"</li>\n\n" لن تفقد أي بيانات للتطبيقات."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"إعادة تعيين التطبيقات"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"إدارة المساحة"</string>
     <string name="filter" msgid="2018011724373033887">"تصفية"</string>
@@ -1719,6 +1767,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>
@@ -1817,6 +1869,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"أجهزة قارئ الشاشة، والعرض، وعناصر التحكم التفاعلية"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"إعدادات الرؤية"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"يمكنك تخصيص هذا الجهاز للتوافق مع احتياجاتك. ويمكن تغيير ميزات إمكانية الوصول هذه لاحقًا من خلال الإعدادات."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"زيادة حجم الخط"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"أجهزة قارئ الشاشة"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"الصوت والنص على الشاشة"</string>
     <string name="display_category_title" msgid="685461049938269166">"العرض"</string>
@@ -1957,6 +2010,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>
@@ -2023,6 +2084,29 @@
     <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="4006631636646776488">"لا يستطيع هاتفك إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP">%1$s</xliff:g> يبقي هاتفك نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف التطبيق.\n\nإذا استمر حدوث هذا الأمر، يمكنك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"لا يستطيع جهازك اللوحي إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP">%1$s</xliff:g> يبقي جهازك اللوحي نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف التطبيق.\n\nإذا استمر حدوث هذا الأمر، يمكنك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"لا يستطيع جهازك إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP">%1$s</xliff:g> يبقي جهازك نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف التطبيق.\n\nإذا استمر حدوث هذا الأمر، يمكنك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"لا يستطيع هاتفك إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP_0">%1$s</xliff:g> يبقي هاتفك نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف <xliff:g id="APP_1">%1$s</xliff:g>.\n\nإذا استمر حدوث هذا الأمر، يمكنك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"لا يستطيع جهازك اللوحي إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP_0">%1$s</xliff:g> يبقي جهازك اللوحي نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف <xliff:g id="APP_1">%1$s</xliff:g>.\n\nإذا استمر حدوث هذا الأمر، يمكنك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"لا يستطيع جهازك إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP_0">%1$s</xliff:g> يبقي جهازك نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف <xliff:g id="APP_1">%1$s</xliff:g>.\n\nإذا استمر حدوث هذا الأمر، يمكنك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"إيقاف التطبيق"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"هل تريد إيقاف الاستخدام في الخلفية وإيقاف التطبيق؟"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"لا يستطيع هاتفك إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP_0">%1$s</xliff:g> يُبقي هاتفك نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف <xliff:g id="APP_1">%1$s</xliff:g> ومنع تشغيله في الخلفية."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"لا يستطيع جهازك اللوحي إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP_0">%1$s</xliff:g> يُبقي جهازك اللوحي نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف <xliff:g id="APP_1">%1$s</xliff:g> ومنع تشغيله في الخلفية."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"لا يستطيع جهازك إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP_0">%1$s</xliff:g> يُبقي جهازك نشطًا بشكل مستمر.\n\nلمحاولة حلّ هذه المشكلة، يمكنك إيقاف <xliff:g id="APP_1">%1$s</xliff:g> ومنع تشغيله في الخلفية."</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="7774807745601479888">"لا يستطيع هاتفك إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP">%1$s</xliff:g> يطلب باستمرار معرفة موقعك أثناء عدم استخدامك له.\n\nلحلّ هذه المشكلة، يمكنك إيقاف خدمة الموقع لهذا التطبيق."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"لا يستطيع جهازك اللوحي إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP">%1$s</xliff:g> يطلب باستمرار معرفة موقعك أثناء عدم استخدامك له.\n\nلحلّ هذه المشكلة، يمكنك إيقاف خدمة الموقع لهذا التطبيق."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"لا يستطيع جهازك إدارة البطارية بشكل طبيعي لأن <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>
@@ -2037,7 +2121,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>
@@ -2089,12 +2173,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"تفاصيل الاستخدام منذ آخر شحن كامل"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"آخر شحن كامل"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"الوقت المتبقي حتى انتهاء البطارية تقريبي ويمكن أن يتغير حسب الاستخدام"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"بيانات استخدام البطارية تقديرية ويمكن أن تتغير حسب الاستخدام"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"أثناء الاستخدام النشط"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"أثناء الاستخدام في الخلفية"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"استخدام البطارية"</string>
@@ -2367,7 +2452,7 @@
     <string name="data_usage_app" msgid="4970478397515423303">"استخدام التطبيق"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"معلومات التطبيق"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"بيانات الجوّال"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"تعيين حد البيانات"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"ضبط حد البيانات"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"دورة استخدام البيانات"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"استخدام التطبيق"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"تجوال البيانات"</string>
@@ -2404,7 +2489,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"الجيل الثاني والثالث"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"الجوال"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"لا شيء"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"بيانات الجوال"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"بيانات الجوّال"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"بيانات الجيل الثاني والثالث"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"بيانات شبكة الجيل الرابع"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"البيانات الأمامية:"</string>
@@ -2418,14 +2503,14 @@
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"تقييد بيانات الخلفية ممكن فقط إذا عيّنت حدًا أقصى لبيانات الجوال."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"تشغيل مزامنة البيانات تلقائيًا؟"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"‏سيتم نسخ أية تغييرات تجريها على حساباتك على الويب إلى جهازك اللوحي تلقائيًا.\n\nويمكن أن تنسخ بعض الحسابات أيضًا أية تغييرات تجريها على الجهاز اللوحي إلى الويب تلقائيًا. يعمل حساب Google بهذه الطريقة."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"‏سيتم نسخ أية تغييرات تجريها على حساباتك على الويب إلى هاتفك تلقائيًا.\n\nويمكن أن تنسخ بعض الحسابات أيضًا أية تغييرات تجريها على الهاتف إلى الويب تلقائيًا. يعمل حساب Google بهذه الطريقة."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"‏سيتم نسخ أي تغييرات تجريها على حساباتك على الويب إلى هاتفك تلقائيًا.\n\nوقد تعمل بعض الحسابات أيضًا على نسخ التغييرات التي تجريها على الهاتف إلى الويب تلقائيًا، فهذه هي طريقة عمل حساب Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"إيقاف مزامنة البيانات تلقائيًا؟"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"سيؤدي هذا إلى الحفاظ على استخدام البيانات والبطارية، ولكنك ستحتاج إلى مزامنة كل حساب يدويًا لجمع المعلومات الحديثة. ولن تتلقى إشعارات عند حدوث التحديثات."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"تاريخ إعادة تعيين دورة الاستخدام"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"تاريخ إعادة ضبط دورة الاستخدام"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"تاريخ كل شهر:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"تعيين"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"تعيين تحذير استخدام البيانات"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"تعيين حد استخدام البيانات"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ضبط تحذيرات استخدام البيانات"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ضبط حد استخدام البيانات"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"وضع حد لاستخدام البيانات"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"سيُوقف جهازك اللوحي بيانات الجوال بعد الوصول إلى الحد الذي عيّنته.\n\nونظرًا لقياس جهازك اللوحي لاستخدام البيانات في حين قد يحاسبك مشغل شبكة الجوال على الاستخدام بطريقة مختلفة، فإننا ننصحك بتعيين حد معتدل."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"سيُوقف هاتفك بيانات الجوال بعد الوصول إلى الحد الذي عيّنته.\n\nونظرًا لقياس هاتفك لاستخدام البيانات في حين قد يحاسبك مشغل شبكة الجوال على الاستخدام بطريقة مختلفة، فإننا ننصحك بتعيين حد معتدل."</string>
@@ -2442,10 +2527,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الجهاز اللوحي. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الهاتف. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"قيود الشبكات"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"يتم التعامل مع الشبكات الخاضعة للقياس مثل شبكات الجوال عند تقييد بيانات الخلفية. وقد يردك تحذير من التطبيقات قبل استخدام هذه الشبكات مع التنزيلات الكبيرة."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"يتم التعامل مع الشبكات الخاضعة للقياس مثل التعامل مع شبكات الجوّال عند تقييد بيانات الخلفية. وقد يردك تحذير من التطبيقات قبل استخدام هذه الشبكات مع التنزيلات الكبيرة."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبكات الجوال"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"‏شبكات Wi-Fi الخاضعة للقياس"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"‏لتحديد شبكات خاضعة للقياس، مكِّن Wi-Fi."</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"‏لاختيار شبكات خاضعة للقياس، يُرجى تشغيل Wi-Fi."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"قد تختلف طريقة حساب بيانات مشغل شبكة الجوّال عن طريقة الحساب على جهازك."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"الاتصال بالطوارئ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"العودة إلى المكالمة"</string>
@@ -2500,7 +2585,7 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"تعديل الملف الشخصي"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"حذف الملف الشخصي"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"‏شبكة افتراضية خاصة (VPN) دائمة التشغيل"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"‏لم تتم إضافة أية شبكات افتراضية خاصة (VPN)"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"‏لم تتم إضافة أي شبكات افتراضية خاصة (VPN)"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"‏متابعة الاتصال بشبكة VPN في جميع الأوقات"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"عدم التوافق مع هذا التطبيق"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"تنشيط التشغيل دائمًا"</string>
@@ -2598,7 +2683,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"‏يمكنك مشاركة هذا الجهاز مع الآخرين من خلال إنشاء حسابات لمستخدمين إضافيين. وسيحصل كل مستخدم على مساحته الخاصة التي يمكنه تخصيصها بتطبيقاته وخلفياته التي يريدها وغيرها. كما يمكن للمستخدمين أيضًا ضبط إعدادات الجهاز مثل Wi-Fi والتي تؤثر في جميع المستخدمين.\n\nعند إضافة مستخدم جديد، يجب عليه إعداد مساحته.\n\nيمكن لأي مستخدم تحديث التطبيقات لجميع المستخدمين الآخرين."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"عند إضافة مستخدم جديد، فإنه يلزمه إعداد مساحته.\n\nويمكن لأي مستخدم تحديث التطبيقات لجميع المستخدمين الآخرين."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"هل تريد إعداد المستخدم الآن؟"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"تأكد أن الشخص متاح لأخذ جهازه وإعداد مساحته."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"يُرجى التأكّد من أن الشخص يمكنه استخدام الجهاز الآن وإعداد مساحته."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"هل ترغب في إعداد ملف شخصي الآن؟"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"الإعداد الآن"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ليس الآن"</string>
@@ -2622,7 +2707,7 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"جارٍ إضافة مستخدم جديد..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"حذف مستخدم"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"حذف"</string>
-    <string name="user_guest" msgid="8475274842845401871">"مدعو"</string>
+    <string name="user_guest" msgid="8475274842845401871">"ضيف"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"إزالة جلسة الضيف"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"هل تريد إزالة جلسة الضيف؟"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"سيتم حذف كل التطبيقات والبيانات في هذه الجلسة."</string>
@@ -2664,7 +2749,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>
@@ -2715,7 +2800,7 @@
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"‏تم تغيير بطاقات SIM"</string>
     <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"انقر لتعيين الأنشطة."</string>
-    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"بيانات الجوال غير متاحة"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"بيانات الجوّال غير متاحة"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"‏انقر لتحديد شريحة SIM للبيانات."</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"استخدام هذا للمكالمات دائمًا"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"‏تحديد شريحة SIM للبيانات"</string>
@@ -2758,9 +2843,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>
@@ -2810,9 +2898,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"مرر لإلغاء التأمين، كلمة مرور، نقش، رقم تعريف شخصي"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"المنافسة في العمل، عمل، ملف شخصي"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"الملف الشخصي للعمل، ملف شخصي مُدار، يوحِّد، توحيد، عمل، ملف شخصي"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"إيماءة"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"الإيماءات"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"دفع، نقر، دفعات"</string>
     <string name="keywords_backup" msgid="470070289135403022">"نسخ احتياطية، نسخة احتياطية"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"إيماءة"</string>
     <string name="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>
@@ -2899,7 +2988,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>
@@ -2914,6 +3004,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>
@@ -2945,8 +3039,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>
@@ -3038,6 +3130,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"من جهات الاتصال المميزة بنجمة فقط"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"من لا أحد"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"التنبيهات"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"المنبهات لها أولوية دائمًا وتصدِر تنبيهًا صوتيًا"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"التذكيرات"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"الأحداث"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"جميع المتصلين"</string>
@@ -3093,11 +3186,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>
@@ -3105,7 +3193,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>
@@ -3239,6 +3327,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>
@@ -3335,8 +3440,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>
@@ -3430,6 +3535,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>
@@ -3437,19 +3559,18 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"لتطبيق التغيير الذي تم إجراؤه على خدمة مراقبة الاتصالات الهاتفية، يُرجى إعادة تشغيل الجهاز"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"تحديثات النظام التلقائية"</string>
     <string name="usage" msgid="2977875522080448986">"الاستخدام"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"استخدام بيانات الجوال"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"استخدام بيانات الجوّال"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"‏استخدام بيانات Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"استخدام بيانات إيثرنت"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"إيثرنت"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> من بيانات الجوال"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> من بيانات الجوّال"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"‏<xliff:g id="AMOUNT">^1</xliff:g> من بيانات Wi-Fi"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> من بيانات إيثرنت"</string>
-    <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="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>
@@ -3461,8 +3582,8 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"قد تختلف طريقة حساب بيانات مشغِّل شبكة الجوّال عن طريقة الحساب على الجهاز"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدم"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"تعيين تحذير استخدام البيانات"</string>
-    <string name="data_warning" msgid="209133958008062117">"تحذير البيانات"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"ضبط تحذيرات استخدام البيانات"</string>
+    <string name="data_warning" msgid="209133958008062117">"تحذيرات البيانات"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"تعيين حد البيانات"</string>
     <string name="data_limit" msgid="1885406964934590552">"حد البيانات"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدم خلال الفترة <xliff:g id="ID_2">%2$s</xliff:g>"</string>
@@ -3477,7 +3598,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>
@@ -3545,8 +3666,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>
@@ -3629,25 +3749,32 @@
     <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_twist_for_camera_mode_title" msgid="4877834147983530479">"تقليب الكاميرا"</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="assist_gesture_title" msgid="7746563137898655539">"إيماءة المساعدة"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"الحساسية"</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="gesture_setting_on" msgid="3455094265233870280">"تشغيل"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"إيقاف"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"تم إلغاء قفل برنامج التحميل مسبقاً"</string>
@@ -3668,6 +3795,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"مزامنة بيانات العمل تلقائيًا"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"السماح للتطبيقات بتحديث البيانات تلقائيًا"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"مزامنة الحساب"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"المزامنة قيد التشغيل لـ <xliff:g id="ID_1">%1$d</xliff:g> من إجمالي <xliff:g id="ID_2">%2$d</xliff:g> عنصر"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"المزامنة قيد التشغيل لكل العناصر"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"المزامنة متوقفة لكل العناصر"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"معلومات الجهاز المُدار"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"تتولى مؤسستك إدارة التغييرات والإعدادات."</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"تتولى <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> إدارة التغييرات والإعدادات."</string>
@@ -3770,12 +3900,13 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"تطبيقات أخرى"</string>
     <string name="storage_files" msgid="8581083146777364063">"الملفات"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"سعة تخزين مستخدمة من <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"سعة التخزين المستخدمة من أصل <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"مستخدمة"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"مسح التطبيق"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"هل تريد إزالة هذا التطبيق الفوري؟"</string>
     <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>
@@ -3789,5 +3920,11 @@
     <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="698847081680980774">"ما الميزات الجديدة والمثيرة للاهتمام؟"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"الاطلاع على أفضل 5 ميزات"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"‏حالة تسجيل IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"مُسجَّل"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"غير مُسجَّل"</string>
 </resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 0f5d59ecc86a2bba4853c3e873916cb1b68e0992..5a1f909bb0029f63bda1a87abcaed05d4bb8d0fe 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 e294610e311d18dac9954717ac844fd7a1f31dc5..0727125ac7a3128df9a7113162af6a47133c00fe 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Daha sonra 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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"Növbəti cəhddə yanlış PIN daxil etsəniz, bu cihazın datası silinəcək"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi\'ı avtomatik olaraq aktiv edin"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi daxili şəbəkə kimi yüksək keyfiyyətli yadda saxlanmış şəbəkələrin yaxınlığında yenidən aktiv ediləcək"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi skanı deaktiv olduğuna görə əlçatmazdır"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"İstifadə etmək üçün şəbəkə reytinq provayderi seçin"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Keyfiyyətsiz bağlantıdan çəkinin"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Yaxşı İnternet bağlantısı yoxdursa, Wi-Fi şəbəkəsi istifadə etmə"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Yalnız keyfiyyətli internet bağlantısı olan şəbəkələri istifadə edin"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Açıq şəbəkələrə qoşulun"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Yüksək keyfiyyətli açıq şəbəkələrə avtomatik qoşulun"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"İstifadə etmək üçün şəbəkə reytinq provayderi seçin"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"İstifadə etmək üçün uyğun şəbəkə reytinq provayderi seçin"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikatları quraşdır"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Yerləşmə dəqiqliyini təkmilləşdirmək üçün sistem tətbiq və xidmətləri hələ də Wi‑Fi şəbəkələrini skan 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Məkan dəqiqliyini təkmilləşdirmək üçün <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skan ayarlarından<xliff:g id="LINK_END_1">LINK_END</xliff:g> Wi-Fi skanını aktiv edin."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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 internet bağlantısı hotspot vasitəsilə paylaşılır"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Bu telefonun internet 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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Həmişə aktiv / Batareya istifadəsi artırıldı"</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="6978257596231155345">"Vaxt, bildiriş ikonaları və digər məlumatı göstərin. Batareya istifadəsi artırıldı."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu cihazda başqa istifadəçilər iştirak edir.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiqi"</li>\n<li>"Fotolar"</li>\n<li>"Digər istifadəçi datası"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM operatorları"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bununla mobil xidmət planı ləğv edilməyəcək."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Həmçinin musiqi, şəkil və digər istifadəçi datası təmizləmək üçün "<b>"USB yaddaşı"</b>" silinməlidir."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musiqi, şəkil, və digər istifadəçi datasını silmək üçün "<b>"SD kartı"</b>" təmizləmək lazımdır."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB yaddaşı sil"</string>
     <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>
@@ -1324,26 +1377,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 internet bağlantısını paylaşın"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"USB vasitəsilə planşetin internet 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ı internetlə 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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekran oxuyucuları, görüntü, bağlantı nəzarəti"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Görünüş Ayarları"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bu cihazı ehtiyacınıza uyğun fərdiləşdirə bilərsiniz. Bu əlçatımlıq xüsusiyyətləri daha sonra Ayarlardan dəyişdirilə bilər."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Şrift ölçüsünü böyüdün"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekran oxuyucuları"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio və ekran mətni"</string>
     <string name="display_category_title" msgid="685461049938269166">"Görüntü"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Telefon batareya istifadəsini normal idarə edə bilmir, çünki <xliff:g id="APP">%1$s</xliff:g> telefonu oyaq saxlamağa davam edir.\n\nBu problemi həll etmək üçün tətbiqi dayandıra bilərsiniz.\n\nProblem baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"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\nBu problemi həll etmək üçün tətbiqi dayandıra bilərsiniz.\n\nProblem baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"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ək üçün tətbiqi dayandıra bilərsiniz.\n\nBu baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefon batareya istifadəsini normal idarə edə bilmir, çünki <xliff:g id="APP_0">%1$s</xliff:g> telefonu oyatmağa davam edir.\n\nBu problemi həll etmək üçün <xliff:g id="APP_1">%1$s</xliff:g> tətbiqini dayandıra bilərsiniz.\n\nProblem baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Planşet batareya istifadəsini normal idarə edə bilmir, çünki <xliff:g id="APP_0">%1$s</xliff:g> planşeti oyatmağa davam edir.\n\nBu problemi həll etmək üçün <xliff:g id="APP_1">%1$s</xliff:g> tətbiqini dayandıra bilərsiniz.\n\nProblem baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Cihaz batareya istifadəsinin normal idarə edə bilmir, çünki <xliff:g id="APP_0">%1$s</xliff:g> cihazı oyatmağa davam edir.\n\nBu problemi həll etmək üçün <xliff:g id="APP_1">%1$s</xliff:g> tətbiqini dayandıra bilərsiniz.\n\nProblem baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Tətbiqi dayandırın"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Arxa fon istifadəsi deaktiv edilsin və tətbiq dayandırılsın?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefon batareya istifadəsini normal idarə edə bilmir, çünki <xliff:g id="APP_0">%1$s</xliff:g> telefonu oyatmağa davam edir.\n\nBu problemi həll etmək üçün <xliff:g id="APP_1">%1$s</xliff:g> tətbiqini dayandıra və onun arxa fonda işləməsinin qarşısını ala bilərsiniz."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Planşet batareya istifadəsini normal idarə edə bilmir, çünki <xliff:g id="APP_0">%1$s</xliff:g> planşeti oyatmağa davam edir.\n\nBu problemi həll etmək üçün <xliff:g id="APP_1">%1$s</xliff:g> tətbiqini dayandıra və onun arxa fonda işləməsinin qarşısını ala bilərsiniz."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Cihaz batareya istifadəsinin normal idarə edə bilmir, çünki <xliff:g id="APP_0">%1$s</xliff:g> cihazı oyatmağa davam edir.\n\nBu problemi həll etmək üçün <xliff:g id="APP_1">%1$s</xliff:g> tətbiqini dayandıra və onun arxa fonda işləməsinin qarşısını ala bilərsiniz."</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="7774807745601479888">"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\n Bu problemi həll etmək üçün tətbiq məkanını deaktiv edə bilərsiniz."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"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\n Bu problemi həll etmək üçün tətbiq məkanını deaktiv edə bilərsiniz."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Cihaz 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\n Bu 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sonuncu tam doldurmadan sonrakı istifadə problemi"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Sonuncu tam doldurma"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Qalan batareya vaxtı təxminidir və istifadəyə əsasən dəyişə bilər"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Batareya istifadə datası təxminidir və istifadəyə əsasən dəyişir"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktiv istifadədə olarkən"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Arxa fonda olarkən"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batareya istifadəsi"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"kilidi açmaq üçün sürüşdürün, parol, qrafik açar, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"iş məşqi, iş, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"iş profili, idarə olunan profil, birləşdirin, birləşmə, iş, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"jest"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"jestlər"</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_assist_gesture_launch" msgid="813968759791342591">"jest"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Yalnız ulduzlanmış kontaktlardan"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Heç biri"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Siqnallar"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Siqnallar həmişə önəmlidir və səs çıxarır"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Xatırlamalar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tədbirlər"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Bütün zəng edənlər"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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 barmağınızı 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Aktiv"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Deaktiv"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Əməliyyat sistemi yükləyicisi artıq kiliddən çıxarılıb"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"İş datasını avtomatik olaraq sinxronizasiya edin"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Tətbiqlərə datanı avtomatik yeniləmək icazəsi verin"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Hesab sinxronizasiyası"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinxronizasiya <xliff:g id="ID_2">%2$d</xliff:g> elementin <xliff:g id="ID_1">%1$d</xliff:g> elementi üçün aktivdir"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Bütün elementlər üçün sinxronizasiya aktivdir"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Bütün elementlər üçün sinxronizasiya deaktivdir"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"İdarə edilən cihaz məlumatı"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Dəyişiklik və ayarlar təşkilat tərəfindən idarə olunur"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Dəyişiklik və ayarlar <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tərəfindən idarə olunur"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Yeni və maraqlı olan nədir?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Ən çox istifadə olunan 5 funksiyanı yoxlayın"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS qeydiyyat statusu"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Qeydiyyatlı"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Qeydiyyatsız"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 254091eb205d22382dc739d1ee05f2e377c2281c..f5a74d02779dd12356547f10a1a379dd25bf24f4 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>
@@ -171,10 +161,18 @@
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_peap_phase2_entries">
-    <item msgid="2577747762745812488">"Nijedno"</item>
+    <item msgid="2577747762745812488">"Ništa"</item>
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ništa"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ništa"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 2fcfb2a4ec2b8efe0fcd9a988f236ec2a7a3c468..1f05712a6f41a64254ea212a0cc54b2fd2f6fc4b 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Prebaci na"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Treba da obavite još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak da biste postali programer.</item>
       <item quantity="few">Treba da obavite još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka da biste postali programer.</item>
@@ -31,10 +30,11 @@
     </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>
-    <string name="header_category_personal" msgid="3310195187905720823">"Lično"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Lični"</string>
     <string name="header_category_access" msgid="7580499097416970962">"Pristup"</string>
     <string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Omogući vezu za prenos podataka"</string>
@@ -42,6 +42,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 +108,26 @@
     <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>
+    <!-- no translation found for bluetooth_disconnect_title (7830252930348734303) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (8208712728668714199) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (6611038575213485336) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (3995834526315103965) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_dialog_ok (3308586619539119106) -->
+    <skip />
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemate dozvolu za promenu podešavanja Bluetooth-a."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <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>
+    <!-- no translation found for bluetooth_footer_mac_message (1109366350000220283) -->
+    <skip />
+    <!-- no translation found for bluetooth_footer_mac_message (6807634484499166486) -->
+    <skip />
+    <!-- no translation found for bluetooth_footer_mac_message (8413944740341742061) -->
+    <skip />
     <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 +139,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +176,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Uređaji"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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) -->
@@ -321,8 +344,8 @@
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Prikaži informacije o vlasniku na zaključ. ekranu"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Poruka na zaključanom ekranu"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogući vidžete"</string>
-    <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Onemogućio je administrator"</string>
-    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nijedno"</string>
+    <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administrator je onemogućio"</string>
+    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Ništa"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Npr. Jocin Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Podaci o korisniku"</string>
@@ -331,14 +354,18 @@
     <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="9087149148665560415">"Bezbednost i zaključavanje ekrana"</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>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Podešavanja zaključanog ekrana"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja SIM kartice i zaključavanja akreditiva skladišta"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja skladišta akreditiva"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
-    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Onemogućio je administrator"</string>
+    <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Administrator je onemogućio"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Bezbednosni status"</string>
-    <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokacija, otisak prsta"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Zaključavanje ekrana, otisak prsta"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaključavanje ekrana"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravljaj otis. prstiju"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Koristi otis. prsta za"</string>
@@ -353,54 +380,69 @@
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_unlock_disabled (1550756694054944874) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_setup (6817326798834882531) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_introduction_continue_setup (1961957425135180242) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (1581834104051243425) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (4629503416877189572) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (2423428240245737909) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text (5219287483885558525) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text (1466238255429527112) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text (3008526710555416125) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_title (3051496861358227199) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_message (8793966374365960368) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (2819679722403209778) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (6158989350522518586) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (7567276170287972230) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (4796715961273420536) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Dodajte još jedan"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Dalje"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Osim za otključavanje telefona, otisak prsta možete da koristite i da biste dali ovlašćenje za kupovine i pristup aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7007548031540826618">"Opcija za zaključavanje ekrana je onemogućena. Kontaktirajte administratora organizacije da biste saznali više. "<annotation id="admin_details">"Još detalja"</annotation>\n\n"I dalje možete da koristite otisak prsta da biste odobravali kupovine i pristup aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Opcija zaključavanja ekrana je onemogućena. Da biste saznali više, obratite se administratoru organizacije. "<annotation id="admin_details">"Više detalja"</annotation>\n\n"I dalje možete da koristite otisak prsta za odobravanje kupovine i pristupa aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Podignite prst, pa ponovo dodirnite senzor"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Maksimalan broj otisaka prstiju koji možete da dodate je <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Ne možete da dodate još otisaka prstiju"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Ukloniti sve otiske prstiju?"</string>
-    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Otiske prstiju nećete moći da koristite za otključavanje telefona, ovlašćivanje kupovina ili prijavljivanje u aplikacije pomoću njih."</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="8840100810725902159">"Nećete moći da koristite otiske prstiju za otključavanje profila za Work, ovlašćivanje kupovina ili prijavljivanje u aplikacije za Work."</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Nećete moći da otključavate telefon, odobravate kupovine niti da se prijavljujete u aplikacije pomoću otisaka prstiju"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Nećete moći da otključavate profil za Work, odobravate kupovine niti da se prijavljujete u aplikacije za Work pomoću otisaka prstiju"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, ukloni"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Nastavite pomoću digitalnog otiska."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrovanje"</string>
@@ -448,7 +490,11 @@
     <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>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Zaključavanje profila za Work"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Promena zaključ. ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Menjanje ili onemogućavanje šablona, PIN koda ili bezbednosti lozinke"</string>
@@ -470,7 +516,7 @@
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Imprint + lozinka"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Nastavite bez otiska prsta"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Možete da otključate telefon pomoću otiska prsta. Ova opcija zahteva rezervni metod zaključavanja ekrana iz bezbednosnih razloga."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogućio administrator, smernice za šifrovanje ili skladištenje akreditiva"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Onemogućio administrator, smernice za šifrovanje ili skladište akreditiva"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prevucite"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Šablon"</string>
@@ -516,20 +562,28 @@
     <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>
-    <string name="lockpassword_password_too_long" msgid="4520363269062591833">"Mora da ima manje od <xliff:g id="NUMBER">%d</xliff:g> znak(ov)a."</string>
-    <string name="lockpassword_pin_too_long" msgid="4010052843684165845">"Maksimalan broj cifara je <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="5537252833154289817">"Mora da sadrži samo cifre 0–9."</string>
-    <string name="lockpassword_pin_recently_used" msgid="214840704635573454">"Administrator uređaja ne dozvoljava upotrebu nedavno korišćenog PIN-a."</string>
+    <string name="lockpassword_password_too_long" msgid="4591720174765403476">"Maksimalan broj znakova je <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"Maksimalan broj cifara je <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"Mora da sadrži samo cifre 0–9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"Administrator uređaja ne dozvoljava upotrebu nedavno korišćenog PIN-a"</string>
     <string name="lockpassword_illegal_character" msgid="8049611046639943217">"Ne sme da obuhvata nevažeći znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"Mora da sadrži najmanje jedno slovo"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Mora da sadrži najmanje jednu cifru"</string>
@@ -564,24 +618,28 @@
       <item quantity="few">Mora da sadrži najmanje <xliff:g id="COUNT">%d</xliff:g> znaka koji nisu slova</item>
       <item quantity="other">Mora da sadrži najmanje <xliff:g id="COUNT">%d</xliff:g> znakova koji nisu slova</item>
     </plurals>
-    <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"Administrator uređaja ne dozvoljava upotrebu nedavno korišćene lozinke."</string>
-    <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Rastući, opadajući ili ponovljeni niz cifara je zabranjen"</string>
+    <string name="lockpassword_password_recently_used" msgid="942665351220525547">"Administrator uređaja ne dozvoljava upotrebu nedavno korišćene lozinke"</string>
+    <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Rastući, opadajući ili ponovljeni niz cifara nije dozvoljen"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Potvrdi"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Otkaži"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Otkaži"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Sledeće"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Podešavanje je dovršeno."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacije za administratore uređaja"</string>
-    <!-- no translation found for number_of_device_admins_none (7185056721919496069) -->
-    <skip />
+    <string name="manage_device_admin" msgid="537804979483211453">"Apl. za administratora uređaja"</string>
+    <string name="number_of_device_admins_none" msgid="7185056721919496069">"Nema aktivnih aplikacija"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> aktivna aplikacija</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> aktivne aplikacije</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aktivnih aplikacija</item>
     </plurals>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"Pouzdani agenti"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Da biste ga koristili, prvo podesite zaključavanje ekrana"</string>
-    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Trust agents - Prikaz ili deaktiviranje"</string>
+    <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Ništa"</string>
+    <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aktivan pouzdani agent</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aktivna pouzdana agenta</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aktivnih pouzdanih agenata</item>
+    </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Uključi Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -627,6 +685,22 @@
     <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>
+    <!-- no translation found for bluetooth_connect_failed (4500234659813241053) -->
+    <skip />
+    <!-- no translation found for device_details_title (6576953269221085300) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_mac_address (2513724313558236181) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_title (38467834196432400) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_body (9087609557757135712) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_body (7785695793007576501) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_body (251257782642157557) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_forget_confirm_button (3829370108973879006) -->
+    <skip />
     <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>
@@ -684,25 +758,22 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Izaberi Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Uključivanje Wi-Fi-ja..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Isključivanje Wi-Fi-ja..."</string>
-    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Prikaži sve mreže"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Greška"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Opseg od 5 GHz nije dostupan u ovoj zemlji"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"U Režimu rada u avionu"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"Obaveštenja o otvorenim mrežama"</string>
-    <!-- no translation found for wifi_notify_open_networks_summary (8422402819267219458) -->
-    <skip />
-    <string name="wifi_wakeup" msgid="5685581457584270802">"Ponovo uključi Wi‑Fi"</string>
-    <!-- no translation found for wifi_wakeup_summary (7843701854850824229) -->
-    <skip />
+    <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Obavesti me kad god je dostupna javna mreža visokog kvaliteta"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"Automatski uključi Wi‑Fi"</string>
+    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi će se ponovo uključiti u blizini sačuvanih mreža visokog kvaliteta, kao što je kućna mreža"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nedostupno je jer je isključeno Wi‑Fi skeniranje"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbegavaj loše veze"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne koristi Wi-Fi mrežu ako nema dobru internet vezu"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Korišćenje samo onih mreža koje imaju dobru internet vezu"</string>
-    <!-- no translation found for use_open_wifi_automatically_title (6851951242903078588) -->
-    <skip />
-    <!-- no translation found for use_open_wifi_automatically_summary (8371085123988132834) -->
-    <skip />
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Povezuj se sa otvorenim mrežama"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatski se povezuj sa javnim mrežama visokog kvaliteta"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliraj sertifikate"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Da bi poboljšale tačnost lokacije, sistemske aplikacije i usluge će i dalje skenirati Wi‑Fi mreže. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Da biste poboljšali preciznost lokacije, uključite Wi-Fi skeniranje 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="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Ne prikazuj ponovo"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ne isključuj Wi-Fi tokom spavanja"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi je uključen tokom spavanja"</string>
@@ -716,6 +787,8 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Koristite mobilne podatke kada Wi‑Fi nema pristup internetu. Može da vam bude naplaćena potrošnja podataka."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj mrežu"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Podešavanja Wi‑Fi-ja"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi se automatski uključuje ponovo"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi se ne uključuje ponovo automatski"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi mreže"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS dugme"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Još opcija"</string>
@@ -794,8 +867,7 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ova mreža nema pristup internetu. Želite li da ostanete povezani?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ne pitaj ponovo za ovu mrežu"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi mreža nije povezana sa internetom"</string>
-    <!-- no translation found for lost_internet_access_text (9029649339816197345) -->
-    <skip />
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"Možete da pređete na mobilnu mrežu kad god je Wi‑Fi veza loša. Može da vam bude naplaćena potrošnja podataka."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Pređi na mobilne podatke"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Ostani na Wi‑Fi-ju"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Ne prikazuj ponovo"</string>
@@ -807,13 +879,17 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Čuvanje mreže nije uspelo"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Otkaži"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Sačuvane mreže"</string>
+    <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
+      <item quantity="one">%d mreža</item>
+      <item quantity="few">%d mreže</item>
+      <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="6547625164186585943">"Maska podmreže"</string>
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podmreže"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <string name="wifi_details_ipv6_address_header" msgid="4334059712014889425">"IPv6 adrese"</string>
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adrese"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Sačuvane mreže"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP podešavanja"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Napredna podešavanja Wi‑Fi mreže nisu dostupna za ovog korisnika"</string>
@@ -845,22 +921,36 @@
     <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>
-    <!-- no translation found for wifi_hotspot_off_subtext (2745508221200463254) -->
+    <!-- no translation found for wifi_hotspot_off_subtext (5466126533609394170) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_tethering_on_subtext (5752490509369962007) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_tethering_on_subtext (6461075246164300670) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_on_local_only_subtext (2068110388011294735) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_name_title (1341735529132128887) -->
     <skip />
-    <!-- no translation found for wifi_hotspot_off_subtext (7746761268472599794) -->
+    <!-- no translation found for wifi_hotspot_name_summary_connecting (3378299995508671967) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_name_summary_connected (3888672084861445362) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_password_title (1955592302902091281) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_ap_band_title (1165801173359290681) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_footer_info_regular (1203489406068036455) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_footer_info_local_only (857988412470694109) -->
     <skip />
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje hotspota…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje hotspota..."</string>
-    <!-- no translation found for wifi_tether_enabled_subtext (7842111748046063857) -->
-    <skip />
+    <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivan"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Greška prenosnog Wi‑Fi hotspota"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Podesi Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Podešavanje Wi‑Fi hotspota"</string>
-    <!-- no translation found for wifi_hotspot_configure_ap_text_summary (5560680057727007011) -->
-    <skip />
-    <!-- no translation found for wifi_tether_configure_subtext (2050196439900426456) -->
-    <skip />
+    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK hotspot"</string>
+    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Pozivanje preko Wi-Fi-ja"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Pozivanje preko Wi-Fi-ja"</string>
@@ -899,6 +989,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>
@@ -911,7 +1002,7 @@
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvuk zvona"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obaveštenje"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Koristi jačinu zvuka dolaznog poziva za obaveštenja"</string>
-    <string name="home_work_profile_not_supported" msgid="7457951997970419085">"Ne podržava profile za posao"</string>
+    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"Ne podržava profile za posao"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Podrazumevani zvuk obaveštenja"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Mediji"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Podešavanje jačine zvuka za muziku i video snimke"</string>
@@ -954,7 +1045,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Pretraga"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Upravljanje podešavanjima pretrage i istorijom"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"Nema rezultata"</string>
-    <string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Automatsko rotiranje ekrana"</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>
@@ -965,51 +1056,93 @@
     <string name="brightness_summary" msgid="838917350127550703">"Prilagođavanje osvetljenosti ekrana"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva osvetljenost"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizuje nivo osvetljenosti prema dostupnom svetlu"</string>
+    <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Isključeno"</string>
+    <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Željena osvetljenost je veoma niska"</string>
+    <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Željena osvetljenost je niska"</string>
+    <string name="auto_brightness_summary_default" msgid="7225666614394726845">"Željena osvetljenost je podrazumevana"</string>
+    <string name="auto_brightness_summary_high" msgid="7172304165631136027">"Željena osvetljenost je visoka"</string>
+    <string name="auto_brightness_summary_very_high" msgid="979277812582279078">"Željena osvetljenost je veoma visoka"</string>
+    <string name="auto_brightness_off_title" msgid="2996864829946190795">"Isključi"</string>
+    <string name="auto_brightness_very_low_title" msgid="8252988638614126320">"Veoma niska"</string>
+    <string name="auto_brightness_low_title" msgid="1632186441514863377">"Niska"</string>
+    <string name="auto_brightness_default_title" msgid="936771997353506620">"Podrazumevano"</string>
+    <string name="auto_brightness_high_title" msgid="2527853305981497345">"Visoka"</string>
+    <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"Veoma visoka"</string>
+    <string name="auto_brightness_subtitle" msgid="6454652530864093466">"Željeni nivo osvetljenosti"</string>
+    <string name="auto_brightness_off_summary" msgid="7629228736838155268">"Nemoj da prilagođavaš prema dostupnom svetlu"</string>
+    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Veća potrošnja baterije"</string>
+    <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>
+    <!-- no translation found for night_display_auto_mode_title (6574111412154833409) -->
+    <skip />
+    <!-- no translation found for night_display_auto_mode_never (2483761922928753400) -->
+    <skip />
+    <!-- no translation found for night_display_auto_mode_custom (2379394568898721765) -->
+    <skip />
+    <!-- no translation found for night_display_auto_mode_twilight (589042813708244059) -->
+    <skip />
     <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>
-    <!-- no translation found for night_display_temperature_title (1435292789272017136) -->
-    <skip />
-    <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>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
+    <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzitet"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for night_display_summary_off_auto_mode_never (3583590137322963513) -->
+    <skip />
+    <!-- no translation found for night_display_summary_off_auto_mode_custom (6365668239253173208) -->
+    <skip />
+    <!-- no translation found for night_display_summary_off_auto_mode_twilight (3596291693781757392) -->
+    <skip />
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for night_display_summary_on_auto_mode_never (9117830821363119835) -->
+    <skip />
+    <!-- no translation found for night_display_summary_on_auto_mode_custom (5510753572245577263) -->
+    <skip />
+    <!-- no translation found for night_display_summary_on_auto_mode_twilight (852270120144683507) -->
+    <skip />
     <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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadina"</string>
+    <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Podrazumevano"</string>
+    <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Prilagođeno"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Promenite pozadinu"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalizujte ekran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Izaberite pozadinu iz"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Čuvar ekrana"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kada je na baznoj stanici ili u stanju spavanja i puni se"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Dok se puni ili je na baznoj stanici"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bilo koje od ova dva"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tokom punjenja"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dok je na baznoj stanici"</string>
+    <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Nikada"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Da biste kontrolisali šta se dešava kada je telefon na baznoj stanici i/ili u stanju spavanja, uključite čuvar ekrana."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8644479926302707286">"Pokreni čuvara ekrana"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kada početi"</string>
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Trenutni čuvar ekrana"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Započni odmah"</string>
     <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>
+    <!-- no translation found for ambient_display_screen_title (4252755516328775766) -->
+    <skip />
+    <!-- no translation found for ambient_display_screen_summary_always_on (7974004969481877214) -->
+    <skip />
+    <!-- no translation found for ambient_display_screen_summary_notifications (1449570742600868654) -->
+    <skip />
+    <!-- no translation found for ambient_display_category_triggers (4359289754456268573) -->
+    <skip />
+    <!-- no translation found for doze_title (2375510714460456687) -->
+    <skip />
     <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">"Podešavanja zaključavanja SIM kartice"</string>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Podešavanje zaključavanja SIM kartice"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Zaključavanje SIM kartice"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"Zaključavanje SIM kartice"</string>
+    <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Isključeno"</string>
+    <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Zaključano"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zaključavanje SIM kartice"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Zaključaj SIM karticu"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Zahtevaj PIN radi upotrebe tableta"</string>
@@ -1184,9 +1317,8 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Istraži uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Ostalo obuhvata deljene datoteke koje su sačuvale aplikacije, datoteke preuzete sa Interneta ili Bluetooth-a, Android datoteke i tako dalje. \n\nDa biste videli vidljivi sadržaj na uređaju <xliff:g id="NAME">^1</xliff:g>, dodirnite Istraži."</string>
-    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistem obuhvata datoteke koje Android ne može da prikaže zasebno."</string>
-    <!-- no translation found for storage_detail_dialog_user (3267254783294197804) -->
-    <skip />
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem obuhvata datoteke koje se koriste za pokretanje verzije Android <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> možda ima sačuvane slike, muziku, aplikacije ili druge podatke, koji zauzimaju <xliff:g id="SIZE">^2</xliff:g> memorijskog prostora. \n\nDa biste pogledali detalje, pređite na <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Podesite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Koristi kao prenosivu memoriju"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Za prenos slika i drugih medija sa jednog uređaja na drugi."</string>
@@ -1257,9 +1389,11 @@
     <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">"Ponovo postavi podrazumevano"</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>
+    <string name="reset_dashboard_title" msgid="4412694650600342973">"Resetuj"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Resetovanje podešavanja mreže"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Ovim resetujete sva podešavanja mreže, uključujući:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilne podatke"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Resetuj podešavanja"</string>
@@ -1269,6 +1403,12 @@
     <string name="network_reset_not_available" msgid="7188610385577164676">"Resetovanje mreže nije dostupno za ovog korisnika"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Podešavanja mreže su resetovana"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Resetovanje na fabrička podešavanja"</string>
+    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
+      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> nalog će biti resetovan</item>
+      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> naloga će biti resetovana</item>
+      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> naloga će biti resetovano</item>
+    </plurals>
+    <string name="master_clear_summary" msgid="6902443944660426951">"Interna memorija i svi podaci će biti resetovani"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"Podatke i podešavanja sistema i aplikacija"</li>\n<li>"Preuzete aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"Podatke i podešavanja sistema i aplikacija"</li>\n<li>"Preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni na sledeće naloge:\n"</string>
@@ -1280,6 +1420,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>
@@ -1295,54 +1438,35 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosni hotspot"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth privezivanje"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Povezivanje sa internetom"</string>
-    <!-- no translation found for tether_settings_title_all (3058586928118801157) -->
-    <skip />
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Hotspot i privezivanje"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot je uključen, privezivanje"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot je uključen"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Privezivanje"</string>
     <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="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth privezivanje"</string>
-    <!-- no translation found for bluetooth_tethering_available_subtext (2092766774943506688) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_available_subtext (313873759999970236) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_device_connected_subtext (6388191062495199481) -->
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_device_connected_subtext (5970460338828861091) -->
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (3253150865825199632) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8268867745495039177) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext_config (6326877798974938021) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1889565070769307732) -->
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth privezivanje"</string>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1838503633450298902) -->
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
     <skip />
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Nije privezano"</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_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>
-    <!-- no translation found for tethering_footer_info (7287131664937054043) -->
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
     <skip />
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
-    <!-- no translation found for network_settings_title (2876509814832830757) -->
-    <skip />
+    <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>
     <string name="sms_application_title" msgid="4903928270533250448">"Aplikacija za SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Želite li da promenite aplikaciju za SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Želite li da koristite <xliff:g id="NEW_APP">%1$s</xliff:g> umesto <xliff:g id="CURRENT_APP">%2$s</xliff:g> kao aplikaciju za SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Želite li da koristite <xliff:g id="NEW_APP">%s</xliff:g> kao aplikaciju za SMS?"</string>
-    <!-- no translation found for network_scorer_picker_title (7226219386351714766) -->
-    <skip />
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Dobavljač ocene mreže"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Ništa"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Želite da promenite Wi‑Fi assistant-a?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Želite li da koristite aplikaciju <xliff:g id="NEW_APP">%1$s</xliff:g> umesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> za upravljanje mrežnim vezama?"</string>
@@ -1367,8 +1491,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_menu_scanning" msgid="8536245838478802959">"Skeniranje"</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>
@@ -1471,7 +1594,7 @@
     <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Koristi jedno zaključavanje"</string>
     <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Koristite jedno zaključavanje ekrana za profil za Work i uređaj"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Želite li da koristite jedno zaključavanje?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="1787427605545808829">"Profil za Work i ekran uređaja će koristiti isto zaključavanje ekrana. Sve smernice za zaključavanje za profil za Work primenjivaće se i na zaključavanje ekrana uređaja."</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"Uređaj će koristiti zaključavanje ekrana za Work profil. Smernice za Work će se primenjivati na oba zaključavanja."</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"Zaključavanje ekrana za profil za Work nije u skladu sa bezbednosnim zahtevima vaše organizacije. Možete da koristite isto zaključavanje ekrana za uređaj i profil za Work, ali će se primenjivati sve smernice za zaključavanje ekrana za Work."</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"Koristi jedno zaključavanje"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"Koristi jedno zaključavanje"</string>
@@ -1483,10 +1606,14 @@
     <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>
-    <!-- no translation found for install_all_warning (8310489909586138165) -->
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
     <skip />
-    <!-- no translation found for install_all_warning (1952257127370115988) -->
+    <!-- no translation found for see_all_apps_title (1459400183763114135) -->
     <skip />
+    <!-- no translation found for recent_app_summary (3366446669844932300) -->
+    <skip />
+    <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogući još opcija podešavanja"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informacije o aplikaciji"</string>
@@ -1507,9 +1634,9 @@
     <string name="controls_label" msgid="7611113077086853799">"Kontrole"</string>
     <string name="force_stop" msgid="7435006169872876756">"Prinudno zaustavi"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Ukupno"</string>
-    <string name="application_size_label" msgid="8494609207373874267">"Aplikacija"</string>
+    <string name="application_size_label" msgid="7376689739076506885">"Veličina aplikacije"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Aplikacija USB memorije"</string>
-    <string name="data_size_label" msgid="8679376373625710107">"Podaci"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"Podaci korisnika"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Podaci o USB memoriji"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kartica"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstaliraj"</string>
@@ -1590,7 +1717,7 @@
     <string name="app_forward_locked" msgid="6331564656683790866">"Aplikacija je zaštićena od kopiranja."</string>
     <string name="invalid_location" msgid="4354595459063675191">"Lokacija za instaliranje nije važeća."</string>
     <string name="system_package" msgid="1352722848400644991">"Nije moguće instalirati ažuriranja sistema na spoljašnjim medijima."</string>
-    <string name="move_error_device_admin" msgid="8148342933314166497">"Administrator uređaja ne može da se instalira na spoljnim medijima."</string>
+    <string name="move_error_device_admin" msgid="8673026002690505763">"Aplikacija za administratora uređaja ne može da se instalira na spoljnim medijima"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Želite li da prinudno zaustavite?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"Ako prinudno zaustavite aplikaciju, možda će se ponašati neočekivano."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
@@ -1607,6 +1734,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Prodavnica"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalji o aplikaciji"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija je instalirana iz prodavnice <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Više informacija na <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operacije aplikacija"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Aktivno"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikada nije korišćeno)"</string>
@@ -1654,10 +1782,14 @@
     <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>
+    <!-- no translation found for language_input_gesture_title (8749227808244881255) -->
+    <skip />
+    <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>
-    <!-- no translation found for input_assistance (7577795275222555487) -->
-    <skip />
+    <string name="input_assistance" msgid="7577795275222555487">"Pomoć za unos"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatura i metode unosa"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jezici"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1670,15 +1802,11 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pritisnite taster za razmak dvaput da biste umetnuli „.“"</string>
     <string name="show_password" msgid="4837897357002495384">"Prikazuj lozinke"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"Prikazuje znakove nakratko dok kucate"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Ovaj metod unosa možda može da prikuplja sav tekst koji unosite, uključujući lične podatke, kao što su lozinke i brojevi kreditnih kartica. Potiče od aplikacije <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Želite li da koristite ovaj metod unosa?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ovaj kontrolor pravopisa možda može da prikuplja sav tekst koji kucate, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Potiče od aplikacije <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Želite li da koristite ovaj kontrolor pravopisa?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Podešavanja"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Jezik"</string>
-    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Otvaranje podešavanja za aplikaciju <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g> nije uspelo"</string>
-    <!-- no translation found for keyboard_and_input_methods_category (6035224122054465137) -->
-    <skip />
-    <!-- no translation found for virtual_keyboard_category (9084929359894695824) -->
-    <skip />
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Tastatura i unos"</string>
+    <string name="virtual_keyboard_category" msgid="1012830752318677119">"Virtuelna tastatura"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Dostupna virtuelna tastatura"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Upravljajte tastaturama"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Pomoć za tastaturu"</string>
@@ -1688,7 +1816,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomoć za tasterske prečice"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Prikaz dostupnih prečica"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Podrazumevano"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Miš/dodirna tabla"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kontroler za igre"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Koristi vibraciju"</string>
@@ -1755,8 +1882,7 @@
     <string name="usage_time_label" msgid="295954901452833058">"Vreme korišćenja"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Pristupačnost"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Podešavanja pristupačnosti"</string>
-    <!-- no translation found for accessibility_settings_summary (981260486011624939) -->
-    <skip />
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Čitači ekrana, ekran, kontrole interakcije"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Podešavanja za vid"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Možete da prilagodite ovaj uređaj prema potrebama. Te funkcije pristupačnosti možete kasnije da promenite u Podešavanjima."</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čitači ekrana"</string>
@@ -1764,19 +1890,25 @@
     <string name="display_category_title" msgid="685461049938269166">"Prikaz"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"Kontrole interakcije"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Preuzete usluge"</string>
-    <!-- no translation found for experimental_category_title (5272318666666893547) -->
-    <skip />
+    <string name="experimental_category_title" msgid="5272318666666893547">"Eksperimentalno"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Čitač ekrana prvenstveno namenjen slepim i slabovidim osobama"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Dodirnite stavke na ekranu da biste ih čuli"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titl"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (6001128808776506021) -->
-    <skip />
-    <!-- no translation found for accessibility_preference_magnification_summary (5867883657521404509) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Uvećanje"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Uvećanje pomoću trostrukog dodira"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Uvećanje pomoću dugmeta"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Uvećanje pomoću dugmeta i trostrukog dodira"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Uvećajte prikaz na ekranu"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite 3 puta da biste zumirali"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>"Da biste zumirali"</b>", dodirnite brzo ekran 3 puta jednim prstom.\n"<ul><li>"Prevucite 2 prsta ili više njih da biste se pomerali"</li>\n<li>"Skupite ili raširite 2 prsta ili više njih da biste prilagođavali nivo zumiranja"</li></ul>\n\n<b>"Da biste privremeno zumirali"</b>", dodirnite brzo ekran 3 puta i ne dižite prst posle trećeg dodira.\n"<ul><li>"Prevlačite prst da biste se kretali po ekranu"</li>\n<li>"Podignite prst da biste umanjili prikaz"</li></ul>\n\n"Ne možete da uvećavate prikaz na tastaturi i traci za navigaciju."</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Dodirnite dugme da biste zumirali"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Da biste zumirali"</b>", brzo dodirnite ekran 3 puta.\n"<ul><li>"Prevucite pomoću 2 ili više prstiju da biste pomerali prikaz"</li>\n<li>"Skupite 2 ili više prstiju da biste prilagodili zumiranje"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" brzo dodirnite ekran 3 puta i zadržite prst pri trećem dodiru.\n"<ul><li>"Prevlačite prstom da biste se kretali po ekranu"</li>\n<li>"Podignite prst da biste umanjili prikaz"</li></ul>\n\n"Ne možete da zumirate tastaturu ni traku za navigaciju."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kada je uvećanje uključeno, koristite dugme za pristupačnost u dnu ekrana da biste brzo uvećali prikaz.\n\n"<b>"Da biste zumirali"</b>", dodirnite dugme za pristupačnost, pa pritisnite bilo koji deo ekrana.\n"<ul><li>"Prevlačite pomoću 2 ili više prstiju da biste pomerali prikaz"</li>\n<li>"Skupite 2 ili više prstiju da biste prilagodili zumiranje"</li></ul>\n\n<b>"Za privremeno zumiranje"</b>" dodirnite dugme za pristupačnost, pa dodirnite i zadržite bilo koji deo ekrana.\n"<ul><li>"Prevlačite da biste se kretali po ekranu"</li>\n<li>"Podignite prst da biste umanjili prikaz"</li></ul>\n\n"Ne možete da uvećavate tastaturu ili traku za navigaciju."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Dugme za pristupačnost je podešeno na <xliff:g id="SERVICE">%1$s</xliff:g>. Da biste koristili uvećanje, dodirnite i zadržite dugme za pristupačnost, pa izaberite uvećanje."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečica za pristupačnost"</string>
+    <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Usluga prečice"</string>
+    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Omogući na zaključanom ekranu"</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kada je prečica uključena, možete da pritisnete oba dugmeta za jačinu zvuka i zadržite ih 3 sekunde da biste pokrenuli funkciju pristupačnosti."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst visokog kontrasta"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatski ažuriraj uvelič. ekrana"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažurira uveličavanje ekrana pri prelazu aplikacija"</string>
@@ -1786,10 +1918,12 @@
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombinujte kanale kada puštate audio sadržaj"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Odlaganje dodira i zadržavanja"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inverzija boja"</string>
-    <!-- no translation found for accessibility_display_inversion_preference_subtitle (7052959202195368109) -->
-    <skip />
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može da utiče na kvalitet rada"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik kada pokazivač prestane da se kreće"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Odlaganje pre klika"</string>
+    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
+    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim podešavanjima"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Režim ispravljanja"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -1851,25 +1985,32 @@
     <string name="color_yellow" msgid="9112680561610873529">"Žuta"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Želite li da koristite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba da:"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Pošto aplikacija skriva zahtev za dozvolu, Podešavanja ne mogu da verifikuju odgovor."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Pošto ste uključili uslugu pristupačnosti, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite šablon."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite lozinku."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Prati vaše radnje"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"da prati vaše radnje"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Dobija obaveštenja kada ostvarujete interakciju sa aplikacijom."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Želite li da zaustavite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Ako dodirnete Potvrdi, zaustavićete <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nijedna usluga nije instalirana"</string>
+    <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nijedna usluga nije izabrana"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije naveden opis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Podešavanja"</string>
     <string name="print_settings" msgid="4742428530112487843">"Štampanje"</string>
-    <plurals name="print_settings_title" formatted="false" msgid="6994238166067938432">
-      <item quantity="one">%d zadatak za štampanje</item>
-      <item quantity="few">%d zadatka za štampanje</item>
-      <item quantity="other">%d zadataka za štampanje</item>
+    <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Isključeno"</string>
+    <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> usluga štampanja je uključena</item>
+      <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>
@@ -1903,11 +2044,17 @@
     <string name="power_charge_remaining" msgid="6132074970943913135">"Puni se još <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
     <string name="background_activity_title" msgid="8618384801540759730">"Aktivnost u pozadini"</string>
     <string name="background_activity_summary" msgid="8140094430510517362">"Dozvolite aplikaciji da se pokreće u pozadini"</string>
-    <string name="device_screen_usage" msgid="224482533839040430">"Korišćenje ekrana"</string>
+    <string name="background_activity_summary_on" msgid="649282072540085599">"Aplikacija može da bude aktivna u pozadini kada se ne koristi"</string>
+    <string name="background_activity_summary_off" msgid="7666330699090632040">"Aktivnosti aplikacije u pozadini su ograničene kada se aplikacija ne koristi"</string>
+    <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikacije kojima nije dozvoljeno pokretanje u pozadini"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Korišćenje ekrana od potpunog punjenja"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za ekran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilnih mreža"</string>
-    <string name="power_usage_list_summary" msgid="792703666229965848">"Korišćenje aplikacija od poslednjeg potpunog punjenja"</string>
-    <string name="device_usage_list_summary" msgid="1545514224536252111">"Korišćenje uređaja od poslednjeg potpunog punjenja"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"pre <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Korišćenje aplikacije od potpunog punjenja (pre <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Korišćenje uređaja od potpunog punjenja (pre <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena tokom kojeg je ekran bio uključen od potpunog punjenja"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"Korišćenje uređaja od potpunog punjenja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Korišćenje baterije nakon isključivanja"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Korišćenje baterije nakon ponovnog postavljanja"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> na bateriji"</string>
@@ -1927,16 +2074,56 @@
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na vreme"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"Napredna potrošnja baterije"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalji istorije"</string>
-    <string name="details_title" msgid="3792801565213935385">"Korišćenje detalja"</string>
+    <string name="battery_details_title" msgid="6101394441569858580">"Potrošnja baterije"</string>
     <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>
+    <!-- no translation found for battery_abnormal_details_title (5469019021857291216) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_wakelock_summary (4326186999058828831) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_wakeup_alarm_summary (644657277875785240) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_location_summary (6552797246798806002) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_apps_summary (792553273248686972) -->
+    <skip />
+    <!-- no translation found for dialog_stop_title (6395127715596746479) -->
+    <skip />
+    <!-- no translation found for dialog_stop_message (9149534230295983971) -->
+    <skip />
+    <!-- no translation found for dialog_stop_message (5702924180465982412) -->
+    <skip />
+    <!-- no translation found for dialog_stop_message (9201053069493107713) -->
+    <skip />
+    <!-- no translation found for dialog_stop_ok (2319777211264004900) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_title (1525936543485084879) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_message (5539009263025812279) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_message (4001747292234087612) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_message (585341224642457664) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_ok (412876934682899659) -->
+    <skip />
+    <!-- no translation found for dialog_location_title (5888917530725874727) -->
+    <skip />
+    <!-- no translation found for dialog_location_message (7684240588903005427) -->
+    <skip />
+    <!-- no translation found for dialog_location_message (7439311770795993356) -->
+    <skip />
+    <!-- no translation found for dialog_location_message (6285773079775018012) -->
+    <skip />
+    <!-- no translation found for dialog_location_ok (4572391197601313986) -->
+    <skip />
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Lampa"</string>
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Stanje pripravnosti telefona"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Stanje pripravnosti mobilne mreže"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet je u stanju mirovanja"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
@@ -1945,7 +2132,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -1996,12 +2184,24 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Potrošnja baterije je približna vrednost potrošnje energije i ne obuhvata svaki izvor pražnjenja baterije. Raznovrsna potrošnja predstavlja razliku između izračunate približne potrošnje baterije i stvarne potrošnje zabeležene za bateriju."</string>
     <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="4383512863007718804">"Koristi se %1$s"</string>
-    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ukupnog kapaciteta baterije"</string>
-    <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Analiza potrošnje od poslednjeg potpunog punjenja"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Koristi se <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
+    <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>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od poslednjeg potpunog punjenja"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Poslednje potpuno punjenje"</string>
+    <string name="battery_footer_summary" msgid="4701358808575132647">"Preostalo trajanje baterije je približno i može da se menja u zavisnosti od načina korišćenja"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"U aktivnoj upotrebi"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"U pozadini"</string>
+    <string name="battery_detail_power_usage" msgid="6485766868610469101">"Potrošnja baterije"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne potrošnje aplikacija (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
+    <string name="battery_detail_info_title" msgid="8227822131405620369">"Od potpunog punjenja"</string>
+    <string name="battery_detail_manage_title" msgid="9094314252105828014">"Upravljanje potrošnjom baterije"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Procenjeno preostalo vreme"</string>
-    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Vreme do potpunog punjenja"</string>
-    <string name="estimated_time_description" msgid="6722669204902760489">"Procena može da se menja na osnovu korišćenja"</string>
+    <string name="estimated_charging_time_left" msgid="5614442409326164691">"Do potpunog punjenja"</string>
+    <string name="estimated_time_description" msgid="8760210909000037089">"Procena može da se menja u zavisnosti od korišćenja"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Tokom poslednjeg isključivanja za <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ukupno korišćeno"</string>
@@ -2059,7 +2259,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Podešavanja glasovnog unosa i izlaza"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovna pretraga"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android tastatura"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Govor"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Podešavanja glasovnog unosa"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Glasovni unos"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Usluge glasovnog unosa"</string>
@@ -2071,8 +2270,13 @@
     <string name="tts_sliders_title" msgid="992059150784095263">"Brzina i jačina govora"</string>
     <string name="tts_engine_section_title" msgid="6289240207677024034">"Mehanizam"</string>
     <string name="tts_install_voice_title" msgid="6275828614052514320">"Glasovi"</string>
-    <string name="tts_reset_speech_rate_title" msgid="3993885027390495498">"Resetuj brzinu govora"</string>
-    <string name="tts_reset_speech_rate_summary" msgid="8561618897094097540">"Resetujte brzinu kojom se tekst izgovora na normalnu."</string>
+    <string name="tts_spoken_language" msgid="5542499183472504027">"Govorni jezik"</string>
+    <string name="tts_install_voices_title" msgid="8808823756936022641">"Instaliranje glasova"</string>
+    <string name="tts_install_voices_text" msgid="5292606786380069134">"Nastavite na aplikaciju <xliff:g id="TTS_APP_NAME">%s</xliff:g> da biste instalirali glasove"</string>
+    <string name="tts_install_voices_open" msgid="667467793360277465">"Otvori aplikaciju"</string>
+    <string name="tts_install_voices_cancel" msgid="4711492804851107459">"Otkaži"</string>
+    <string name="tts_reset" msgid="2661752909256313270">"Resetuj"</string>
+    <string name="tts_play" msgid="2628469503798633884">"Pusti"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kontrola napajanja"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ažuriranje Wi-Fi podešavanja"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ažuriranje Bluetooth podešavanja"</string>
@@ -2133,33 +2337,33 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Uvrštavanje podataka aplikacija"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatsko vraćanje"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Kada se aplikacija ponovo instalira, vrati rezervne kopije podešavanja i podataka"</string>
-    <string name="backup_inactive_title" msgid="5355557151569037197">"Usluga pravljenja rezervne kopije nije aktivna."</string>
+    <string name="backup_inactive_title" msgid="685838037986644604">"Usluga pravljenja rezervnih kopija nije aktivna"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Trenutno nijedan nalog ne čuva rezervne kopije podataka"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Želite li da zaustavite pravljenje rezervnih kopija Wi-Fi lozinki, obeleživača, ostalih podešavanja i podataka o aplikacijama, kao i da izbrišete sve kopije na Google serverima?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Želite li da zaustavite pravljenje rezervnih kopija podataka uređaja (poput Wi-Fi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) i izbrišete sve kopije na udaljenim serverima?"</string>
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatski pravite rezervne kopije podataka uređaja (poput Wi-Fi lozinki i istorije poziva) i podataka aplikacija (poput podešavanja i datoteka sačuvanih u aplikacijama) daljinski.\n\nKada uključite automatsko pravljenje rezervnih kopija, podaci uređaja i aplikacija se povremeno čuvaju daljinski. Podaci aplikacija mogu da budu bilo koji podaci koje je aplikacija sačuvala (na osnovu podešavanja programera), uključujući potencijalno osetljive podatke kao što su kontakti, poruke i slike."</string>
-    <string name="device_admin_settings_title" msgid="1335557832906433309">"Podešavanja administracije uređaja"</string>
-    <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator uređaja"</string>
-    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktiviraj ovaj administrator uređaja"</string>
+    <string name="device_admin_settings_title" msgid="4960761799560705902">"Podešavanja administratora uređaja"</string>
+    <string name="active_device_admin_msg" msgid="578748451637360192">"Aplikacija za administratore uređaja"</string>
+    <string name="remove_device_admin" msgid="9207368982033308173">"Deaktiviraj ovu aplikaciju za administratora uređaja"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Deinstaliraj aplikaciju"</string>
-    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiviraj i deinstaliraj"</string>
-    <string name="select_device_admin_msg" msgid="2645509057946368094">"Administratori uređaja"</string>
-    <string name="no_device_admins" msgid="702695100241728775">"Nema dostupnih administratora uređaja"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Deaktiviraj i deinstaliraj"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacije za administratora"</string>
+    <string name="no_device_admins" msgid="4846602835339095768">"Nema dostupnih aplikacija za administratora uređaja"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Lični"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Posao"</string>
-    <string name="no_trust_agents" msgid="7450273545568977523">"Trust agents - Nedostupno"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Želite li da aktivirate administrator uređaja?"</string>
-    <string name="add_device_admin" msgid="1349673618141610506">"Aktiviraj ovaj administrator uređaja"</string>
-    <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator uređaja"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Aktiviranjem ovog administratora omogućićete aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da obavi sledeće operacije:"</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"Ovaj administrator je aktivan i omogućava da aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> obavi sledeće operacije:"</string>
+    <string name="no_trust_agents" msgid="7450273545568977523">"Nema dostupnih pouzdanih agenata"</string>
+    <string name="add_device_admin_msg" msgid="1501847129819382149">"Aktiviraj aplikaciju za administratore?"</string>
+    <string name="add_device_admin" msgid="4192055385312215731">"Aktiviraj ovu aplikaciju za administratore uređaja"</string>
+    <string name="device_admin_add_title" msgid="3140663753671809044">"Administrator uređaja"</string>
+    <string name="device_admin_warning" msgid="7482834776510188134">"Aktiviranje ove aplikacije za administratore omogućiće aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da obavi sledeće operacije:"</string>
+    <string name="device_admin_status" msgid="7234814785374977990">"Ova aplikacija za administratore je aktivna i omogućava aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da obavi sledeće operacije:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"Aktivirati Menadžera profila?"</string>
-    <string name="adding_profile_owner_warning" msgid="8081841501073689534">"Ako nastavite, korisnikom će upravljati administrator koji će možda takođe moći da čuva povezane podatke pored vaših ličnih podataka.\n\nAdministrator može da nadgleda podešavanja, pristup, aplikacije i podatke povezane sa ovim korisnikom, uključujući mrežnu aktivnost i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
-    <string name="admin_disabled_other_options" msgid="4564776259414246934">"Administrator je onemogućio druge opcije."</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"Ako nastavite, korisnikom će upravljati administrator, koji će možda moći da čuva i povezane podatke, pored ličnih podataka.\n\nAdministrator može da prati podešavanja, pristup, aplikacije i podatke povezane sa ovim korisnikom, uključujući aktivnosti na mreži i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
+    <string name="admin_disabled_other_options" msgid="7712694507069054530">"Administrator je onemogućio druge opcije"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"Još detalja"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Bez naslova"</string>
-    <string name="sound_category_sound_title" msgid="1488759370067953996">"Opšte"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"Opšta"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"Evidencija obaveštenja"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Melodija zvona i vibracija poziva"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistem"</string>
@@ -2229,12 +2433,12 @@
     <string name="preference_change_password_title" msgid="8955581790270130056">"Promeni lozinku"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Podešavanja naloga"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Ukloni nalog"</string>
-    <string name="header_add_an_account" msgid="756108499532023798">"Dodavanje naloga"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Dodajte nalog"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Završi"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Želite li da uklonite nalog?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Uklanjanjem ovog naloga izbrisaćete sve poruke, kontakte i druge podatke sa tableta!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Uklanjanjem ovog naloga izbrisaćete sve poruke, kontakte i druge podatke sa telefona!"</string>
-    <string name="remove_account_failed" msgid="6980737964448187854">"Administrator ne dozvoljava ovu promenu"</string>
+    <string name="remove_account_failed" msgid="3901397272647112455">"Administrator ne dozvoljava ovu promenu"</string>
     <string name="provider_label" msgid="7724593781904508866">"Prijave za Push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -2305,8 +2509,7 @@
     <string name="data_usage_background_label" msgid="2722008379947694926">"U pozadini:"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"Podešavanja aplikacije"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Pozadinski podaci"</string>
-    <!-- no translation found for data_usage_app_restrict_background_summary (5853552187570622572) -->
-    <skip />
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Omogući korišćenje mobilnih podataka u pozadini"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Za ograničenje pozadinskih podataka za ovu apl. prvo ograničite mobilne podatke."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Želite li da ograničite pozadinske podatke?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ova funkcija može da zaustavi aplikaciju koja zavisi od pozadinskih podataka kada su dostupne samo mobilne mreže.\n\nAdekvatnije kontrole za korišćenje podataka možete da pronađete u podešavanjima dostupnim u okviru aplikacije."</string>
@@ -2314,16 +2517,16 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Uključiti autom. sinh. podataka?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Sve promene koje unesete u naloge na vebu će automatski biti kopirane na tablet.\n\nNeki nalozi mogu i automatski da kopiraju na veb sve promene koje unesete na tabletu. Tako funkcioniše Google nalog."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Sve promene koje unesete u naloge na vebu će automatski biti kopirane na telefon.\n\nNeki nalozi mogu i automatski da kopiraju na veb sve promene koje unesete na telefonu. Tako funkcioniše Google nalog."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Isključiti autom. sinh. podataka?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Na ovaj način će se smanjiti potrošnja podataka i baterije, ali biće potrebno da ručno sinhronizujete svaki nalog da biste prikupili nedavne informacije. Nećete primati ni obaveštenja kada dođe do ažuriranja."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Isključujete auto-sinh. podataka?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"To će se smanjiti potrošnju podataka i baterije, ali biće potrebno da ručno sinhronizujete svaki nalog da biste prikupili nedavne informacije. Nećete primati ni obaveštenja kada dođe do ažuriranja."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum vraćanja ciklusa potrošnje na početne vrednosti"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum svakog meseca:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Podesi"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Podešavanje upozorenja o korišćenju podataka"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Podešavanje ograničenja za korišćenje podataka"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje potrošnje podataka"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablet će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri tablet, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite neko uobičajeno ograničenje."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri telefon, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite neko uobičajeno ograničenje."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablet će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri tablet, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite niže ograničenje."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri telefon, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite niže ograničenje."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Želite li da ograničite pozadinske podatke?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem.\n\nOvo podešavanje utiče na sve korisnike na ovom tabletu."</string>
@@ -2364,6 +2567,11 @@
     <string name="vpn_not_used" msgid="9094191054524660891">"(ne koristi se)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(ne verifikuj server)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(primljeno sa servera)"</string>
+    <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"Ovaj tip VPN-a ne može uvek da ostane povezan"</string>
+    <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"Uvek uključeni VPN podržava samo numeričke adrese servera"</string>
+    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"DNS server mora da se odredi za uvek uključeni VPN"</string>
+    <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"Adrese DNS servera moraju da budu numeričke za uvek uključeni VPN"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"Unete informacije ne podržavaju uvek uključeni VPN"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Otkaži"</string>
     <string name="vpn_done" msgid="8678655203910995914">"Odbaci"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Sačuvaj"</string>
@@ -2372,7 +2580,7 @@
     <string name="vpn_edit" msgid="8647191407179996943">"Izmena VPN profila"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Zaboravi"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Povezivanje na profil <xliff:g id="PROFILE">%s</xliff:g>"</string>
-    <string name="vpn_disconnect_confirm" msgid="2555877026824771115">"Prekid veze sa VPN-om."</string>
+    <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Želite li da prekinete vezu sa ovim VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Prekini vezu"</string>
     <string name="vpn_version" msgid="1939804054179766249">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zaboravi VPN"</string>
@@ -2384,28 +2592,25 @@
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"Već ste povezani sa VPN-om. Ako se povežete sa nekim drugim, postojeći VPN će biti zamenjen."</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"Uključi"</string>
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"Povezivanje sa VPN-om <xliff:g id="VPN_NAME">%1$s</xliff:g> nije uspelo"</string>
-    <string name="vpn_cant_connect_message" msgid="2593197919352621279">"Ova aplikacija ne podržava stalno uključeni VPN."</string>
+    <string name="vpn_cant_connect_message" msgid="1352832123114214283">"Ova aplikacija ne podržava uvek uključeni VPN"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Dodavanje VPN profila"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Izmeni profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Izbriši profil"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Stalno uključeni VPN"</string>
-    <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Niste dodali nijedan VPN."</string>
-    <string name="vpn_always_on_active" msgid="2789423425184556882">"Uvek uključeni VPN je aktivan"</string>
-    <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Uvek uključeni VPN je neaktivan"</string>
-    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ove aplikacija ne podržava"</string>
-    <string name="vpn_require_connection" msgid="4564777707170757146">"Dozvoli samo veze preko VPN-a"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Niste dodali nijedan VPN"</string>
+    <string name="vpn_always_on_summary" msgid="2821344524094363617">"Nikada ne prekidaj vezu sa VPN-om"</string>
+    <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Ova aplikacija ne podržava"</string>
+    <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Uvek uključeni VPN je aktivan"</string>
+    <string name="vpn_require_connection" msgid="8388183166574269666">"Blokiraj veze bez VPN-a"</string>
     <string name="vpn_require_connection_title" msgid="159053539340576331">"Treba vam VPN veza?"</string>
-    <string name="vpn_lockdown_active" msgid="4687243926584886862">"Zaključavanje je aktivno"</string>
-    <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Zaključavanje je neaktivno"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Izaberite VPN profil sa kojim ćete uvek biti povezani. Mrežni sadržaj će biti dozvoljen samo kada ste povezani sa ovim VPN-om."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nijedan"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Stalno uključeni VPN zahteva IP adresu za server i DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nije uspostavljena mrežna veza. Probajte ponovo kasnije."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"Veza sa VPN-om je prekinuta"</string>
-    <!-- no translation found for vpn_disconnected_summary (3082851661207900606) -->
-    <skip />
-    <string name="vpn_missing_cert" msgid="7972907102570411501">"Nedostaje sertifikat. Izmenite profil."</string>
+    <string name="vpn_disconnected_summary" msgid="3082851661207900606">"Ništa"</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"Nedostaje sertifikat. Pokušajte da izmenite profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Korisnik"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Onemogući"</string>
@@ -2420,12 +2625,13 @@
     <string name="one_usercrt" msgid="2150319011101639509">"jedan sertifikat korisnika"</string>
     <string name="one_cacrt" msgid="6844397037970164809">"jedan CA sertifikat"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA sertifikata"</string>
-    <string name="user_credential_title" msgid="1329449215749665378">"Detalji akreditiva"</string>
+    <string name="user_credential_title" msgid="1954061209643070652">"Detalji akreditiva"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"Uklonjen je akreditiv: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"Nema instaliranih korisničkih akreditiva"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Provera pravopisa"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ovde unesite trenutnu lozinku za pravljenje rezervne kopije čitavog sistema"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ovde unesite novu lozinku za pravljenje rezervnih kopija čitavog sistema"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Unesite novu lozinku za rezervnu kopiju čitavog sistema"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Unesite ponovo novu lozinku za rezervnu kopiju čitavog sistema"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Postavi lozinku rezervne kopije"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Otkaži"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatna ažuriranja sistema"</string>
@@ -2514,7 +2720,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Istorija poziva će biti deljena sa ovim korisnikom."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Istorija poziva i SMS-ova će se deliti sa ovim korisnikom."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Informacije o hitnom slučaju"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Informacije za hitni slučaj"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Informacije i kontakti za <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dozvole za aplikacije i sadržaj"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije sa ograničenjima"</string>
@@ -2548,9 +2754,9 @@
     <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>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"Prijem obaveštenja o ekstremnoj opasnosti po život i svojinu"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"Prijem obaveštenja o ekstremnoj opasnosti po život i imovinu"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ozbiljne opasnosti"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Prijem obaveštenja o ozbiljnoj opasnosti po život i svojinu"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Prijem obaveštenja o ozbiljnoj opasnosti po život i imovinu"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER obaveštenja"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Prijem objava o kidnapovanju dece"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Ponavljanje"</string>
@@ -2635,17 +2841,17 @@
       <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>
-    <!-- no translation found for connected_devices_dashboard_summary (2390582103384791904) -->
-    <skip />
+    <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>
-    <!-- no translation found for account_dashboard_title (4936890821712178853) -->
-    <skip />
+    <string name="account_dashboard_title" msgid="4936890821712178853">"Korisnici i nalozi"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Podrazumevane aplikacije"</string>
-    <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Jezici, rezervna kopija, ažuriranja, o telefonu"</string>
-    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Jezici, rezervne kopije, ažuriranja, informacije o uređaju"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"Jezici, vreme, rezervne kopije, ažuriranja"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Podešavanja"</string>
     <string name="search_menu" msgid="6283419262313758339">"Pretražite podešavanja"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Podešavanja pretrage"</string>
@@ -2693,6 +2899,12 @@
     <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>
+    <!-- no translation found for keywords_squeeze_to_launch_gesture (4459283333825902485) -->
+    <skip />
+    <!-- no translation found for keywords_wake_squeeze_gesture (6923058534235267845) -->
+    <skip />
+    <!-- no translation found for keywords_alarm_silence_gesture (8507935972184597252) -->
+    <skip />
     <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>
@@ -2702,7 +2914,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC oznaka ne podržava pisanje. Koristite drugu oznaku."</string>
     <string name="default_sound" msgid="8821684447333687810">"Podrazumevani zvuk"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Jačina zvona je <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="2507943820408985874">"Jačina zvuka, vibracija, Ne uznemiravaj"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Jačina zvuka, vibracija, Ne uznemiravaj"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zvono je podešeno na vibraciju"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zvono je podešeno na nečujno"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Jačina zvona je 80%"</string>
@@ -2712,6 +2924,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Jačina zvuka za obaveštenja"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Zvuk zvona telefona"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Podrazumevani zvuk obaveštenja"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Zvuk aplikacije"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Podrazumevani zvuk obaveštenja"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Podrazumevani zvuk alarma"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibracija i za pozive"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Drugi zvukovi"</string>
@@ -2728,11 +2942,17 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Obaveštenje"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Zvukovi pri uključivanju"</string>
-    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Ne uznemiravaj – podešavanja"</string>
+    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Automatska pravila nisu uključena"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
+      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> automatsko pravilo je uključeno</item>
+      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> automatska pravila su uključena</item>
+      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatskih pravila je uključeno</item>
+    </plurals>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Podešavanja režima „Ne uznemiravaj“"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dozvoljeni su samo prioriteti"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Podesite raspored za Ne uznemiravaj"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Isključite ponekad zvuk na uređaju"</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Podesite pravila za režim „Ne uznemiravaj“"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ograniči zvukove i vibracije u određenim intervalima"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prioritetni prekidi"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Potpuna tišina"</string>
@@ -2740,20 +2960,23 @@
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiraj vizuelna ometanja"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvuci za profil za Work"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Koristi zvuke ličnog profila"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2940241783139859361">"Zvuci profila za Work su isti kao i za lični profil"</string>
+    <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvukovi profila za Work su isti kao i zvukovi za lične profile"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"Melodija zvona za telefon za Work"</string>
-    <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Podrazumevani zvuk za obaveštenja za Work"</string>
-    <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Podrazumevana melodija zvona za alarm za Work"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"Podrazumevani zvuk obaveštenja za posao"</string>
+    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"Podrazumevani zvuk alarma za posao"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Isto kao i za lični profil"</string>
-    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Želite li da koristite zvuke ličnog profila?"</string>
+    <string name="work_sync_dialog_title" msgid="7123973297187354813">"Želite li da zamenite zvukove?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zameni"</string>
-    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Zvuci sa ličnog profila će se koristiti umesto aktuelnih zvuka profila za Work"</string>
+    <string name="work_sync_dialog_message" msgid="7841728953710863208">"Zvuci sa ličnog profila će se koristiti za profil za Work"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"Dodati prilagođeni zvuk?"</string>
+    <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"Ova datoteka će biti kopirana u direktorijum <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Drugi zvuci i vibracije"</string>
-    <string name="configure_notification_settings" msgid="7447797716856573587">"Podešavanja obaveštenja"</string>
+    <string name="configure_notification_settings" msgid="7616737397127242615">"Obaveštenja"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredna"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obaveštenja za Work"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsirajuće obaveštenje"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Dozvoli tačke za obaveštenja"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Uključi treperenje lampice"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom ekranu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obaveštenja"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sakrij osetljiv sadržaj obaveštenja"</string>
@@ -2766,20 +2989,23 @@
     <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>
-    <!-- no translation found for app_notifications_summary (3421524441126902552) -->
+    <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_none" msgid="3173515479356106227">"Nije podešeno"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka aplikacija odluči"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikada ne prikazuj obaveštenja"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez zvučnog signala ili vizuelnog obaveštenja"</string>
-    <string name="notification_importance_low" msgid="2445139943005315690">"Prikazuje se bez zvučnog signala"</string>
+    <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuka"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emituje se zvučni signal"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emituje se zvučni signal i prikazuje se na ekranu"</string>
-    <string name="importance_reset" msgid="7458420788555607007">"Resetuj"</string>
-    <string name="show_silently" msgid="2222875799232222056">"Prikazivanje bez zvuka"</string>
+    <string name="notification_importance_min_title" msgid="6974673091137544803">"Nizak"</string>
+    <string name="notification_importance_low_title" msgid="8131254047772814309">"Srednji"</string>
+    <string name="notification_importance_default_title" msgid="9120383978536089489">"Visok"</string>
+    <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="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>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne mogu da čitaju obaveštenja"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d aplikacija može da čita obaveštenja</item>
@@ -2803,29 +3029,36 @@
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Nijedna instalirana aplikacija ne podržava sliku u slici"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"sus slika u"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika u slici"</string>
-    <!-- no translation found for picture_in_picture_app_detail_switch (1131910667023738296) -->
-    <skip />
-    <!-- no translation found for picture_in_picture_app_detail_summary (7942592478427522244) -->
-    <skip />
-    <!-- no translation found for picture_in_picture_on (6103704909710176555) -->
-    <skip />
-    <!-- no translation found for picture_in_picture_off (5654388666434625247) -->
-    <skip />
+    <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="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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokira prikazivanje obaveštenja ove aplikacije na ovom uređaju"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokira prikazivanje ove kategorije obaveštenja na ovom uređaju"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije postavila nijedno obaveštenje"</string>
-    <!-- no translation found for app_settings_link (8894946007543660906) -->
-    <skip />
-    <!-- no translation found for deleted_channels (3757203969719476510) -->
+    <string name="app_settings_link" msgid="8894946007543660906">"Dodatna podešavanja u aplikaciji"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Uključeno za sve aplikacije"</string>
+    <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
+      <item quantity="one">Isključeno za <xliff:g id="COUNT_1">%d</xliff:g> aplikaciju</item>
+      <item quantity="few">Isključeno za <xliff:g id="COUNT_1">%d</xliff:g> aplikacije</item>
+      <item quantity="other">Isključeno za <xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
+    </plurals>
+    <plurals name="deleted_channels" formatted="false" msgid="8028574302599397935">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija je izbrisana</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije su izbrisane</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorija je izbrisano</item>
+    </plurals>
+    <string name="notification_toggle_on" msgid="650145396718191048">"Uključeno"</string>
+    <string name="notification_toggle_off" msgid="2142010737190671762">"Isključeno"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikada ne prikazuj ova obaveštenja"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Prikazuj obaveštenja"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Obaveštenja se nikada ne prikazuju na traci ili periferijskim uređajima"</string>
-    <string name="notification_badge_title" msgid="5404669445214920178">"Prikazuj značke"</string>
-    <string name="notification_badge_summary" msgid="3944771498030335669">"Prikazuje obaveštenja kao značke u aplikaciji Home ako je to podržano."</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"Dozvoli tačku za obaveštenja"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Prikazuj tačku za obaveštenja"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Zameni režim Ne uznemiravaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Omogućava da ova obaveštenja nastave da se prikazuju kada je režim Ne uznemiravaj podešen na opciju Samo prioritetni prekidi"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
@@ -2834,12 +3067,15 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Osetljivo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotovo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Važnost"</string>
-    <string name="notification_show_lights_title" msgid="7301956309661349031">"Uvek aktiviraj pulsirajuću lampicu za obaveštenja"</string>
-    <string name="notification_vibrate_title" msgid="4942317478973441720">"Uvek vibriraj"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Uključi treperenje lampice"</string>
+    <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibracija"</string>
+    <string name="notification_channel_sound_title" msgid="3899212238513507941">"Zvuk"</string>
+    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Izbriši"</string>
+    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Preimenuj"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Naziv pravila"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Unesite naziv pravila"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Naziv pravila se već koristi"</string>
-    <string name="zen_mode_add_rule" msgid="9100929184624317193">"Dodaj pravilo"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Dodaj još"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Izbriši pravilo"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Izaberite tip pravila"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Želite li da izbrišete pravilo „<xliff:g id="RULE">%1$s</xliff:g>“?"</string>
@@ -2885,7 +3121,7 @@
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivaoci"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Izabrani pozivaoci"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovni pozivaoci"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ako ista osoba pozove po drugi put u periodu od <xliff:g id="MINUTES">%d</xliff:g> min, dozvoli poziv"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ako ista osoba pozove po drugi put u roku od <xliff:g id="MINUTES">%d</xliff:g> min, dozvoli poziv"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski uključi"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikad"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Svake večeri"</string>
@@ -2917,7 +3153,7 @@
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je ekran uključen ili isključen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Podešavanja obaveštenja"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Šalji povratne informacije o uređaju"</string>
-    <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Unesite PIN administratora"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Unesite PIN administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Isključeno"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Kačenje ekrana"</string>
@@ -2929,25 +3165,16 @@
     <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="7164072567822375682">"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\nNa taj način štitite podatke na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Možete dodatno da zaštitite ovaj uređaj 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\nNa taj način štitite podatke na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Možete dodatno da zaštitite ovaj 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 niti obaveštenja, uključujući alarme. \n\nNa taj način štitite podatke na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite ako ga podesite tako da traži PIN pre pokretanja. Dok se uređaj ne pokrene, on ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo pomaže u zaštiti podataka na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite ako ga podesite tako da traži šablon pre pokretanja. Dok se uređaj ne pokrene, on ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo pomaže u zaštiti podataka na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite ako ga podesite tako da traži lozinku pre pokretanja. Dok se uređaj ne pokrene, on ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo pomaže u zaštiti podataka na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Zahtevaj PIN za pokretanje uređaja"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Zahtevaj šablon za pokretanje uređaja"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Zahtevaj lozinku za pokretanje uređaja"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ne, hvala"</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>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Možete dodatno da zaštitite ovaj uređaj 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" 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="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>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Tražiti šablon?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Tražiti lozinku?"</string>
@@ -2972,15 +3199,17 @@
     <string name="storage_used" msgid="7128074132917008743">"Memorijski prostor u upotrebi"</string>
     <string name="change" msgid="6657848623929839991">"Promeni"</string>
     <string name="change_storage" msgid="600475265207060436">"Promenite memoriju"</string>
-    <string name="notifications_label" msgid="2872668710589600731">"Obaveštenja"</string>
-    <string name="notifications_enabled" msgid="4386196629684749507">"Normalno"</string>
-    <string name="notifications_disabled" msgid="3200751656741989335">"Blokirano"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"Obaveštenja o aplikaciji"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Uključena"</string>
+    <string name="notifications_disabled" msgid="334416731283131597">"Sve je isključeno"</string>
+    <string name="notifications_partly_blocked" msgid="592071133950126656">"Uključenih kategorija: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"Isključena"</string>
     <string name="notifications_redacted" msgid="4493588975742803160">"Nema osetljivog sadržaja na zaključanom ekranu"</string>
     <string name="notifications_hidden" msgid="3619610536038757468">"Ne na zaključanom ekranu"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"Režim Ne uznemiravaj je zamenjen"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
     <string name="notification_summary_level" msgid="2726571692704140826">"%d. nivo"</string>
+    <string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dozvola je odobrena</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dozvole su odobrene</item>
@@ -3003,20 +3232,29 @@
     <string name="filter_instant_apps" msgid="574277769963965565">"Instant aplikacije"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Lične"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Posao"</string>
-    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirana"</string>
+    <string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: sve"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: isključeno"</string>
+    <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: visok prioritet"</string>
+    <string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: nizak prioritet"</string>
+    <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: isključeno"</string>
+    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Kategorije: menja režim „Ne uznemiravaj“"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Napredna"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurišite aplikacije"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Dozvole za aplikacije"</string>
-    <!-- no translation found for app_permissions_summary (5163974162150406324) -->
-    <skip />
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikacije u kojima se koristi <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Dodirnite za buđenje"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Dvaput dodirnite bilo koji deo ekrana da biste probudili uređaj"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Otvaranje linkova"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Ne otvaraj podržane linkove"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Otvaraj <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Otvarajte <xliff:g id="DOMAIN">%s</xliff:g> i druge URL-ove"</string>
-    <!-- no translation found for domain_urls_apps_summary (6999347849855021374) -->
+    <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Nijedna aplikacija ne otvara podržane linkove"</string>
+    <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija otvara podržane linkove</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije otvaraju podržane linkove</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacija otvara podržane linkove</item>
+    </plurals>
     <string name="app_link_open_always" msgid="2474058700623948148">"Otvaraj u ovoj aplikaciji"</string>
     <string name="app_link_open_ask" msgid="7800878430190575991">"Uvek pitaj"</string>
     <string name="app_link_open_never" msgid="3407647600352398543">"Ne otvaraj u ovoj aplikaciji"</string>
@@ -3054,16 +3292,23 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Obaveštenja o korišćenju"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
     <string name="high_power_system" msgid="7362862974428225301">"Optimizacija baterije nije dostupna"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Ne primenjujte optimizaciju baterije. Može brže da isprazni bateriju."</string>
-    <string name="high_power_prompt_title" msgid="4257734526819699048">"Ignorisati optimizacije baterije?"</string>
-    <string name="high_power_prompt_body" msgid="4072587909486730876">"Želite li da dozvolite da aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> ostane povezana u pozadini? Ovo može da troši više baterije."</string>
-    <string name="battery_summary" msgid="101415762036784289">"Potrošeno je <xliff:g id="PERCENTAGE">%1$d</xliff:g>%% od poslednjeg potpunog punjenja"</string>
+    <string name="high_power_prompt_title" msgid="6358673688590282655">"Želite li da dozvolite da aplikacija uvek bude aktivna u pozadini?"</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Ako dozvolite da aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> uvek bude aktivna u pozadini, to može da smanji trajanje baterije. \n\nKasnije možete to da promenite u odeljku Podešavanja &gt; Aplikacije i obaveštenja."</string>
+    <string name="battery_summary" msgid="8044042095190688654">"Potrošeno je <xliff:g id="PERCENTAGE">%1$s</xliff:g> od poslednjeg potpunog punjenja"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Upravljanje napajanjem"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Baterija nije korišćena od poslednjeg potpunog punjenja"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Podešavanja aplikacije"</string>
@@ -3079,18 +3324,20 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Punjenje ovog uređaja"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Samo punite ovaj uređaj"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Napajanje"</string>
-    <string name="usb_use_power_only_desc" msgid="4912352581010190141">"Napaja drugi povezani uređaj"</string>
-    <!-- no translation found for usb_use_file_transfers (338076823500744605) -->
-    <skip />
-    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Prenosi datoteke na drugi uređaj"</string>
-    <!-- no translation found for usb_use_photo_transfers (6743967116266105718) -->
-    <skip />
-    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenosi slike ili datoteke ako MTP nije podržan (PTP)"</string>
-    <!-- no translation found for usb_use_MIDI (8405244560919283714) -->
-    <skip />
-    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Koristi ovaj uređaj kao MIDI"</string>
-    <string name="usb_use" msgid="3256040963685055320">"Upotrebite USB za:"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Punite povezani uređaj. Radi samo sa uređajima koji podržavaju punjenje preko USB-a."</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Prenos datoteka"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Prenosite datoteke na drugi uređaj"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prenos slika (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenosite slike ili datoteke ako MTP nije podržan (PTP)"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Korišćenje uređaja u MIDI režimu"</string>
+    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Koristite ovaj uređaj kao MIDI"</string>
+    <string name="usb_use" msgid="3256040963685055320">"Koristite USB za:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Punjenje uređaja"</string>
+    <string name="usb_summary_power_only" msgid="3629517713817003738">"Napajanje"</string>
+    <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Prenos datoteka"</string>
+    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Prenos slika (PTP)"</string>
+    <string name="usb_summary_MIDI" msgid="5687906612187885908">"Koristi uređaj kao MIDI"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Provera u pozadini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Potpun pristup pozadini"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Koristi tekst sa ekrana"</string>
@@ -3133,37 +3380,24 @@
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Preporučeno za duže trajanje baterije"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Želite li da dozvolite aplikaciji <xliff:g id="APP">%s</xliff:g> da ignoriše optimizacije baterije?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ništa"</string>
-    <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"Isključivanje pristupa korišćenju za ovu aplikaciju ne sprečava administratora da prati potrošnju podataka za aplikacije na profilu za Work."</string>
+    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Isključivanje pristupa korišćenju za ovu aplikaciju ne sprečava administratora da prati potrošnju podataka za aplikacije na profilu za Work"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"Upotrebljeni znakovi: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <!-- no translation found for draw_overlay_title (7524215631960029502) -->
-    <skip />
-    <!-- no translation found for draw_overlay (6564116025404257047) -->
-    <skip />
-    <!-- no translation found for system_alert_window_settings (8466613169103527868) -->
-    <skip />
+    <string name="draw_overlay" msgid="6564116025404257047">"Prikaz preko drugih aplikacija"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"Prikaz preko drugih aplikacija"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Aplikacije"</string>
-    <!-- no translation found for system_alert_window_access_title (6297115362542361241) -->
-    <skip />
-    <!-- no translation found for permit_draw_overlay (7456536798718633432) -->
-    <skip />
-    <!-- no translation found for app_overlay_permission_preference (9039432222453006038) -->
-    <skip />
-    <!-- no translation found for allow_overlay_description (3879905262954599959) -->
-    <skip />
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Prikaz preko drugih aplikacija"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"Dozvoli prikaz preko drugih aplikacija"</string>
+    <string name="app_overlay_permission_preference" msgid="9039432222453006038">"Dozvola za prikaz aplikacije preko nečega"</string>
+    <string name="allow_overlay_description" msgid="8961670023925421358">"Omogućite ovoj aplikaciji da se prikazuje preko drugih aplikacija koje koristite. To može da ometa korišćenje tih aplikacija ili da promeni njihov izgled ili ponašanje."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr virtuelna realnost obrađivač usluga stereo pomagača"</string>
-    <!-- no translation found for keywords_system_alert_window (5049498015597864850) -->
-    <skip />
-    <!-- no translation found for overlay_settings (6930854109449524280) -->
-    <skip />
-    <!-- no translation found for system_alert_window_summary (602892301318324492) -->
-    <skip />
+    <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistem obaveštenje prozor dijalog prikaz preko drugih aplikacija"</string>
+    <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>
-    <!-- no translation found for install_other_apps (6986686991775883017) -->
-    <skip />
-    <!-- no translation found for keywords_install_other_apps (761078076051006558) -->
-    <skip />
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Dozvoljeno"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nije dozvoljeno"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Instalirajte nepozn. apl."</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>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g> aplik. ima(ju) dozvolu za izmenu podešavanja sistema"</string>
@@ -3174,12 +3408,7 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Dozvola za menjanje podešavanja sistema za aplikaciju"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Dozvoli menjanje podešavanja sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ova dozvola dozvoljava aplikaciji da menja podešavanja sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Da"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ne"</string>
-    <!-- no translation found for external_source_switch_title (5581865736984836418) -->
-    <skip />
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Dozvoli iz ovog izvora"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dvaput zaokrenite za kameru"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvorite aplikaciju Kamera tako što ćete dvaput zaokrenuti ručni zglob"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Pritisnite dugme za napajanje dvaput za kameru"</string>
@@ -3195,47 +3424,46 @@
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Zdravo, Petre!"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Hoćeš li da se ispričamo uz kafu danas?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Zvuči odlično. Znam dobro mesto u blizini."</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Važi. Znam dobro mesto u blizini."</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Savršeno!"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"Uto 18:00"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Uto 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Uto 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Uto 18:03"</string>
-    <!-- no translation found for disconnected (4836600637485526329) -->
-    <skip />
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"Koristi se <xliff:g id="AMOUNT">%1$s</xliff:g> podataka"</string>
-    <plurals name="notification_summary" formatted="false" msgid="4019451362120557382">
-      <item quantity="one">Sprečeno je slanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacije</item>
-      <item quantity="few">Sprečeno je slanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacije</item>
-      <item quantity="other">Sprečeno je slanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
+    <string name="disconnected" msgid="4836600637485526329">"Nije povezano"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Iskorišćeno je <xliff:g id="AMOUNT">%1$s</xliff:g> podataka"</string>
+    <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
+      <item quantity="one">Isključeno za <xliff:g id="COUNT">%d</xliff:g> aplikaciju</item>
+      <item quantity="few">Isključeno za <xliff:g id="COUNT">%d</xliff:g> aplikacije</item>
+      <item quantity="other">Isključeno za <xliff:g id="COUNT">%d</xliff:g> aplikacija</item>
     </plurals>
-    <string name="notification_summary_none" msgid="3440195312233351409">"Slanje je dozvoljeno za sve aplikacije"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"Uključeno za sve aplikacije"</string>
     <string name="apps_summary" msgid="193158055537070092">"Instaliranih aplikacija: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"Instalirane su 24 aplikacije"</string>
     <string name="storage_summary" msgid="3801281635351732202">"Koristi se <xliff:g id="PERCENTAGE">%1$s</xliff:g> – <xliff:g id="FREE_SPACE">%2$s</xliff:g> slobodno"</string>
+    <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Interna memorija: <xliff:g id="PERCENTAGE">%1$s</xliff:g> je iskorišćeno – <xliff:g id="FREE_SPACE">%2$s</xliff:g> je slobodno"</string>
     <string name="display_summary" msgid="6737806235882127328">"Pređi u režim spavanja posle <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"Pozadina, režim spavanja, veličina fonta"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"Prelazak u režim spavanja posle 10 minuta neaktivnosti"</string>
     <string name="memory_summary" msgid="8080825904671961872">"U proseku je korišćeno <xliff:g id="USED_MEMORY">%1$s</xliff:g> od <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memorije"</string>
-    <!-- no translation found for user_summary (2175367953972182552) -->
-    <skip />
+    <string name="users_and_accounts_summary" msgid="245282689646897882">"Aktuelni korisnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> je podrazumevana"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"UKLJUČENO/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"ISKLJUČENO"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Pravljenje rezervne kopije je onemogućeno"</string>
-    <!-- no translation found for about_summary (924181828102801010) -->
-    <skip />
+    <string name="about_summary" msgid="924181828102801010">"Ažurirano na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Radnja nije dozvoljena"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Ne možete da promenite jačinu zvuka"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Pozivanje nije dozvoljeno"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-ovi nisu dozvoljeni"</string>
     <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kamera nije dozvoljena"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Pravljenje snimaka ekrana nije dozvoljeno"</string>
-    <string name="default_admin_support_msg" msgid="239311515653633217">"Ova radnja je onemogućena. Kontaktirajte administratora organizacije da biste saznali više."</string>
+    <string name="default_admin_support_msg" msgid="2853684309779513863">"Ova radnja je onemogućena. Da biste saznali više, kontaktirajte administratora organizacije."</string>
     <string name="admin_support_more_info" msgid="8901377038510512654">"Još detalja"</string>
-    <string name="admin_profile_owner_message" msgid="5834937282929663252">"Administrator može da nadgleda aplikacije i podatke povezane sa profilom za Work, uključujući podešavanja, dozvole, korporativni pristup, mrežnu aktivnost i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
-    <string name="admin_profile_owner_user_message" msgid="7153676784012255048">"Administrator može da nadgleda aplikacije i podatke povezane sa ovim korisnikom, uključujući podešavanja, dozvole, korporativni pristup, mrežnu aktivnost i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
-    <string name="admin_device_owner_message" msgid="8734500370023898028">"Administrator može da nadgleda aplikacije i podatke povezane sa ovim uređajem, uključujući podešavanja, dozvole, korporativni pristup, mrežnu aktivnost i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
+    <string name="admin_profile_owner_message" msgid="5860816886981109626">"Administrator može da nadgleda aplikacije i podatke povezane sa profilom za Work, uključujući podešavanja, dozvole, korporativni pristup, aktivnosti na mreži i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
+    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"Administrator može da nadgleda aplikacije i podatke povezane sa ovim korisnikom, uključujući podešavanja, dozvole, korporativni pristup, aktivnosti na mreži i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
+    <string name="admin_device_owner_message" msgid="6232893638259790789">"Administrator može da prati aplikacije i podatke povezane sa ovim uređajem, uključujući podešavanja, dozvole, korporativni pristup, aktivnosti na mreži i informacije o lokaciji uređaja, kao i da upravlja njima."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"Isključi"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"Uključi"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"Prikaži"</string>
@@ -3263,9 +3491,8 @@
     <string name="color_temperature_toast" msgid="4974218172133854827">"Da biste primenili promenu boje, isključite ekran"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Restartujte uređaj da biste primenili promenu TelephonyMonitor-a"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatska ažuriranja sistema"</string>
-    <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (zahteva restartovanje)"</string>
     <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobilnih podataka"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobil. podataka"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Potrošnja Wi-Fi podataka"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Potrošnja podataka na eternetu"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3276,10 +3503,13 @@
     <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>
-    <!-- no translation found for network_restrictions_summary (4301618027244595839) -->
+    <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ograničenje</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
+    </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Obračun podataka kod mobilnog operatera se možda razlikuje od obračuna uređaja."</string>
     <string name="data_used_template" msgid="3245919669966296505">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Podešavanje upozorenja o podacima"</string>
@@ -3295,7 +3525,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>
@@ -3347,7 +3577,12 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nijedno"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Nedostaje objekat za rangiranje."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekat za rangiranje ne sadrži ovu šifru."</string>
-    <string name="special_access" msgid="8275242424094109976">"Specijalan pristup"</string>
+    <string name="special_access" msgid="3458780842491881155">"Poseban pristup aplikaciji"</string>
+    <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može da koristi neograničenu količinu podataka</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije mogu da koriste neograničenu količinu podataka</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacija može da koristi neograničenu količinu podataka</item>
+    </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Želite li stvarno da izbrišete podatke korisnika i da konvertujete u šifrovanje datoteka?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Izbriši i konvertuj"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Resetuj ograničavanje broja u ShortcutManager-u"</string>
@@ -3356,13 +3591,13 @@
     <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="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>
     <string name="premium_sms_access" msgid="4660047004791638305">"Pristup premijum SMS-ovima"</string>
-    <!-- no translation found for bluetooth_disabled (2456198532288640046) -->
-    <skip />
+    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nije vidljivo drugim uređajima"</string>
+    <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan je sa uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan je sa više uređaja"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Režim demonstracije za korisnički interfejs sistema"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice programera za brza podešavanja"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Tu smo da pomognemo"</string>
@@ -3423,29 +3658,55 @@
     <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>
+    <!-- no translation found for double_tap_power_for_camera_suggestion_title (6500405261202883589) -->
+    <skip />
+    <!-- no translation found for double_tap_power_for_camera_suggestion_summary (7010153544554016996) -->
+    <skip />
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje kamere"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <!-- no translation found for double_twist_for_camera_suggestion_title (4689410222517954869) -->
+    <skip />
+    <!-- no translation found for double_twist_for_camera_suggestion_summary (447403641027147153) -->
+    <skip />
+    <!-- no translation found for double_twist_for_camera_suggestion_summary (1724660290703318739) -->
+    <skip />
+    <!-- no translation found for double_twist_for_camera_suggestion_summary (5980398380988039489) -->
+    <skip />
     <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_pickup_title" product="default" msgid="818688002837687268">"Podignite telefon da biste ga proverili"</string>
+    <!-- no translation found for ambient_display_summary (525662960806416373) -->
+    <skip />
+    <!-- no translation found for ambient_display_suggestion_summary (5987443721392571847) -->
+    <skip />
+    <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>
-    <!-- no translation found for fingerprint_swipe_for_notifications_title (5816346492253270243) -->
+    <!-- no translation found for ambient_display_pickup_summary (4567020486787561873) -->
+    <skip />
+    <!-- no translation found for ambient_display_pickup_summary (5435283849947236648) -->
+    <skip />
+    <!-- no translation found for ambient_display_pickup_summary (8256669101643381568) -->
     <skip />
+    <!-- no translation found for ambient_display_pickup_suggestion_summary (7014700589991761035) -->
+    <skip />
+    <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>
+    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_title (1677291167470357802) -->
+    <skip />
+    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_summary (127592803294414082) -->
+    <skip />
+    <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>
@@ -3456,19 +3717,20 @@
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Povežite se na internet ili kontaktirajte mobilnog operatera"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Nije dostupno na uređajima koje je mobilni operater zaključao"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"Postalo je dostupno ukupno <xliff:g id="SIZE">%1$s</xliff:g>\n\nPoslednji put pokrenuto <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="8502552575492048305">"Otvarajte linkove u aplikacijama"</string>
-    <string name="web_action_enable_summary" msgid="4679844581193646863">"Otvarajte linkove u podržanim aplikacijama, čak i ako aplikacije nisu instalirane na uređaju"</string>
-    <string name="web_action_section_title" msgid="806405168097593614">"Aplikacije koje nisu instalirane"</string>
+    <string name="web_action_enable_title" msgid="4051513950976670853">"Instant aplikacije"</string>
+    <string name="web_action_enable_summary" msgid="3108127559723396382">"Otvarajte linkove u aplikacijama, čak i ako nisu instalirane"</string>
+    <string name="web_action_section_title" msgid="7364647086538399136">"Instant aplikacije"</string>
+    <string name="instant_apps_account" msgid="1433620209791992528">"Nalog za instant aplikacije"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalirane aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Memorijskim prostorom sada upravlja Menadžer memorijskog prostora"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Nalozi za korisnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"Konfigurišite"</string>
-    <string name="auto_sync_account_title" msgid="7647106425106072285">"Autom. sinhr. podatke sa naloga"</string>
-    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Autom. sinhr. lične podatke sa naloga"</string>
-    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Autom. sinhr. poslovne podatke sa naloga"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"Automatski sinhronizuj podatke"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Automatski sinhronizuj lične podatke"</string>
+    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatske sinhronizuj poslovne podatke"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"Omogući aplikacijama da automatski osvežavaju podatke"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sinhronizacija naloga"</string>
-    <!-- no translation found for enterprise_privacy_settings (1177106810374146496) -->
-    <skip />
+    <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informacije o uređaju kojim se upravlja"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Promene i podešavanja kojima upravlja organizacija"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Promene i podešavanja kojima upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="enterprise_privacy_header" msgid="7402406406883832509">"Organizacija može da promeni podešavanja i da instalira softver na uređaju radi omogućavanja pristupa poslovnim podacima. \n\nObratite se administratoru organizacije za dodatne informacije."</string>
@@ -3477,40 +3739,39 @@
     <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"Pristup ovom uređaju"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Podaci povezani sa poslovnim nalogom, poput imejla i kalendara"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Lista aplikacija na uređaju"</string>
+    <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"Količina vremena i podataka potrošena u svakoj aplikaciji"</string>
+    <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Najnovija evidencija o mrežnom saobraćaju"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Najnoviji izveštaj o grešci"</string>
+    <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Najnovija bezbednosna evidencija"</string>
+    <string name="enterprise_privacy_none" msgid="7706621148858381189">"Nema"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Aplikacije su instalirane"</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"Broj aplikacija predstavlja procenu. Možda ne obuhvata aplikacije instalirane izvan Play prodavnice."</string>
+    <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
+      <item quantity="one">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
+      <item quantity="few">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacije</item>
+      <item quantity="other">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
+    </plurals>
+    <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"Dozvole za lokaciju"</string>
+    <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Dozvole za mikrofon"</string>
+    <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Dozvole za kameru"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Podrazumevane aplikacije"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> aplikacije</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
     </plurals>
-    <plurals name="enterprise_privacy_number_packages_actionable" formatted="false" msgid="3351021029919034993">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija. Dodirnite da biste pregledali.</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> aplikacije. Dodirnite da biste pregledali.</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija. Dodirnite da biste pregledali.</item>
-    </plurals>
-    <string name="enterprise_privacy_usage_stats" msgid="6257434796480671245">"Vreme i podaci koji su potrošeni u svakoj aplikaciji na uređaju"</string>
-    <string name="enterprise_privacy_network_logs" msgid="6594098950963377666">"Evidencija mrežnog saobraćaja na uređaju"</string>
-    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Najnoviji izveštaj o grešci"</string>
-    <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Najnovija bezbednosna evidencija"</string>
-    <string name="enterprise_privacy_none" msgid="7706621148858381189">"Nema"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Aplikacije su instalirane"</string>
-    <!-- no translation found for enterprise_privacy_location_access (4158197200885270634) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_microphone_access (5717375623568864441) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_camera_access (4858146118537519375) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_enterprise_set_default_apps (3288495615791128724) -->
-    <skip />
     <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Podrazumevana tastatura"</string>
     <string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"Podešeno je na <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"Stalno uključeni VPN je uključen"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Stalno uključeni VPN je uključen na ličnom profilu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Stalno uključeni VPN je uključen na profilu za Work"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalni HTTP proksi je podešen"</string>
-    <!-- no translation found for enterprise_privacy_ca_certs (5885892204903688909) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_number_ca_certs (9073641163359459048) -->
-    <!-- no translation found for enterprise_privacy_number_ca_certs_actionable (5823294380629654635) -->
+    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pouzdani akreditivi"</string>
+    <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
+      <item quantity="one">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikat</item>
+      <item quantity="few">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikata</item>
+      <item quantity="other">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> CA sertifikata</item>
+    </plurals>
     <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"Administrator može da zaključava uređaj i resetuje lozinku"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator može da briše sve podatke sa uređaja"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"Neuspeli pokušaji unosa lozinke pre brisanja svih podataka sa uređaja"</string>
@@ -3524,32 +3785,56 @@
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saznajte više"</string>
+    <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
+      <item quantity="one">aplikacija za kameru</item>
+      <item quantity="few">aplikacije za kameru</item>
+      <item quantity="other">aplikacije za kameru</item>
+    </plurals>
+    <string name="default_calendar_app_title" msgid="3545972964391065220">"Aplikacija Kalendar"</string>
+    <string name="default_contacts_app_title" msgid="3497370557378660098">"Aplikacija Kontakti"</string>
+    <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
+      <item quantity="one">aplikacija za imejl klijent</item>
+      <item quantity="few">aplikacije za imejl klijent</item>
+      <item quantity="other">aplikacije za imejl klijent</item>
+    </plurals>
+    <string name="default_map_app_title" msgid="7560143381633608567">"Aplikacija za mape"</string>
+    <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
+      <item quantity="one">aplikacija Telefon</item>
+      <item quantity="few">aplikacije Telefon</item>
+      <item quantity="other">aplikacija Telefon</item>
+    </plurals>
+    <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
+    <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"Slike i video snimci"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"Muzika i audio"</string>
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
-    <!-- no translation found for storage_settings_2 (1939009096334525216) -->
-    <skip />
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Memorija telefona"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <!-- no translation found for storage_volume_total (3499221850532701342) -->
-    <skip />
-    <string name="storage_percent_used" msgid="6741397129281819921">"<xliff:g id="PERCENT">%1$s</xliff:g>%%"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"Iskorišćeno od ukupno <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"u upot."</string>
+    <string name="clear_instant_app_data" msgid="2004222610585890909">"Obriši aplikaciju"</string>
+    <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>
-    <!-- no translation found for autofill_app (7338387238377914374) -->
-    <skip />
+    <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Želite li da <xliff:g id="APP_NAME_0">%1$s</xliff:g> bude aplikacija za automatsko popunjavanje? <xliff:g id="APP_NAME_1">%1$s</xliff:g> će moći da čita sadržaj ekrana i da popunjava polja u drugim aplikacijama."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Uverite se da je ova aplikacija pouzdana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; koristi sadržaj ekrana za utvrđivanje podataka koji mogu automatski da se popune."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
     <string name="default_theme" msgid="7085644992078579076">"Podrazumevana"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menadžer memorijskog prostora: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Isključeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Uključeno"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Instant aplikacija"</string>
-    <!-- no translation found for automatic_storage_manager_deactivation_warning (5605210730828410482) -->
+    <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="carrier_provisioning" msgid="4398683675591893169">"Informacije o dodeli mobilnog operatera"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje dodele mobilnog operatera"</string>
+    <!-- no translation found for new_device_suggestion_title (8346563796032837800) -->
+    <skip />
+    <!-- no translation found for new_device_suggestion_summary (7172709269203435870) -->
     <skip />
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 789bf3b96aa256d2219be38e0c67c94a571942fd..5b1d2d2018fa9280f70bc638c7d8b1c99212681e 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>
@@ -175,6 +165,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Няма"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Няма"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2284019c785521605af51e6a5d376bada319a813..fa0cd070074c55dcfe7d10ba3a9e4c29f98b48e6 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Адмовіць"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Закрыць"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Пераключыць"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Невядома"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Зараз вы ў <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кроку ад таго, каб стаць распрацоўшчыкам.</item>
       <item quantity="few">Зараз вы ў <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кроках ад таго, каб стаць распрацоўшчыкам.</item>
@@ -32,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">"Сувязi"</string>
     <string name="header_category_device" msgid="4544026001618307754">"Прылада"</string>
@@ -43,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">"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 +109,26 @@
     <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>
+    <!-- no translation found for bluetooth_disconnect_title (7830252930348734303) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (8208712728668714199) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (6611038575213485336) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (3995834526315103965) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_dialog_ok (3308586619539119106) -->
+    <skip />
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"У вас няма дазволу на змяненне налад Bluetooth."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Пакуль Bluetooth уключаны, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> бачная для прылад, якія знаходзяцца побач."</string>
+    <!-- no translation found for bluetooth_footer_mac_message (1109366350000220283) -->
+    <skip />
+    <!-- no translation found for bluetooth_footer_mac_message (6807634484499166486) -->
+    <skip />
+    <!-- no translation found for bluetooth_footer_mac_message (8413944740341742061) -->
+    <skip />
     <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 +140,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +177,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Вашы прылады"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <string name="date_and_time" msgid="9062980487860757694">"Дата і час"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Вылучыце гадзінны пояс"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -323,7 +346,7 @@
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Паказаць інфармацыю аб уладальніку на экране блакавання"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Тэкст на экране блакіроўкі"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Уключыць віджэты"</string>
-    <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Адключана адміністратарам"</string>
+    <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Адключана адміністратарам"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Няма"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Напрыклад, Android Лявона"</string>
@@ -333,14 +356,18 @@
     <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="9087149148665560415">"Бяспека і блакіроўка экрана"</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>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Параметры блакіроўкі экрана"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаць Маё месцазнаходжанне, разблакаванне экрана, блакаванне SIM-карты, блакаванне сховішча ўліковых дадзеных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устанавіць маё месцазнаходжанне, разблакаванне экрана, блакаванне сховішча ўліковых дадзеных"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Прыватнасць"</string>
-    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Адключана адміністратарам"</string>
+    <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Адключана адміністратарам"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Стан бяспекі"</string>
-    <string name="security_dashboard_summary" msgid="7778812098315813315">"Месцазнаходжанне, адбіткі пальцаў"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Блакіроўка экрана, лічбавы адбітак"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Блакіроўка экрана"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Адбітак пальца"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Кірав. адбіт. пальцаў"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Выкарыст. адбітак для"</string>
@@ -356,54 +383,69 @@
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_unlock_disabled (1550756694054944874) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_setup (6817326798834882531) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_introduction_continue_setup (1961957425135180242) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (1581834104051243425) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (4629503416877189572) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (2423428240245737909) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text (5219287483885558525) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text (1466238255429527112) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text (3008526710555416125) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_title (3051496861358227199) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_message (8793966374365960368) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (2819679722403209778) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (6158989350522518586) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (7567276170287972230) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (4796715961273420536) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Дадаць яшчэ адзін"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Далей"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Акрамя разблакіроўкі тэлефона вы можаце выкарыстоўваць свае адбіткі пальцаў для аўтарызацыі пакупак і доступу да дадаткаў. "<annotation id="url">"Даведацца больш"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7007548031540826618">"Опцыя блакіроўкі экрана адключана. Звяжыцеся з адміністратарам сваёй арганізацыі, каб даведацца больш. "<annotation id="admin_details">"Дадатковая інфармацыя"</annotation>\n\n"Вы па-ранейшаму можаце выкарыстоўваць адбіткі пальцаў для аўтарызацыі купляў і доступу да праграм. "<annotation id="url">"Даведацца больш"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Опцыя блакіроўкі экрана адключана. Звяжыцеся з адміністратарам сваёй арганізацыі, каб даведацца больш. "<annotation id="admin_details">"Дадатковая інфармацыя"</annotation>\n\n"Вы па-ранейшаму можаце выкарыстоўваць адбіткі пальцаў для аўтарызацыі куплі і доступу да праграм. "<annotation id="url">"Даведацца больш"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Падніміце палец, потым дакраніцеся да сэнсара зноў"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Вы можаце дадаць да <xliff:g id="COUNT">%d</xliff:g> адбіткаў пальца"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Вы дадалі максімальную колькасць адбіткаў пальцаў"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Немагчыма дадаць больш адбіткаў пальцаў"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Выдаліць усе адбіткі пальцаў?"</string>
-    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Вы не зможаце выкарыстоўваць адбіткі пальцаў для разблакіроўкі тэлефона, аўтарызацыі пакупак і ўваходу ў дадаткі."</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="8840100810725902159">"Вы не зможаце выкарыстоўваць адбіткі пальцаў для разблакіроўкі свайго рабочага тэлефона, аўтарызацыі пакупак і ўваходу ў рабочыя праграмы."</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Вы не зможаце выкарыстоўваць адбіткі пальцаў для разблакіроўкі тэлефона, аўтарызацыі куплі і ўваходу ў праграмы"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Вы не зможаце выкарыстоўваць адбіткі пальцаў для разблакіроўкі свайго працоўнага профілю, аўтарызацыі куплі і ўваходу ў працоўныя праграмы"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Так, выдаліць"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Выкарыстоўвайце свой адбітак пальца, каб працягнуць."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шыфраванне"</string>
@@ -451,7 +493,11 @@
     <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>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Блакір. прац. профілю"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Змена блакавання экрана"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Змяніць або адключыць шаблон, PIN-код або пароль бяспекі"</string>
@@ -473,7 +519,7 @@
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Адбіткак пальца + пароль"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Працягнуць без адбітка пальца"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Вы можаце разблакіроўваць тэлефон адбіткам пальца. У мэтах бяспекі для гэтага варыянта патрабуецца дадатковы спосаб блакіроўкі экрана."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Выключана адміністратарам, палітыкай шыфравання ці сховішчам уліковых дадзеных"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Адключана адміністратарам, палітыкай шыфравання ці сховішчам уліковых даных"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Правядзенне пальцам"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Узор"</string>
@@ -519,20 +565,28 @@
     <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>
-    <string name="lockpassword_password_too_long" msgid="4520363269062591833">"Павінен змяшчаць менш за наступную колькасць сімвалаў: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="lockpassword_pin_too_long" msgid="4010052843684165845">"Павінен змяшчаць менш за наступную колькасць лічбаў: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="5537252833154289817">"Павінен змяшчаць толькі лічбы 0-9."</string>
-    <string name="lockpassword_pin_recently_used" msgid="214840704635573454">"Адміністратар прылады не дазваляе выкарыстоўваць апошні PIN-код."</string>
+    <string name="lockpassword_password_too_long" msgid="4591720174765403476">"Павінен змяшчаць менш за наступную колькасць сімвалаў: <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"Павінен змяшчаць менш за наступную колькасць лічбаў: <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"Павінен змяшчаць толькі лічбы 0-9"</string>
+    <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"Адміністратар прылады не дазваляе выкарыстоўваць апошні PIN-код"</string>
     <string name="lockpassword_illegal_character" msgid="8049611046639943217">"Не можа змяшчаць недапушчальны сімвал"</string>
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"Павінен змяшчаць не менш за адну літару"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Павінен змяшчаць не менш за адну лічбу"</string>
@@ -573,16 +627,15 @@
       <item quantity="many">Павінен змяшчаць не менш за <xliff:g id="COUNT">%d</xliff:g> сімвалаў, якія не з\'яўляюцца літарамі</item>
       <item quantity="other">Павінен змяшчаць не менш за <xliff:g id="COUNT">%d</xliff:g> сімвала, якія не з\'яўляюцца літарамі</item>
     </plurals>
-    <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"Адміністратар прылады не дазваляе выкарыстоўваць апошні пароль."</string>
-    <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Забаронена ўводзіць узрастаючую, убываючую або паўторную паслядоўнасць лічбаў"</string>
+    <string name="lockpassword_password_recently_used" msgid="942665351220525547">"Адміністратар прылады не дазваляе выкарыстоўваць апошні пароль"</string>
+    <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Забаронена ўводзіць узрастаючую, убываючую або паўторную паслядоўнасць лічбаў"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ОК"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Скасаваць"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Скасаваць"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Наступны"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Усталяванне скончана."</string>
     <string name="manage_device_admin" msgid="537804979483211453">"Праграмы адміністратара прылады"</string>
-    <!-- no translation found for number_of_device_admins_none (7185056721919496069) -->
-    <skip />
+    <string name="number_of_device_admins_none" msgid="7185056721919496069">"Няма актыўных праграм"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> актыўная праграма</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> актыўныя праграмы</item>
@@ -591,7 +644,13 @@
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Давераныя агенты"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Перад выкарыстаннем задайце блакіроўку экрана"</string>
-    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Праглядзець або дэактываваць давераных агентаў"</string>
+    <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Няма"</string>
+    <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> актыўны давераны агент</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> актыўныя давераныя агенты</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> актыўных давераных агентаў</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> актыўнага даверанага агента</item>
+    </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Уключыць Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -636,7 +695,23 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Пашыраныя налады"</string>
     <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="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>
+    <!-- no translation found for bluetooth_connect_failed (4500234659813241053) -->
+    <skip />
+    <!-- no translation found for device_details_title (6576953269221085300) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_mac_address (2513724313558236181) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_title (38467834196432400) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_body (9087609557757135712) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_body (7785695793007576501) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_body (251257782642157557) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_forget_confirm_button (3829370108973879006) -->
+    <skip />
     <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>
@@ -675,12 +750,12 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> хоча ўключыць Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> хоча адключыць Wi-Fi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дазволіць абмен дадзенымі, калі планшэт дакранаецца да іншай прылады"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дазволіць абмен дадзенымі, калі тэлефон закранае іншыя прылады"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Дазволіць абмен данымі пры спалучэнні планшэта з іншымі прыладамі"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Дазволіць абмен данымі пры спалучэнні тэлефона з іншымі прыладамі"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Уключыць NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC абменьваецца данымі паміж гэтай прыладай і іншымі прыладамі або аб\'ектамі паблізу, такімі як плацежныя тэрміналы, прылады счытвання правоў доступу і інтэрактыўная рэклама ці цэтлікі."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Гатовы перадаваць змесцiва прыкладанняў з дапамогай прылад NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Гатовы да абмену данымі па NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Выключана"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недаступна, таму што NFC выключаная"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -694,25 +769,22 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Выберыце Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Уключэнне Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Адключэнне Wi-Fi..."</string>
-    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Паказаць усе сеткі"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Памылка"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Дыяпазон 5 ГГц недаступны ў гэтай краіне"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"У рэжыме палёту"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"Апавяшчэнне пра адкрытыя сеткі"</string>
-    <!-- no translation found for wifi_notify_open_networks_summary (8422402819267219458) -->
-    <skip />
-    <string name="wifi_wakeup" msgid="5685581457584270802">"Зноў уключыць Wi‑Fi"</string>
-    <!-- no translation found for wifi_wakeup_summary (7843701854850824229) -->
-    <skip />
+    <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Апавяшчаць, калі даступная высакаякасная сетка агульнага доступу"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"Уключаць Wi‑Fi аўтаматычна"</string>
+    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi будзе ўключацца аўтаматычна побач з захаванымі высакаякаснымі сеткамі, напрыклад вашай дамашняй сеткай"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недаступна, паколькі выключана сканіраванне Wi‑Fi"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Пазбягаць дрэнных злучэнняў"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Не выкарыстоўваць сетку Wi-Fi, пакуль не будзе якаснага падлучэння да Інтэрнэту"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Выкарыстоўваць толькі сеткі з добрым падлуч. да Інтэрнэту"</string>
-    <!-- no translation found for use_open_wifi_automatically_title (6851951242903078588) -->
-    <skip />
-    <!-- no translation found for use_open_wifi_automatically_summary (8371085123988132834) -->
-    <skip />
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Падключацца да адкрытых сетак"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Аўтаматычна падключацца да высакаякасных сетак агульнага карыстання"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Усталёўка сертыфікатаў"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Для павышэння дакладнасці вызначэння месцазнаходжання сістэмныя дадаткі і службы могуць шукаць сеткі 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Для павышэння дакладнасці вызначэння месцазнаходжання ўключыце сканіраванне 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="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Больш не паказваць"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Захоўваць Wi-Fi уключанай у рэжыме сну"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi уключаны у рэжыме сну"</string>
@@ -726,6 +798,8 @@
     <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Выкарыстоўваць мабільную перадачу даных, калі сетка Wi-Fi страчвае доступ да інтэрнэту. Можа спаганяцца плата за выкарыстанне трафіка."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Дадаць сетку"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Параметры Wi‑Fi"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi уключаецца аўтаматычна"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi не ўключаецца аўтаматычна"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Сеткi Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Больш параметраў"</string>
@@ -804,8 +878,7 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"У гэтай сеткі няма падлучэння да Інтэрнэту. Захоўваць падлучэнне?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Больш не пытацца для гэтай сеткі"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi не падключаны да інтэрнэту"</string>
-    <!-- no translation found for lost_internet_access_text (9029649339816197345) -->
-    <skip />
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"Пры дрэнным падключэнні Wi-Fi вы можаце пераключацца на мабільную сетку. Можа спаганяцца плата за выкарыстанне трафіка."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Пераключыцца на мабільную сетку"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Заставацца ў сетцы Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Больш не паказваць"</string>
@@ -817,13 +890,18 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Не атрымалася захаваць сетку"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Скасаваць"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Захаваныя сеткі"</string>
+    <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
+      <item quantity="one">%d сетка</item>
+      <item quantity="few">%d сеткі</item>
+      <item quantity="many">%d сетак</item>
+      <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="6547625164186585943">"Маска падсеткі"</string>
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска падсеткі"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <string name="wifi_details_ipv6_address_header" msgid="4334059712014889425">"IPv6-адрасы"</string>
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-адрасы"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Захаваныя сеткі"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Налады IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Пашыраныя налады Wi-Fi не даступныя для гэтага карыстальніка"</string>
@@ -853,24 +931,38 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Адмяніць запрашэнне?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы жадаеце адмяніць запрашэнне на падлучэнне да прылады <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_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>
-    <!-- no translation found for wifi_hotspot_off_subtext (2745508221200463254) -->
+    <!-- no translation found for wifi_hotspot_off_subtext (5466126533609394170) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_tethering_on_subtext (5752490509369962007) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_tethering_on_subtext (6461075246164300670) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_on_local_only_subtext (2068110388011294735) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_name_title (1341735529132128887) -->
     <skip />
-    <!-- no translation found for wifi_hotspot_off_subtext (7746761268472599794) -->
+    <!-- no translation found for wifi_hotspot_name_summary_connecting (3378299995508671967) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_name_summary_connected (3888672084861445362) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_password_title (1955592302902091281) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_ap_band_title (1165801173359290681) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_footer_info_regular (1203489406068036455) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_footer_info_local_only (857988412470694109) -->
     <skip />
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Уключэнне кропкi доступу..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключэнне кропкi доступу..."</string>
-    <!-- no translation found for wifi_tether_enabled_subtext (7842111748046063857) -->
-    <skip />
+    <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"Сетка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> актыўная"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Памылка партатыўнай кропкі доступу Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Наладка кропкi доступу Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Усталёўка пункту доступу Wi‑Fi"</string>
-    <!-- no translation found for wifi_hotspot_configure_ap_text_summary (5560680057727007011) -->
-    <skip />
-    <!-- no translation found for wifi_tether_configure_subtext (2050196439900426456) -->
-    <skip />
+    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Хот-спот AndroidAP WPA2 PSK"</string>
+    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Хот-спот <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-тэлефанія"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Уключыць Wi-Fi-тэлефанію"</string>
@@ -909,6 +1001,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>
@@ -921,7 +1014,8 @@
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Рынгтон"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Апавяшчэнне"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Выкарыстоўваць гучнасць уваходных выклікаў для паведамленняў"</string>
-    <string name="home_work_profile_not_supported" msgid="7457951997970419085">"Рабочыя профілі не падтрымліваюцца"</string>
+    <!-- no translation found for home_work_profile_not_supported (1357721012342357037) -->
+    <skip />
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Гук паведамлення па змаўчаннi"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Мультымедыя"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Вызначыць гучнасць для музыкі і відэа"</string>
@@ -975,51 +1069,93 @@
     <string name="brightness_summary" msgid="838917350127550703">"Выбраць яркасць экрану"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптыўная рэгуліроўка яркасці"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Аптымізаваць узровень яркасці ў залежнасці ад асвятлення"</string>
+    <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Адключана"</string>
+    <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Упадабаная яркасць – вельмі нізкая"</string>
+    <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Упадабаная яркасць – нізкая"</string>
+    <string name="auto_brightness_summary_default" msgid="7225666614394726845">"Упадабаная яркасць – стандартная"</string>
+    <string name="auto_brightness_summary_high" msgid="7172304165631136027">"Упадабаная яркасць – высокая"</string>
+    <string name="auto_brightness_summary_very_high" msgid="979277812582279078">"Упадабаная яркасць – вельмі высокая"</string>
+    <string name="auto_brightness_off_title" msgid="2996864829946190795">"Адключана"</string>
+    <string name="auto_brightness_very_low_title" msgid="8252988638614126320">"Вельмі нізкая"</string>
+    <string name="auto_brightness_low_title" msgid="1632186441514863377">"Нізкая"</string>
+    <string name="auto_brightness_default_title" msgid="936771997353506620">"Стандартная"</string>
+    <string name="auto_brightness_high_title" msgid="2527853305981497345">"Высокая"</string>
+    <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"Вельмі высокая"</string>
+    <string name="auto_brightness_subtitle" msgid="6454652530864093466">"Упадабаны ўзровень яркасці"</string>
+    <string name="auto_brightness_off_summary" msgid="7629228736838155268">"Не рэгуляваць у залежнасці ад асвятлення"</string>
+    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Павышае спажыванне зараду"</string>
+    <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>
+    <!-- no translation found for night_display_auto_mode_title (6574111412154833409) -->
+    <skip />
+    <!-- no translation found for night_display_auto_mode_never (2483761922928753400) -->
+    <skip />
+    <!-- no translation found for night_display_auto_mode_custom (2379394568898721765) -->
+    <skip />
+    <!-- no translation found for night_display_auto_mode_twilight (589042813708244059) -->
+    <skip />
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Час пачатку"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Час заканчэння"</string>
-    <!-- no translation found for night_display_temperature_title (1435292789272017136) -->
-    <skip />
-    <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>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
+    <string name="night_display_temperature_title" msgid="1435292789272017136">"Інтэнсіўнасць"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Выкл. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for night_display_summary_off_auto_mode_never (3583590137322963513) -->
+    <skip />
+    <!-- no translation found for night_display_summary_off_auto_mode_custom (6365668239253173208) -->
+    <skip />
+    <!-- no translation found for night_display_summary_off_auto_mode_twilight (3596291693781757392) -->
+    <skip />
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Укл. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for night_display_summary_on_auto_mode_never (9117830821363119835) -->
+    <skip />
+    <!-- no translation found for night_display_summary_on_auto_mode_custom (5510753572245577263) -->
+    <skip />
+    <!-- no translation found for night_display_summary_on_auto_mode_twilight (852270120144683507) -->
+    <skip />
     <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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Шпалеры"</string>
+    <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Стандартныя"</string>
+    <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Карыстальніцкія"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Змена шпалер"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Персаналізуйце свой экран"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Выбраць шпалеры ў"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Экранная застаўка"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Калі падключаны, у рэжыме сну цi зараджаецца"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Пакуль прылада зараджаецца ці прыстыкавана"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"У абодвух выпадках"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Падчас зарадкі"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Пры прыстыкоўцы"</string>
+    <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Ніколі"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Выключана"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Каб кантраляваць тое, што адбываецца, калі тэлефон прыстыкаваны і/або знаходзіцца ў рэжыме сну, уключыце экранную застаўку."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8644479926302707286">"Калі ўключаць экранную застаўку"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Калі пачынаць"</string>
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Бягучая экранная застаўка"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Пачаць"</string>
     <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 display"</string>
+    <!-- no translation found for ambient_display_screen_title (4252755516328775766) -->
+    <skip />
+    <!-- no translation found for ambient_display_screen_summary_always_on (7974004969481877214) -->
+    <skip />
+    <!-- no translation found for ambient_display_screen_summary_notifications (1449570742600868654) -->
+    <skip />
+    <!-- no translation found for ambient_display_category_triggers (4359289754456268573) -->
+    <skip />
+    <!-- no translation found for doze_title (2375510714460456687) -->
+    <skip />
     <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>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Налада блакавання SIM-карты"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Налады блакіроўкі SIM-карты"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"Блакіроўка SIM-карты"</string>
+    <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Адключана"</string>
+    <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Заблакіравана"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Блакаванне SIM-карты"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Блакаванне SIM-карты"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Патрабаваць PIN-код для выкарыстання планшэту"</string>
@@ -1028,7 +1164,7 @@
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Патрабаваць PIN-код для выкарыстання тэлефону"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Змена PIN-коду SIM-карты"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-код SIM-карты"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Блакаванне SIM-карты"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Блакіроўка SIM-карты"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Разблакаваць SIM-карту"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Стары PIN-код SIM-карты"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Новы PIN-код SIM-карты"</string>
@@ -1154,7 +1290,7 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Iгнараваць"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Наладзіць"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Агляд"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"Вызваліце месца"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Вызваліць месца"</string>
     <string name="storage_menu_manage" msgid="5914482953856430780">"Кіраванне сховішчам"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-падключэнне да кампутара"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Падключыцца як"</string>
@@ -1195,9 +1331,8 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Сістэмныя файлы"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Праглядзець <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Раздзел \"Іншае\" ўключае абагуленыя файлы, захаваныя праграмамі, файлы, спампаваныя з інтэрнэту або па Bluetooth, файлы Android і іншае. \n\nКаб праглядзець усё бачнае змесціва ў наступным сховішчы: <xliff:g id="NAME">^1</xliff:g>, дакраніцеся да \"Азнаёміцца\"."</string>
-    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Сістэмныя файлы ўключаюць у сябе файлы, якія Android не можа адлюстроўваць асобна."</string>
-    <!-- no translation found for storage_detail_dialog_user (3267254783294197804) -->
-    <skip />
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Сістэмныя файлы ўключаюць у сябе файлы, неабходныя для працы Android <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> можа мець захаваныя фатаграфіі, музыку, праграмы або іншыя даныя, якія займаюць <xliff:g id="SIZE">^2</xliff:g> сховішча. \n\nДля прагляду падрабязнай інфармацыі пераключыцеся на карыстальніка <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Наладжванне сховішча <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Выкарыстоўваць у якасці партатыўнага сховішча"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Для перамяшчэння фатаграфій і іншых медыяфайлаў паміж прыладамі."</string>
@@ -1228,7 +1363,7 @@
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Не вымайце <xliff:g id="NAME">^1</xliff:g> падчас перамяшчэння. \n\nДадатак <xliff:g id="APP">^2</xliff:g> не будзе даступны на гэтай прыладзе, пакуль перамяшчэнне не завершана."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Адмяніць перамяшчэнне"</string>
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Гэта <xliff:g id="NAME_0">^1</xliff:g>, здаецца, працуе павольна. \n\nВы можаце працягнуць, але ў дадатках, перанесеных у гэта сховішча, могуць адбывацца збоі, а перамяшчэнне даных можа займаць доўгі час. \n\nМагчыма, для лепшай прадукцыйнасці вам спатрэбіцца больш хуткая <xliff:g id="NAME_1">^1</xliff:g>."</string>
-    <string name="battery_status_title" msgid="9159414319574976203">"Становішча батарэі"</string>
+    <string name="battery_status_title" msgid="9159414319574976203">"Стан батарэі"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Узровень батарэі"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Змянiць кропку доступу"</string>
@@ -1268,9 +1403,11 @@
     <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>
+    <string name="reset_dashboard_title" msgid="4412694650600342973">"Выканаць скід"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Скід налад сеткі"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Гэта прывядзе да скіду ўсіх налад сеткі, у тым ліку\n\n"<li>"Wi‑Fi"</li>\n<li>"мабільнай перадачы даных"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Скід налад"</string>
@@ -1280,6 +1417,13 @@
     <string name="network_reset_not_available" msgid="7188610385577164676">"Скід налад сеткі недаступны для гэтага карыстальніка"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Налады сеткі былі скінутыя"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Скід да завадскіх налад"</string>
+    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
+      <item quantity="one">Для <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> уліковага запісу будзе выкананы скід</item>
+      <item quantity="few">Для <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> уліковых запісаў будзе выкананы скід</item>
+      <item quantity="many">Для <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> уліковых запісаў будзе выкананы скід</item>
+      <item quantity="other">Для <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> уліковага запісу будзе выкананы скід</item>
+    </plurals>
+    <string name="master_clear_summary" msgid="6902443944660426951">"Будзе выкананы скід унутранага сховішча і ўсіх даных"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховiшча"</b>" вашага планшэта, у тым ліку:\n\n"<li>"Ваш улiковы запiс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады дадаткаў"</li>\n<li>"Спампаваныя дадаткі"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховiшча"</b>" вашага тэлефона, у тым ліку:\n\n"<li>"Ваш улiковы запiс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады дадаткаў"</li>\n<li>"Спампаваныя дадаткі"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:\n"</string>
@@ -1291,6 +1435,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>
@@ -1306,54 +1453,35 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Партатыўная кропка доступу"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-мадэм"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Мадэм"</string>
-    <!-- no translation found for tether_settings_title_all (3058586928118801157) -->
-    <skip />
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Кропка доступу і мадэм"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Хот-спот і мадэм уключаны"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Хот-спот уключаны"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Мадэм"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Немагчыма выкарыстоўваць мадэм або партатыўныя хот-споты, калі ўключана Эканомія трафіка"</string>
+    <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="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-мадэм"</string>
-    <!-- no translation found for bluetooth_tethering_available_subtext (2092766774943506688) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_available_subtext (313873759999970236) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_device_connected_subtext (6388191062495199481) -->
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_device_connected_subtext (5970460338828861091) -->
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (3253150865825199632) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8268867745495039177) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext_config (6326877798974938021) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1889565070769307732) -->
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-мадэм"</string>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1838503633450298902) -->
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
     <skip />
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Немагчыма злучыцца"</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_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>
-    <!-- no translation found for tethering_footer_info (7287131664937054043) -->
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
     <skip />
     <string name="tethering_help_button_text" msgid="656117495547173630">"Даведка"</string>
-    <!-- no translation found for network_settings_title (2876509814832830757) -->
-    <skip />
+    <string name="network_settings_title" msgid="2876509814832830757">"Мабільная сетка"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Тарыфны план"</string>
-    <string name="sms_application_title" msgid="4903928270533250448">"Дадатак для SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Праграма для SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Змяніць праграму для SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Выкарыстоўваць <xliff:g id="NEW_APP">%1$s</xliff:g> замест <xliff:g id="CURRENT_APP">%2$s</xliff:g> у якасці дадатку для SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Выкарыстоўваць <xliff:g id="NEW_APP">%s</xliff:g> у якасці вашага дадатку для SMS?"</string>
-    <!-- no translation found for network_scorer_picker_title (7226219386351714766) -->
-    <skip />
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Пастаўшчык паслугі ацэнкі сеткі"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Няма"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Змяніць памочніка Wi‑Fi?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Выкарыстоўваць <xliff:g id="NEW_APP">%1$s</xliff:g> замест <xliff:g id="CURRENT_APP">%2$s</xliff:g> для кіравання сеткавымі падлучэннямі?"</string>
@@ -1378,13 +1506,12 @@
     <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_menu_scanning" msgid="8536245838478802959">"Сканіраванне"</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>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Палепшыце функцыю вызначэння месцазнаходжання, дазволіўшы сістэмным праграмам і службам знаходзіць сеткі Wi-Fi у любы час."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Сканіраванне Bluetooth"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Палепшыце функцыю вызначэння месцазнаходжання, дазволіўшы сістэмным дадаткам і службам знаходзіць прылады Bluetooth у любы час."</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Палепшыце функцыю вызначэння месцазнаходжання, дазволіўшы сістэмным праграмам і службам знаходзіць прылады Bluetooth у любы час."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Месцазнаходжанне Wi-Fi і мабiльнай сеткi"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Дазв. дадаткам выкар. службу вызнач. месцазн., каб знах. вас хутчэй. Ананiмныя даныя пра месцазн. будуць збiр. i адпр. у Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Месцазнаходжанне вызначаецца праз Wi-Fi"</string>
@@ -1406,7 +1533,7 @@
     <string name="legal_information" msgid="5769301644270604095">"Юрыдычная інфармацыя"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Удзельнікі"</string>
     <string name="manual" msgid="3025943393642974445">"Кіраўніцтва"</string>
-    <string name="regulatory_labels" msgid="1293050314122427492">"Этык. з нарматыўнай інф."</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"Ярлыкі сертыфікацыі"</string>
     <string name="safety_and_regulatory_info" msgid="5103161279848427185">"Кіраўніцтва па эксплуатацыі і бяспецы"</string>
     <string name="copyright_title" msgid="865906688917260647">"Аўтарскія правы"</string>
     <string name="license_title" msgid="1990487604356037871">"Ліцэнзія"</string>
@@ -1482,25 +1609,29 @@
     <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Выкарыстоўваць адзін спосаб блакіроўкі"</string>
     <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Выкарыстоўваць адзін спосаб блакіроўкі для працоўнага профілю і экрана прылады"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Выкарыстоўваць адзін спосаб блакіроўкі?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="1787427605545808829">"Для вашага працоўнага профілю і экрана прылады будзе выкарыстоўвацца адзін і той жа спосаб блакіроўкі. Усе палітыкі ў дачыненні да блакіроўкі працоўнага профілю будуць прымяняцца і да блакіроўкі экрана прылады."</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"На вашай прыладзе будзе выкарыстоўвацца блакіроўка экрана для працоўнага профілю. Палітыка ў дачыненні да працоўных профіляў будзе прымяняцца да абедзвюх блакіровак."</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"Блакіроўка вашага працоўнага профілю не адпавядае патрабаванням бяспекі вашай арганізацыі. Вы можаце выкарыстоўваць адзін і той жа спосаб блакіроўкі для экрана прылады і для свайго працоўнага профілю, але будуць прымяняцца ўсе палітыкі блакіроўкі працоўнага профілю."</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"Выкарыстоўваць адзін спосаб блакіроўкі"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"Выкарыстоўваць адзін спосаб блакіроўкі"</string>
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Аднолькава з блакіроўкай экрана прылады"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Кіраванне прыкладаннямі"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Кіраванне ўсталяванымi прыкладаннямi і iх выдаленне"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Звесткі пра праграму"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Звесткі пра праграмы"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Кіраванне прыкладаннямі, налады шляхоў хуткага доступу"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Налады прыкладання"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невядомыя крыніцы"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Дазволіць усе крыніцы дадаткаў"</string>
-    <!-- no translation found for install_all_warning (8310489909586138165) -->
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
     <skip />
-    <!-- no translation found for install_all_warning (1952257127370115988) -->
+    <!-- no translation found for see_all_apps_title (1459400183763114135) -->
     <skip />
+    <!-- no translation found for recent_app_summary (3366446669844932300) -->
+    <skip />
+    <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Уключыць дадатковыя параметры налад"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Звесткі пра прыкладанне"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Звесткі пра праграмы"</string>
     <string name="storage_label" msgid="8700867073480107253">"Захоўванне"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Адкрываць па змаўчанні"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Па змаўчанні"</string>
@@ -1519,9 +1650,9 @@
     <string name="controls_label" msgid="7611113077086853799">"Сродкі кіравання"</string>
     <string name="force_stop" msgid="7435006169872876756">"Прымусовае спыненне"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Усяго"</string>
-    <string name="application_size_label" msgid="8494609207373874267">"Прыкладанне"</string>
+    <string name="application_size_label" msgid="7376689739076506885">"Памер праграмы"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Прыкладанне для захоўвання на USB"</string>
-    <string name="data_size_label" msgid="8679376373625710107">"Дадзеныя"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"Карыстальніцкія даныя"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Дадзеныя USB-сховішча"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-карта"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Выдаліць"</string>
@@ -1560,7 +1691,7 @@
     <string name="disabled" msgid="9206776641295849915">"Адключанае"</string>
     <string name="not_installed" msgid="2797554494953450291">"Не ўсталяв. для гэтага карыст."</string>
     <string name="installed" msgid="3070865169422600098">"Усталявана"</string>
-    <string name="no_applications" msgid="7336588977497084921">"Няма прыкладанняў."</string>
+    <string name="no_applications" msgid="7336588977497084921">"Няма праграм."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Унутраная памяць"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"унутраная памяць"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-назапашвальнік"</string>
@@ -1602,9 +1733,9 @@
     <string name="app_forward_locked" msgid="6331564656683790866">"Прыкладанне абаронена ад капіявання."</string>
     <string name="invalid_location" msgid="4354595459063675191">"Несапраўднае месца ўсталёўкі."</string>
     <string name="system_package" msgid="1352722848400644991">"Абнаўленні сістэмы нельга ўсталёўваць на знешнія носьбіты."</string>
-    <string name="move_error_device_admin" msgid="8148342933314166497">"Адміністратар прылады нельга ўсталёўваць на знешнія носьбіты."</string>
+    <string name="move_error_device_admin" msgid="8673026002690505763">"Праграму адміністратара прылады нельга ўсталёўваць на знешнія носьбіты"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Спынiць прымусова?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Калі вы прымусова спынiце прыкладанне, яно можа дрэнна працаваць."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Прымусовае спыненне дзейнасці праграмы можа прывесці да збою."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Не атрымалася перамясціць дадатак. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Пераважнае месца ўсталявання"</string>
@@ -1619,6 +1750,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Крама"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Звесткi пра праграму"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Праграма ўсталявана з <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Дадатковая інфармацыя ў <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Параметры прыкладанняў"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Выконваецца"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Не выкарыстоўваецца)"</string>
@@ -1643,7 +1775,7 @@
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Памяць прылады"</string>
-    <string name="running_processes_header_footer" msgid="723908176275428442">"Выкарыстанне аператыўнай памяці дадаткамі"</string>
+    <string name="running_processes_header_footer" msgid="723908176275428442">"Выкарыстанне аператыўнай памяці праграмамі"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Сістэма"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Праграмы"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Свабодна"</string>
@@ -1666,10 +1798,14 @@
     <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>
+    <!-- no translation found for language_input_gesture_title (8749227808244881255) -->
+    <skip />
+    <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>
-    <!-- no translation found for input_assistance (7577795275222555487) -->
-    <skip />
+    <string name="input_assistance" msgid="7577795275222555487">"Дапамога па ўводзе"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Клавіятура і раскладкi"</string>
     <string name="phone_language" msgid="7116581601133118044">"Мовы"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1682,15 +1818,11 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Двойчы націсніце прабел, каб уставіць \".\""</string>
     <string name="show_password" msgid="4837897357002495384">"Паказваць паролі"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"Падчас уводу сімвалаў на кароткі час паказваць іх"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Гэты метад уводу можа збіраць увесь тэкст, які ўводзіцца, у тым лiку такiя персанальныя дадзеныя, як паролі і нумары крэдытных карт. Ён выкарыстоўваецца прыкладаннем <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Выкарыстоўваць гэты метад уводу?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Гэты iнструмент праверкi арфаграфіі можа збiраць увесь ўводзімы тэкст, у тым ліку асабістыя дадзеныя, такія як паролі і нумары крэдытных карт. Яно паходзіць ад прыкладання <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Выкарыстоўваць гэты iнструмент?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Налады"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Мова"</string>
-    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Не атрымалася адкрыць параметры <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for keyboard_and_input_methods_category (6035224122054465137) -->
-    <skip />
-    <!-- no translation found for virtual_keyboard_category (9084929359894695824) -->
-    <skip />
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Клавіятура і спосабы ўводу"</string>
+    <string name="virtual_keyboard_category" msgid="1012830752318677119">"Віртуальная клавіятура"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Даступная віртуальная клавіятура"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Кіраванне клавіятурамі"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Дапамога пры ўжыванні клавіятуры"</string>
@@ -1700,7 +1832,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Даведка пра спалучэнні клавіш"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Паказаць даступныя спалучэнні клавіш"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Стандартная"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Мыш/трэкпад"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Хуткасць указальніка"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Прылада кiравання гульнёй"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Выкарыстанне вібратара"</string>
@@ -1726,7 +1857,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Рэдагаваць слова"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Рэдагаваць"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Выдаліць"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"У карыстальніцкім слоўніку няма ніводнага слова. Каб дадаць слова, дакраніце да кнопкі \"Дадаць\" (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"У карыстальніцкім слоўніку няма ніводнага слова. Дадаваць словы можна з дапамогай кнопкі \"Дадаць\" (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Для ўсіх моў"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Іншыя мовы..."</string>
     <string name="testing" msgid="6584352735303604146">"Праверка"</string>
@@ -1767,8 +1898,7 @@
     <string name="usage_time_label" msgid="295954901452833058">"Час выкарыстання"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Спецыяльныя магчымасці"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Налады спецыяльных магчымасцей"</string>
-    <!-- no translation found for accessibility_settings_summary (981260486011624939) -->
-    <skip />
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Праграмы чытання з экрана, элементы кіравання дысплэем і ўзаемадзеяннем"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Налады для слабых зрокам"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Вы можаце наладзіць гэту прыладу так, каб яна адпавядала вашым патрэбам. Гэтыя спецыяльныя функцыі можна змяніць у Наладах."</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Праграмы чытання з экрана"</string>
@@ -1776,32 +1906,40 @@
     <string name="display_category_title" msgid="685461049938269166">"Дысплэй"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"Элементы кіравання ўзаемадзеяннем"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Спампаваныя сэрвісы"</string>
-    <!-- no translation found for experimental_category_title (5272318666666893547) -->
-    <skip />
+    <string name="experimental_category_title" msgid="5272318666666893547">"Эксперыментальныя"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Праграма для чытання з экрана прызначана ў першую чаргу для сляпых людзей і людзей са слабым зрокам"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Дакранайцеся да элементаў на экране, каб пачуць, як іх чытаюць услых"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Цітры"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (6001128808776506021) -->
-    <skip />
-    <!-- no translation found for accessibility_preference_magnification_summary (5867883657521404509) -->
-    <skip />
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Павелічэнне"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Павялічваць трайным дотыкам"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Павялічваць кнопкай"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Павялічваць кнопкай і трайным дотыкам"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Павялічыць маштаб экрана"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Тройчы дакраніцеся, каб змяніць маштаб"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>"Каб павялічыць маштаб"</b>", хутка краніце экран 3 разы адным пальцам.\n"<ul><li>"Каб пракруціць, правядзіце 2 або некалькімі пальцамі"</li>\n<li>"Звядзіце 2 або некалькі пальцаў разам або развядзіце іх у бакі, каб адрэгуляваць маштаб"</li></ul>\n\n<b>"Каб часова павялічыць маштаб"</b>", хутка краніце экран 3 разы і ўтрымлівайце палец падчас трэцяга дотыку.\n"<ul><li>"Праводзьце пальцам, каб перамяшчацца па экране"</li>\n<li>"Падыміце палец, каб паменшыць маштаб"</li></ul>\n\n"Немагчыма павялічыць маштаб клавіятуры і панэлі навігацыі."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Хуткі доступ да спец. магчымасцей"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Дакраніцеся да кнопкі, каб павялічыць маштаб"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Каб павялічыць маштаб"</b>", хутка краніце экран 3 разы.\n"<ul><li>"Правядзіце 2 ці некалькімі пальцамі па экране, каб выканаць пракрутку"</li>\n<li>"Звядзіце 2 ці некалькі пальцаў, каб адрэгуляваць маштаб"</li></ul>\n\n<b>"Каб павялічыць маштаб часова"</b>", хутка краніце экран 3 разы і ўтрымлівайце палец падчас трэцяга дотыку.\n"<ul><li>"Праводзьце пальцам, каб перамяшчацца па экране"</li>\n<li>"Падніміце палец, каб паменшыць маштаб"</li></ul>\n\n"На клавіятуры і панэлі навігацыі павялічваць маштаб нельга."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Калі функцыя павелічэння ўключана, вы можаце выкарыстоўваць кнопку \"Спецыяльныя магчымасці\" ўнізе экрана для хуткага павелічэння.\n\n"<b>"Для павелічэння маштабу"</b>" дакраніцеся да кнопкі \"Спецыяльныя магчымасці\", а потым дакраніцеся да любога месца на экране.\n"<ul><li>"Правядзіце 2 ці некалькімі пальцамі па экране, каб выканаць пракрутку"</li>\n<li>"Звядзіце 2 ці некалькі пальцаў, каб адрэгуляваць маштаб"</li></ul>\n\n<b>"Каб павялічыць маштаб часова"</b>", дакраніцеся да кнопкі \"Спецыяльныя магчымасці\", а потым краніце і ўтрымлівайце любое месца на экране.\n"<ul><li>"Праводзьце пальцам, каб перамяшчацца па экране"</li>\n<li>"Падніміце палец, каб паменшыць маштаб"</li></ul>\n\n"На клавіятуры ці панэлі навігацыі павялічваць маштаб нельга."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Для кнопкі \"Спецыяльныя магчымасці\" зададзена наступнае: <xliff:g id="SERVICE">%1$s</xliff:g>. Каб павялічваць маштаб з яе дапамогай, краніце і ўтрымлівайце кнопку \"Спецыяльныя магчымасці\", а потым выберыце функцыю павелічэння."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Хуткі доступ"</string>
+    <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Служба хуткага доступу"</string>
+    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Дазволіць з экрана блакіроўкі"</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Каб выкарыстоўваць функцыю спецыяльных магчымасцей, калі яна ўключаная, націсніце і ўтрымлівайце на працягу 3 секунд абедзве кнопкі гучнасці."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Высокая кантраснасць тэксту"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Аўтаматычнае абнаўленне павелiчэння экрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Абнаўленне павелiчэння экрану падчас перахода з прыкладання"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Нац. на кнопку сілкавання зав. выклік"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ВЫКЛ завяршае выклік"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Вялікі ўказальнік мышы"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Монафанія"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Аб\'ядноўваць каналы пры прайграванні аўдыя"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Затрымка пры націсканні і ўтрыманні"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Інверсія колеру"</string>
-    <!-- no translation found for accessibility_display_inversion_preference_subtitle (7052959202195368109) -->
-    <skip />
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Можа паўплываць на прадукцыйнасць"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Націсканне пасля спынення руху указальніка"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Затрымка перад націсканнем"</string>
+    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
+    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"УКЛЮЧАНА"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"АДКЛЮЧАНА"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Паказваць у Хуткіх наладах"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Рэжым карэкцыі"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -1868,26 +2006,34 @@
     <string name="color_yellow" msgid="9112680561610873529">"Жоўты"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Пурпурны"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Выкарыстоўваць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"Неабходна: <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> патрабуе:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Паверх запыту дазволу адлюстроўваецца дадатак, таму ваш адказ не можа быць правераны ў Наладах."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Калі вы ўключыце <xliff:g id="SERVICE">%1$s</xliff:g>, прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Вы ўключылі службу доступу, таму ваша прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой графічны ключ."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой PIN-код."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой пароль."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Назірайце за сваімi дзеяннямi"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Атрымлівайце апавяшчэннi падчас узаемадзеяння з дадаткам."</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Сачыць за вашымі дзеяннямі"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Атрымліваць інфармацыю пра тое, якія дзеянні вы выконваеце ў праграме."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Спыніць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Служба <xliff:g id="SERVICE">%1$s</xliff:g> спынiцца, калi вы краняце кнопку «ОК»."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма ўсталяваных службаў"</string>
+    <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Служба не выбрана"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма апісання."</string>
     <string name="settings_button" msgid="3006713718908152930">"Налады"</string>
     <string name="print_settings" msgid="4742428530112487843">"Друк"</string>
-    <plurals name="print_settings_title" formatted="false" msgid="6994238166067938432">
-      <item quantity="one">%d заданне друку</item>
-      <item quantity="few">%d заданні друку</item>
-      <item quantity="many">%d заданняў друку</item>
-      <item quantity="other">%d задання друку</item>
+    <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Адключаны"</string>
+    <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
+      <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="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>
@@ -1921,11 +2067,17 @@
     <string name="power_charge_remaining" msgid="6132074970943913135">"Да поўнай зарадкі засталося <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>"</string>
     <string name="background_activity_title" msgid="8618384801540759730">"Фонавая дзейнасць"</string>
     <string name="background_activity_summary" msgid="8140094430510517362">"Дазволіць праграме працаваць у фонавым рэжыме"</string>
-    <string name="device_screen_usage" msgid="224482533839040430">"Выкарыстанне экрана"</string>
+    <string name="background_activity_summary_on" msgid="649282072540085599">"Праграма можа працаваць у фонавым рэжыме, калі не выкарыстоўваецца"</string>
+    <string name="background_activity_summary_off" msgid="7666330699090632040">"Праца праграмы ў фонавым рэжыме абмежавана, калі праграмай не карыстаюцца"</string>
+    <string name="background_activity_summary_disabled" msgid="3710669050484599847">"У праграмы няма дазволу на працу ў фонавым рэжыме"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Выкарыстанне экрана пасля поўнай зарадкі"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Расход зараду на падсвечванне экрана"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканіраванне мабільнай сеткі"</string>
-    <string name="power_usage_list_summary" msgid="792703666229965848">"Выкарыстанне праграм з моманту апошняй поўнай зарадкі"</string>
-    <string name="device_usage_list_summary" msgid="1545514224536252111">"Выкарыстанне прылады з моманту апошняй поўнай зарадкі"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> таму"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Спажыванне праграмамі з моманту поўнай зарадкі (<xliff:g id="TIME">^1</xliff:g> таму)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Спажыванне прыладай з моманту поўнай зарадкі (<xliff:g id="TIME">^1</xliff:g> таму)"</string>
+    <string name="screen_usage_summary" msgid="6687403051423153550">"Колькасць часу, калі экран быў уключаны, з моманту поўнай зарадкі"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"Выкарыстанне прылады з моманту поўнай зарадкі"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Выкарыстанне акумулятару з моманту адключэння"</string>
     <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>
@@ -1943,18 +2095,58 @@
     <string name="awake" msgid="387122265874485088">"Час з моманту ўключэння прылады"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi у тэрмін"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi у тэрмiн"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Пашыраныя параметры выкарыстання зараду"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Звесткі пра выкарыстанне зараду"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Падрабязнасці гісторыі"</string>
-    <string name="details_title" msgid="3792801565213935385">"Падрабязнасці выкарыстання"</string>
+    <string name="battery_details_title" msgid="6101394441569858580">"Спажыванне зараду"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Падрабязнасці выкарыстання"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Адрэгуляваць спажыванне энергіі"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Уключаныя пакеты"</string>
+    <!-- no translation found for battery_abnormal_details_title (5469019021857291216) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_wakelock_summary (4326186999058828831) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_wakeup_alarm_summary (644657277875785240) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_location_summary (6552797246798806002) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_apps_summary (792553273248686972) -->
+    <skip />
+    <!-- no translation found for dialog_stop_title (6395127715596746479) -->
+    <skip />
+    <!-- no translation found for dialog_stop_message (9149534230295983971) -->
+    <skip />
+    <!-- no translation found for dialog_stop_message (5702924180465982412) -->
+    <skip />
+    <!-- no translation found for dialog_stop_message (9201053069493107713) -->
+    <skip />
+    <!-- no translation found for dialog_stop_ok (2319777211264004900) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_title (1525936543485084879) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_message (5539009263025812279) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_message (4001747292234087612) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_message (585341224642457664) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_ok (412876934682899659) -->
+    <skip />
+    <!-- no translation found for dialog_location_title (5888917530725874727) -->
+    <skip />
+    <!-- no translation found for dialog_location_message (7684240588903005427) -->
+    <skip />
+    <!-- no translation found for dialog_location_message (7439311770795993356) -->
+    <skip />
+    <!-- no translation found for dialog_location_message (6285773079775018012) -->
+    <skip />
+    <!-- no translation found for dialog_location_ok (4572391197601313986) -->
+    <skip />
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Ліхтарык"</string>
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Рэжым чакання тэлефона"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Сетка мабільнай сувязі ў рэжыме чакання"</string>
     <string name="power_phone" msgid="5392641106474567277">"Галасавыя выклікі"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшэт у рэжыме чакання"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Тэлефон у рэжыме чакання"</string>
@@ -1963,7 +2155,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -1986,7 +2179,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Разлічанае спажыванне энергіі"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Фактычнае спажыванне энергіі"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Прымусовае спыненне"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Звесткі пра прыкладанне"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Звесткі пра праграмы"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Налады прыкладання"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Налады экрана"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"налады Wi-Fi"</string>
@@ -2014,12 +2207,24 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Значэнне выкарыстання энергіі з\'яўляецца прыблізным і не ўключае ў сябе ўсе крыніцы выкарыстання энергіі. Іншае – гэта розніца паміж вылічаным прыблізным значэннем выкарыстання энергіі і фактычным выкарыстаннем."</string>
     <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="4383512863007718804">"Выкарыстоўваецца %1$s"</string>
-    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ад агульнага зараду акумулятара"</string>
-    <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Разбіўка па выкарыстанні з моманту апошняй поўнай зарадкі"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Выкарыстана на працягу <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
+    <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>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Разбіўка з моманту апошняй поўнай зарадкі"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Апошняя поўная зарадка"</string>
+    <string name="battery_footer_summary" msgid="4701358808575132647">"Час працы да поўнай разрадкі акумулятара прыводзіцца прыблізна і можа мяняцца ў залежнасці ад умоў выкарыстання"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"Падчас актыўнага выкарыстання"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"У фонавым рэжыме"</string>
+    <string name="battery_detail_power_usage" msgid="6485766868610469101">"Спажыванне зараду"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> ад агульнага спажывання праграмай (<xliff:g id="POWER">%2$d</xliff:g>мАг)"</string>
+    <string name="battery_detail_info_title" msgid="8227822131405620369">"З моманту поўнай зарадкі"</string>
+    <string name="battery_detail_manage_title" msgid="9094314252105828014">"Кіраваць спажываннем зараду"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Прыблзіны час, які застаўся"</string>
-    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Час да поўнай зарадкі"</string>
-    <string name="estimated_time_description" msgid="6722669204902760489">"Прыблізны час можа мяняцца ў залежнасці ад умоў выкарыстання"</string>
+    <string name="estimated_charging_time_left" msgid="5614442409326164691">"Да поўнай зарадкі"</string>
+    <string name="estimated_time_description" msgid="8760210909000037089">"Прыблізны час можа мяняцца ў залежнасці ад умоў выкарыстання"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> пасля адключэння"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Адключаны ад сілкавання на працягу <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Вынікі выкарыстання"</string>
@@ -2077,7 +2282,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Налады галасавога ўводу і вываду"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Галасавы пошук"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Клавіятура Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Гаворка"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Настройкі галасавога ўводу"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Галасавы ўвод"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Службы галасавога ўводу"</string>
@@ -2089,8 +2293,13 @@
     <string name="tts_sliders_title" msgid="992059150784095263">"Хуткасць і тон гаворкі"</string>
     <string name="tts_engine_section_title" msgid="6289240207677024034">"Модуль"</string>
     <string name="tts_install_voice_title" msgid="6275828614052514320">"Галасы"</string>
-    <string name="tts_reset_speech_rate_title" msgid="3993885027390495498">"Скід хуткасці прагаворвання"</string>
-    <string name="tts_reset_speech_rate_summary" msgid="8561618897094097540">"Скінуць хуткасць прагаворвання тэксту да нармальнай."</string>
+    <string name="tts_spoken_language" msgid="5542499183472504027">"Мова вуснага маўлення"</string>
+    <string name="tts_install_voices_title" msgid="8808823756936022641">"Усталюйце праграму для галасоў"</string>
+    <string name="tts_install_voices_text" msgid="5292606786380069134">"Каб усталяваць праграму для галасоў, перайдзіце ў праграму <xliff:g id="TTS_APP_NAME">%s</xliff:g>"</string>
+    <string name="tts_install_voices_open" msgid="667467793360277465">"Адкрыць праграму"</string>
+    <string name="tts_install_voices_cancel" msgid="4711492804851107459">"Скасаваць"</string>
+    <string name="tts_reset" msgid="2661752909256313270">"Выканаць скід"</string>
+    <string name="tts_play" msgid="2628469503798633884">"Прайграць"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Кіраванне сілкаваннем"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Абнаўленне налад Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Абнаўленне налад Bluetooth"</string>
@@ -2151,30 +2360,30 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"У тым ліку даныя дадаткаў"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Аўтаматычнае аднаўленне"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Пры пераўсталяваннi прыкладання аднавіць рэзервовую копію налад і дадзеных"</string>
-    <string name="backup_inactive_title" msgid="5355557151569037197">"Служба рэзервовага капіравання неактыўна."</string>
+    <string name="backup_inactive_title" msgid="685838037986644604">"Служба рэзервовага капіравання неактыўная"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Зараз ніякі ўліковы запіс не змяшчае дадзеных, якія былі рэзервова скапіяваны"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Спыніць рэзервовае капіраванне пароляў ад Wi-Fi, закладак, іншых налад і дадзеных, а таксама выдаліць усе копіі на серверах Google?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Спыніць рэзервовае капіраванне даных прылады (напрыклад, пароляў Wi-Fi і гісторыі выклікаў) і даных праграм (напрыклад, налад і файлаў, якія захоўваюцца праграмамі), а таксама выдаліць усе копіі на аддаленых серверах?"</string>
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Аўтаматычна ствараць рэзервовыя копіі даных прылады (такіх як паролі Wi-Fi і гісторыя выклікаў) і дадаткаў (такіх як налады і файлы, якія захоўваюцца ў дадатках) аддалена.\n\nКалі аўтаматычнае рэзеравовае капіраванне даных уключана, даныя прылады і дадаткаў перыядычна аддалена захоўваюцца. Даныя дадаткаў – гэта любыя даныя, якія захоўваюцца дадаткам (у залежнасці ад налад распрацоўшчыка), у тым ліку патэнцыяльна ўразлівыя даныя, такія як кантакты, паведамленні і фатаграфіі."</string>
-    <string name="device_admin_settings_title" msgid="1335557832906433309">"Налады адміністравання прылады"</string>
-    <string name="active_device_admin_msg" msgid="6930903262612422111">"Адміністратар прылады"</string>
-    <string name="remove_device_admin" msgid="7736174723276745230">"Дэактываваць гэтага адміністратара прылады"</string>
+    <string name="device_admin_settings_title" msgid="4960761799560705902">"Налады адміністратара прылады"</string>
+    <string name="active_device_admin_msg" msgid="578748451637360192">"Праграма адміністратара прылады"</string>
+    <string name="remove_device_admin" msgid="9207368982033308173">"Дэактываваць гэту праграму адміністратара прылады"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Выдалiць праграму"</string>
-    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Дэактывацыя і выдаленне"</string>
-    <string name="select_device_admin_msg" msgid="2645509057946368094">"Адміністратары прылады"</string>
-    <string name="no_device_admins" msgid="702695100241728775">"Адміністратары прылады недаступны"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Дэактываваць і выдаліць"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Праграмы адміністратара"</string>
+    <string name="no_device_admins" msgid="4846602835339095768">"Няма даступных праграм адміністратара прылады"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Персанальныя"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Рабочыя"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Няма даступных давераных агентаў"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Актываваць адміністратара прылады?"</string>
-    <string name="add_device_admin" msgid="1349673618141610506">"Актываваць гэтага адміністратара прылады"</string>
-    <string name="device_admin_add_title" msgid="7705551449705676363">"Адміністратар прылады"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Актывацыя гэтага адміністратара дазволіць праграме <xliff:g id="APP_NAME">%1$s</xliff:g> выконваць наступныя дзеянні:"</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"Гэты адміністратар з\'яўляецца актыўным і дазваляе праграме <xliff:g id="APP_NAME">%1$s</xliff:g> выконваць наступныя аперацыі:"</string>
+    <string name="add_device_admin_msg" msgid="1501847129819382149">"Актываваць праграму адмін-ра прылады?"</string>
+    <string name="add_device_admin" msgid="4192055385312215731">"Актываваць гэту праграму адміністратара прылады"</string>
+    <string name="device_admin_add_title" msgid="3140663753671809044">"Адміністратар прылады"</string>
+    <string name="device_admin_warning" msgid="7482834776510188134">"Актывацыя гэтай праграмы адміністратара дазволіць праграме <xliff:g id="APP_NAME">%1$s</xliff:g> выконваць наступныя дзеянні:"</string>
+    <string name="device_admin_status" msgid="7234814785374977990">"Гэта праграма адміністратара актыўная і дазваляе праграме <xliff:g id="APP_NAME">%1$s</xliff:g> выконваць наступныя дзеянні:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"Актываваць Менеджар профіляў?"</string>
-    <string name="adding_profile_owner_warning" msgid="8081841501073689534">"Калі вы працягнеце, ваш Карыстальнік будзе знаходзіцца пад кіраваннем вашага Адміністратара, які, акрамя вашых асабістых даных, зможа захоўваць таксама звязаныя даныя.\n\nУ вашага Адміністратара ёсць правы на маніторынг і кіраванне наладамі, доступам, дадаткамі і данымі, звязанымі з гэтым Карыстальнікам, у тым ліку інфармацыяй пра сеткавую актыўнасць і месцазнаходжанне прылады."</string>
-    <string name="admin_disabled_other_options" msgid="4564776259414246934">"Іншыя параметры адключаны вашым адміністратарам."</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"Калі вы працягнеце, ваш карыстальнік будзе знаходзіцца пад кіраваннем вашага адміністратара, які, акрамя вашых асабістых даных, зможа захоўваць таксама звязаныя даныя.\n\nУ вашага адміністратара ёсць магчымасць маніторынгу і адміністравання налад, доступу, праграм і даных, звязаных з гэтым карыстальнікам, у тым ліку інфармацыі пра сеткавую актыўнасць і геаданых."</string>
+    <string name="admin_disabled_other_options" msgid="7712694507069054530">"Іншыя параметры адключаны вашым адміністратарам"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"Дадатковая інфармацыя"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Без назвы"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Агульныя"</string>
@@ -2252,7 +2461,7 @@
     <string name="really_remove_account_title" msgid="8800653398717172460">"Выдаліць уліковы запіс"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Выдаленне гэтага ўлiковага запiсу прывядзе да выдалення ўсіх паведамленняў, кантактаў і іншых дадзеных з планшэта."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Выдаленне гэтага ўлiковага запiсу прывядзе да выдалення ўсіх паведамленняў, кантактаў і іншых дадзеных з тэлефона."</string>
-    <string name="remove_account_failed" msgid="6980737964448187854">"Ваш адміністратар не дазваляе гэту змену"</string>
+    <string name="remove_account_failed" msgid="3901397272647112455">"Ваш адміністратар не дазваляе гэту змену"</string>
     <string name="provider_label" msgid="7724593781904508866">"Прымусовыя падпіскі"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -2277,7 +2486,7 @@
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Трафік праграм"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Улік даных аператара можа адрознівацца ад уліку вашай прылады."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Выкарыстанне памяці"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ІНФАРМАЦЫЯ ПРА ДАДАТАК"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ЗВЕСТКІ ПРА ПРАГРАМЫ"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Мабільная перадача даных"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Усталяваць ліміт даных"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Цыкл выкарыст. дадзеных"</string>
@@ -2316,15 +2525,14 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Маб. вер."</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Няма"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Мабільныя дадзеныя"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Мабільная перадача даных"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Дадзеныя 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Дадзеныя 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"На пярэднім плане:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"Фонавае"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"Налады дадатку"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Фонавы трафік"</string>
-    <!-- no translation found for data_usage_app_restrict_background_summary (5853552187570622572) -->
-    <skip />
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Уключыць выкарыстанне мабільнай перадачы даных у фоне"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Каб абмежаваць зыходныя дадзеныя для гэтага прыкладання, спачатку ўсталюйце ліміт мабільных дадзеных."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Абмежаваць зыходныя дадзеныя?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Гэта функцыя можа перашкаджаць працы прыкладанняў, якiя залежаць ад фонавых дадзеных, толькi калі даступныя мабільныя сеткі.\n\nВы можаце знайсці больш адпаведнае прымяненне дадзеным у наладах прыкладання."</string>
@@ -2332,16 +2540,16 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Уключыць аўтасінхр. даных?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваны ў памяць планшэта.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены, якія вы робіце ў планшэце, на вэб-сайт. Уліковы запіс Google працуе такім чынам."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваныя ў памяць тэлефона.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены, якія вы робіце ў тэлефоне, на вэб-сайт. Уліковы запіс Google працуе такім чынам."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Адключыць аўтасінхр. даных?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Гэта дасць магчымасць захаваць трафік і зарад акумулятара, але вам трэба будзе сінхранiзаваць кожны ўліковы запіс уручную, каб збіраць свежую інфармацыю. І вы не будзеце атрымліваць апавяшчэнні, калі з\'явяцца абнаўленні."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Адключыць аўтасінхранізацыю?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Гэта дапаможа захоўваць трафік і зарад акумулятара. Аднак вам трэба будзе сінхранізаваць кожны ўліковы запіс уручную, каб збіраць свежую інфармацыю. Вы таксама не будзеце атрымліваць апавяшчэнні пра абнаўленні."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата скіду цыкла выкарыстання"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Дата кожнага месяца:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Задаць"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Усталяваць папярэджанне аб выкарыстанні дадзеных"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Усталяваць ліміт выкарыстання дадзеных"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Абмежаванне выкарыстання дадзеных"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Усталяваць ліміт выкарыстання даных"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Абмежаванне выкарыстання даных"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Калі ліміт, які вы ўсталявалі, будзе дасягнуты, планшэт выключыць мабільную перадачу даных.\n\nПаколькі выкарыстанне даных можа ўлічвацца вашым тэлефонам і вашым аператарам па-рознаму, мы рэкамендуем усталяваць больш ці менш нізкі ліміт."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Калі ліміт, які вы ўсталявалі, будзе дасягнуты, тэлефон выключыць мабільную перадачу даных.\n\nПаколькі выкарыстанне даных можа ўлічвацца вашым тэлефонам і вашым аператарам па-рознаму, мы рэкамендуем усталяваць больш ці менш нізкі ліміт."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Пасля дасягнення вызначанага ліміту трафіку тэлефон выключыць мабільную перадачу даных.\n\nПаколькі метады разліку трафіку вашым тэлефонам і вашым аператарам могуць адрознівацца, мы рэкамендуем устанавіць заніжаны ліміт."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Абмежаваць зыходныя дадзеныя?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Калі вы абмяжоўваеце мабільную перадачу даных у фоне, некаторыя праграмы і сэрвісы не будуць працаваць, пакуль вы не падключыцеся да Wi‑Fi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Калі вы абмяжоўваеце мабільную перадачу даных у фоне, некаторыя праграмы і сэрвісы не будуць працаваць, пакуль вы не падключыцеся да Wi‑Fi.\n\nГэта налада ўплывае на ўсіх карыстальнікаў гэтага планшэта."</string>
@@ -2382,6 +2590,11 @@
     <string name="vpn_not_used" msgid="9094191054524660891">"(Не выкарыстоўваецца)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(не правяраць сервер)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(атрыманыя з сервера)"</string>
+    <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"VPN гэтага тыпу не можа заўсёды заставацца ўключанай"</string>
+    <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"Для заўсёды ўключанай VPN падыходзяць толькі адрасы сервераў, якія складаюцца з лічбаў"</string>
+    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"Для заўсёды ўключанай VPN павінен быць пазначаны DNS-сервер"</string>
+    <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"Для заўсёды ўключанай VPN адрасы DNS-сервераў павінны складацца з лічбаў"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"Уведзеная інфармацыя не сумяшчальная з заўсёды ўключанай VPN"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Скасаваць"</string>
     <string name="vpn_done" msgid="8678655203910995914">"Адхіліць"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Захаваць"</string>
@@ -2390,7 +2603,7 @@
     <string name="vpn_edit" msgid="8647191407179996943">"Рэдагаваць профіль VPN"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Iгнараваць"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Падключэнне да профiлю <xliff:g id="PROFILE">%s</xliff:g>"</string>
-    <string name="vpn_disconnect_confirm" msgid="2555877026824771115">"Адключыць гэту VPN."</string>
+    <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Адключыць гэту VPN?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Адключыць"</string>
     <string name="vpn_version" msgid="1939804054179766249">"Версія <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Забыць VPN"</string>
@@ -2402,28 +2615,25 @@
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"Вы ўжо падключаны да VPN. Калі вы падключыцеся да іншай, ваша існуючая VPN будзе заменена."</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"Уключыць"</string>
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> не можа падключыцца"</string>
-    <string name="vpn_cant_connect_message" msgid="2593197919352621279">"Гэта праграма не падтрымлівае пастаянна ўключаную VPN."</string>
+    <string name="vpn_cant_connect_message" msgid="1352832123114214283">"Гэта праграма не падтрымлівае заўсёды ўключаную VPN"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Дадаць профіль VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Рэдагаваць профiль"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Выдаліць профіль"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Заўсёды ўключаны VPN"</string>
-    <string name="vpn_no_vpns_added" msgid="4308317205962153438">"VPN не дададзеныя."</string>
-    <string name="vpn_always_on_active" msgid="2789423425184556882">"Заўсёды ўключана і актыўна"</string>
-    <string name="vpn_always_on_inactive" msgid="3488804214062121892">"\"Заўсёды ўключана\" не актывавана"</string>
-    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Не падтрымліваецца гэтай праграмай"</string>
-    <string name="vpn_require_connection" msgid="4564777707170757146">"Дазваляць падключэнне толькі праз VPN"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Няма дададзеных VPN"</string>
+    <string name="vpn_always_on_summary" msgid="2821344524094363617">"Заўсёды захоўваць падключэнне да VPN"</string>
+    <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Не падтрымліваецца гэтай праграмай"</string>
+    <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Заўсёды ўключана і актыўная"</string>
+    <string name="vpn_require_connection" msgid="8388183166574269666">"Блакіраваць злучэнні без VPN"</string>
     <string name="vpn_require_connection_title" msgid="159053539340576331">"Патрабуецца падключэнне VPN?"</string>
-    <string name="vpn_lockdown_active" msgid="4687243926584886862">"Блакіроўка актыўная"</string>
-    <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Блакіроўка неактыўная"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Дазволiць, каб VPN заўсёды заставаўся падключаным да сеткi, можна будзе толькi пасля падключэння да гэтага VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Няма"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Заўсёды ўключаны VPN патрабуе IP-адрас для сервера і DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Падключэнне да сеткi адсутнічае. Паўтарыце спробу пазней."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"Адключана ад VPN"</string>
-    <!-- no translation found for vpn_disconnected_summary (3082851661207900606) -->
-    <skip />
-    <string name="vpn_missing_cert" msgid="7972907102570411501">"Сертыфікат адсутнічае. Адрэдагуйце профіль."</string>
+    <string name="vpn_disconnected_summary" msgid="3082851661207900606">"Не падключана"</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"Сертыфікат адсутнічае. Паспрабуйце адрэдагаваць профіль."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Сістэма"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Карыстальнік"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Адключыць"</string>
@@ -2438,12 +2648,13 @@
     <string name="one_usercrt" msgid="2150319011101639509">"адзін сертыфікат карыстальніка"</string>
     <string name="one_cacrt" msgid="6844397037970164809">"адзін сертыфікат ЦС"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"Сертыфікаты ЦС: %d"</string>
-    <string name="user_credential_title" msgid="1329449215749665378">"Падрабязнасці ўліковых даных"</string>
+    <string name="user_credential_title" msgid="1954061209643070652">"Падрабязнасці ўліковых даных"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"Уліковыя даныя выдалены: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"Уліковыя даныя карыстальніка не ўсталяваны"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Праверка правапiсу"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Увядзіце тут свой бягучы пароль поўнага рэзервовага капіявання"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Тут увядзіце новы пароль для поўнага рэзервовага капіравання"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Увядзіце тут новы пароль для поўнага рэзервовага капіявання"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Пацвердзіце пароль"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Пазначце пароль рэзервовага капіравання"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Скасаваць"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дадатк. абнаўл. сістэмы"</string>
@@ -2536,7 +2747,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Гэты карыстальнік атрымае доступ да гісторыі выклікаў."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Уключыць тэлефонныя выклікі і SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Гэты карыстальнік атрымае доступ да гісторыі выклікаў і SMS."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Інфармацыя для экстранных сітуацый"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Даныя для экстранных сітуацый"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Інфармацыя і кантакты карыстальніка <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дазволіць прыкладанні і змесціва"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Прыкладанні з абмежаваннямі"</string>
@@ -2547,13 +2758,13 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Аплата дотыкам"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Як гэта працуе"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Плаціце ў крамах з дапамогай свайго тэлефона"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Аплата па змаўчанні"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Стандартны спосаб аплаты"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Не задана"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> – <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
-    <string name="nfc_payment_use_default" msgid="3234730182120288495">"Выкарыстоўваць дадатак па змаўчанні"</string>
+    <string name="nfc_payment_use_default" msgid="3234730182120288495">"Выкарыстоўваць стандартную праграму"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Заўсёды"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"За выключэннем выпадкаў, калі адкрыты іншы плацежны дадатак"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Плаціць з дапамогай наступнага дадатку ў тэрміналах бескантактных плацяжоў:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Пры бескантактнай аплаце выкарыстоўваць:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Аплата ў тэрмінале"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Наладзьце плацежны дадатак. Затым проста прыкладзіце тэлефон задняй часткай да любога тэрмінала з сімвалам бескантактнай аплаты."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Зразумела"</string>
@@ -2601,8 +2812,8 @@
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Дазволіць змяненне спалучэнняў і параметраў Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Дазволіць абмен данымі, калі гэта <xliff:g id="DEVICE_NAME">%1$s</xliff:g> дакранаецца да іншай прылады NFC"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Дазволіць абмен дадзенымі, калі планшэт дакранаецца да іншай прылады"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Дазволіць абмен дадзенымі, калі тэлефон дакранаецца да іншай прылады"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Дазволіць абмен данымі пры спалучэнні планшэта з іншымі прыладамі"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Дазволіць абмен данымі пры спалучэнні тэлефона з іншымі прыладамі"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Месцазнаходжанне"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Дазволіць прыкладанню выкарыстоўваць вашу інфармацыю аб месцазнаходжанні"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
@@ -2658,17 +2869,17 @@
       <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>
-    <!-- no translation found for connected_devices_dashboard_summary (2390582103384791904) -->
-    <skip />
+    <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>
-    <!-- no translation found for account_dashboard_title (4936890821712178853) -->
-    <skip />
+    <string name="account_dashboard_title" msgid="4936890821712178853">"Карыстальнікі і ўліковыя запісы"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Стандартныя праграмы"</string>
-    <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Мовы, рэзервовае капіраванне, абнаўленні, інфармацыя пра тэлефон"</string>
-    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Мовы, рэзервовае капіраванне, абнаўленні, інфармацыя пра прыладу"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"Мовы, час, рэзервовае капіраванне, абнаўленні"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Налады"</string>
     <string name="search_menu" msgid="6283419262313758339">"Налады пошуку"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Налады пошуку"</string>
@@ -2716,6 +2927,12 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"жэст"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"плаціць, дакранацца, плацяжы"</string>
     <string name="keywords_backup" msgid="470070289135403022">"рэзервовае капіраванне, стварыць рэзервовую копію"</string>
+    <!-- no translation found for keywords_squeeze_to_launch_gesture (4459283333825902485) -->
+    <skip />
+    <!-- no translation found for keywords_wake_squeeze_gesture (6923058534235267845) -->
+    <skip />
+    <!-- no translation found for keywords_alarm_silence_gesture (8507935972184597252) -->
+    <skip />
     <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>
@@ -2725,7 +2942,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Запіс на метку NFC немагчымы. Калі ласка, скарыстайцеся іншай меткай."</string>
     <string name="default_sound" msgid="8821684447333687810">"Гук па змаўчанні"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Гучнасць званка – <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="2507943820408985874">"Гучнасць, вібрацыя, рэжым \"Не турбаваць\""</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Гучнасць, вібрацыя, рэжым \"Не турбаваць\""</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Для гуку выкліку заданы рэжым вібрацыі"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Для гуку выкліку заданы бязгучны рэжым"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Гучнасць званка – 80 %"</string>
@@ -2735,6 +2952,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Гучнасць апавяшчэнняў"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодыя тэлефона"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Стандартны гук апавяшчэння"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Гук з праграмы"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Стандартны гук апавяшчэння"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Стандартны сігнал будзільніка"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Уключыць вібрацыю для выклікаў"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Іншыя гукі"</string>
@@ -2751,35 +2970,45 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Абвестка"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібрацыя"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Гукі пры ўключэнні"</string>
-    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Налады рэжыму \"Не турбаваць\""</string>
+    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Аўтаматычныя правілы не ўключаны"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
+      <item quantity="one">Уключана <xliff:g id="ON_COUNT">%d</xliff:g> аўтаматычнае правіла</item>
+      <item quantity="few">Уключаны <xliff:g id="ON_COUNT">%d</xliff:g> аўтаматычныя правілы</item>
+      <item quantity="many">Уключаны <xliff:g id="ON_COUNT">%d</xliff:g> аўтаматычных правіл</item>
+      <item quantity="other">Уключаны <xliff:g id="ON_COUNT">%d</xliff:g> аўтаматычнага правіла</item>
+    </plurals>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Параметры рэжыму \"Не турбаваць\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дазволены толькі прыярытэтныя"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Аўтаматычныя правілы"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Задаць графік рэж. \"Не турб.\""</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Бясшумны рэжым у пэўныя часы"</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Правілы рэжыму \"Не турбаваць\""</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Абмяжоўваць гукі і вібрацыю ў пэўныя часы"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Толькі прыярытэтныя"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Толькі будзільнікі"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Поўная цішыня"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Блакіроўка візуальн. умяшанняў"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Блакіроўка візуальных апавяшчэнняў"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Гукі працоўнага профілю"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Выкар. гукі асабістага профілю"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2940241783139859361">"Гукі працоўнага профілю такія ж, як у асабістым профілі"</string>
+    <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"У працоўным і асабістым профілях гукі аднолькавыя"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"Мелодыя тэлефона ў прац. проф."</string>
-    <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Станд. гук апав. прац. проф."</string>
-    <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Станд. мелод. будз. прац.проф."</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"Стандартны гук апавяшчэння ў працоўным профілі"</string>
+    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"Стандартны гук будзільніка ў працоўным профілі"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Такія ж, як у асабістым профілі"</string>
-    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Выкарыстоўваць гукі асабістага профілю?"</string>
+    <string name="work_sync_dialog_title" msgid="7123973297187354813">"Замяніць гукі?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Замяніць"</string>
-    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Замест бягучай гукавай схемы вашага працоўнага профілю будуць выкарыстоўвацца гукі асабістага профілю"</string>
+    <string name="work_sync_dialog_message" msgid="7841728953710863208">"У вашым працоўным профілі будуць выкарыстоўвацца гукі асабістага профілю"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"Дадаць карыстальніцкі гук?"</string>
+    <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"Гэты файл будзе скапіраваны ў папку <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Рынгтоны"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Іншыя гукі і вібрацыя"</string>
-    <string name="configure_notification_settings" msgid="7447797716856573587">"Параметры апавяшчэнняў"</string>
+    <string name="configure_notification_settings" msgid="7616737397127242615">"Апавяшчэнні"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Пашыраныя"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Апавяшчэнні працоўнага профілю"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Мігценне індыкатара апавяшчэння"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Паказваць значкі апавяшчэнняў"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Мігценне святла"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На экране блакіроўкі"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Паказваць усё змесціва ў апавяшчэннях"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Хаваць канфідэнцыяльнае змесціва ў апавяшчэннях"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Хаваць асабовае змесціва ў апавяшчэннях"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Ніколі не паказваць апавяшчэнні"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Як павінны паказвацца апавяшчэнні, калі прылада заблакіравана?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Апавяшчэнні"</string>
@@ -2789,20 +3018,23 @@
     <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>
-    <!-- no translation found for app_notifications_summary (3421524441126902552) -->
+    <string name="notification_channel_title" msgid="2260666541030178452">"Катэгорыя апавяшчэнняў"</string>
     <string name="notification_importance_title" msgid="848692592679312666">"Важнасць"</string>
-    <string name="notification_importance_none" msgid="3173515479356106227">"Не зададзена"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Дазволіць праграме прымаць рашэнне"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Ніколі не паказваць апавяшчэнні"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Без гуку ці візуальнага перапынення"</string>
-    <string name="notification_importance_low" msgid="2445139943005315690">"Паказваць бязгучна"</string>
+    <string name="notification_importance_low" msgid="8881468429453766553">"Без гуку"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Прайграваць гук"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Прайграваць гук і паказваць на экране"</string>
-    <string name="importance_reset" msgid="7458420788555607007">"Скінуць"</string>
-    <string name="show_silently" msgid="2222875799232222056">"Паказваць бязгучна"</string>
+    <string name="notification_importance_min_title" msgid="6974673091137544803">"Нізкая"</string>
+    <string name="notification_importance_low_title" msgid="8131254047772814309">"Сярэдняя"</string>
+    <string name="notification_importance_default_title" msgid="9120383978536089489">"Высокая"</string>
+    <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="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>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Прыкладанні не могуць чытаць апавяшчэнні"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d дадатак можа чытаць апавяшчэнні</item>
@@ -2810,13 +3042,13 @@
       <item quantity="many">%d дадаткаў могуць чытаць апавяшчэнні</item>
       <item quantity="other">%d дадатку могуць чытаць апавяшчэнні</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"Запытаў ад усталяваных дадаткаў на доступ да апавяшчэнняў не паступала."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"Няма праграм з доступам да платных SMS."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Адкрыць доступ да апавяшчэнняў для <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"Праграма <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> атрымае доступ да ўсіх апавяшчэнняў, у тым ліку асабістай інфармацыі, такой як кантакты і тэкст паведамленняў, якія вы атрымліваеце. Яна таксама зможа адхіляць апавяшчэнні і актываваць у іх кнопкі дзеянняў. \n\nГэта таксама дасwm праграме магчымасць уключаць і выключаць рэжым \"Не турбаваць\", а таксама змяняць звязаныя з ім налады."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Калі вы адключыце доступ да апавяшчэнняў для <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, доступ да рэжыму \"Не турбаваць\" можа быць таксама адключаны."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Адключыць"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Скасаваць"</string>
-    <string name="vr_listeners_title" msgid="1318901577754715777">"Службы-памочнікі віртуальнай рэальнасці (VR)"</string>
+    <string name="vr_listeners_title" msgid="1318901577754715777">"Дапаможныя VR-сэрвісы"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"Усталяваныя праграмы не запытвалі выканання ў якасці службы-памочніка віртуальнай рэальнасці (VR)."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Дазволіць сэрвісу віртуальнай рэальнасці (VR) доступ да <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> зможа выконвацца, калі вы выкарыстоўваеце праграмы ў рэжыме віртуальнай рэальнасці."</string>
@@ -2827,29 +3059,38 @@
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Ніводная з усталяваных праграм не падтрымлівае рэжым \"відарыс у відарысе\""</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip, відарыс у"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Відарыс у відарысе"</string>
-    <!-- no translation found for picture_in_picture_app_detail_switch (1131910667023738296) -->
-    <skip />
-    <!-- no translation found for picture_in_picture_app_detail_summary (7942592478427522244) -->
-    <skip />
-    <!-- no translation found for picture_in_picture_on (6103704909710176555) -->
-    <skip />
-    <!-- no translation found for picture_in_picture_off (5654388666434625247) -->
-    <skip />
+    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Дазволіць відарыс у відарысе"</string>
+    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Дазволіць гэтай праграме ствараць акно відарыса ў відарысе, калі праграма адкрыта або пасля таго, як вы выйдзеце з яе (напрыклад, каб працягнуць прагляд відэа). Гэта акно паказваецца паверх іншых праграм, якія вы выкарыстоўваеце."</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android блакіруе апавяшчэнні ад дадзенай праграмы на гэтай прыладзе"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android блакіруе дадзеную катэгорыю апавяшчэнняў на гэтай прыладзе"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Катэгорыі"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Іншае"</string>
     <string name="no_channels" msgid="3077375508177744586">"Гэта праграма не размяшчала ніякіх апавяшчэнняў"</string>
-    <!-- no translation found for app_settings_link (8894946007543660906) -->
-    <skip />
-    <!-- no translation found for deleted_channels (3757203969719476510) -->
+    <string name="app_settings_link" msgid="8894946007543660906">"Дадатковыя налады ў праграме"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Уключаны для ўсіх праграм"</string>
+    <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
+      <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="deleted_channels" formatted="false" msgid="8028574302599397935">
+      <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="notification_toggle_on" msgid="650145396718191048">"Уключаны"</string>
+    <string name="notification_toggle_off" msgid="2142010737190671762">"Адключаны"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блакіраваць усё"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Ніколі не паказваць гэтыя апавяшчэнні"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Паказваць апавяшчэнні"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Ніколі не паказваць апавяшчэнні на \"шторцы\" або на перыферыйных прыладах"</string>
-    <string name="notification_badge_title" msgid="5404669445214920178">"Паказаць значок"</string>
-    <string name="notification_badge_summary" msgid="3944771498030335669">"Паказваць апавяшчэнні як значкі ў праграме Home, калі падтрымліваецца."</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"Паказваць значок апавяшчэнняў"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Паказваць значок апавяшчэнняў"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ігнараваць рэжым «Не турбаваць»"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Паказваць гэтыя апавяшчэнні, калі ў рэжыме «Не турбаваць» выбрана «Толькі прыярытэтныя»"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На экране блакіроўкі"</string>
@@ -2858,12 +3099,15 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Канфідэнцыяльна"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Гатова"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Важнасць"</string>
-    <string name="notification_show_lights_title" msgid="7301956309661349031">"Заўсёды ўключаць мігценне індыкатара апавяшчэння"</string>
-    <string name="notification_vibrate_title" msgid="4942317478973441720">"Заўсёды ўключаць вібрацыю"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Мігценне святла"</string>
+    <string name="notification_vibrate_title" msgid="1646667807969755957">"Вібрацыя"</string>
+    <string name="notification_channel_sound_title" msgid="3899212238513507941">"Гук"</string>
+    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Выдаліць"</string>
+    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Перайменаваць"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Імя правіла"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Увядзіце імя правіла"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Імя правіла ўжо выкарыстоўваецца"</string>
-    <string name="zen_mode_add_rule" msgid="9100929184624317193">"Дадаць правіла"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Дадаць яшчэ"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Выдаліць правіла"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Выберыце тып правіла"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Выдаліць правіла “<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
@@ -2902,14 +3146,14 @@
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Ад усіх"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Толькі ад кантактаў"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Толькі ад кантактаў, пазначаных зоркай"</string>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"Няма"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"Ні ад каго"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будзільнікі"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напаміны"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Падзеі"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Усе абаненты"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Выбраныя выклікі"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Паўторныя выклікі"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Калі адзін і той жа чалавек тэлефануе вам другі раз за наступную колькасць хвілін: <xliff:g id="MINUTES">%d</xliff:g>, дазволіць гэты выклік"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Калі адзін і той жа чалавек тэлефануе вам другі раз за <xliff:g id="MINUTES">%d</xliff:g> хвілін, дазволіць гэты выклік"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Уключыць аўтаматычна"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ніколі"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Кожную ноч"</string>
@@ -2933,9 +3177,9 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Пераключыцца на рэжым «толькі будзільнікі» да <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Уключыць усе апавяшчэнні"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Блакіраваць, калі экран уключаны"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Прадухіліць кароткі паказ або ўсплыванне апавяшчэнняў, паказ якіх адключаны ў рэжыме «Не турбаваць»"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Не паказваць на экране апавяшчэнні, адключаныя ў рэжыме \"Не турбаваць\""</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Блакіраваць, калі экран выключаны"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Прадухіліць уключэнне экрана або пульсацыю індыкатара апавяшчэнняў для апавяшчэнняў, паказ якіх адключаны ў рэжыме «Не турбаваць»"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Не ўключаць экран і светлавы індыкатар для апавяшчэнняў, адключаных у рэжыме \"Не турбаваць\""</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Не дазваляць уключэнне экрана для апавяшчэнняў, паказ якіх адключаны ў рэжыме «Не турбаваць»"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Выключана"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Калі экран уключаны"</string>
@@ -2943,7 +3187,7 @@
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Калі экран уключаны або выключаны"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Налады апавяшчэнняў"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Адправіць водгук пра гэту прыладу"</string>
-    <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Увядзіце PIN-код адміністратара"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Увядзіце PIN-код адміністратара"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Уключана"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Выключана"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Замацаванне экрана"</string>
@@ -2955,25 +3199,16 @@
     <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="7164072567822375682">"Вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод PIN-кода пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод графічнага ключа пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод пароля пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод PIN-кода пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод узору пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод пароля пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Патрабаваць PIN-код пры запуску прылады"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Патрабаваць узор для запуску прылады"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Патрабаваць пароль для запуску прылады"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Не, дзякуй"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Не, дзякуй"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Не, дзякуй"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання PIN-кода пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць PIN-код для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання ўзору пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць узор для запуску вашай прылады?"</string>
+    <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="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>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Патрабаваць узор?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Запытваць пароль?"</string>
@@ -2998,15 +3233,18 @@
     <string name="storage_used" msgid="7128074132917008743">"Сховішча для выкарыстання"</string>
     <string name="change" msgid="6657848623929839991">"Змяніць"</string>
     <string name="change_storage" msgid="600475265207060436">"Змяніць сховішча"</string>
-    <string name="notifications_label" msgid="2872668710589600731">"Апавяшчэнні"</string>
-    <string name="notifications_enabled" msgid="4386196629684749507">"Звычайны"</string>
-    <string name="notifications_disabled" msgid="3200751656741989335">"Заблакiравана"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"Апавяшчэнні праграм"</string>
+    <!-- no translation found for notifications_enabled (6983396130566021385) -->
+    <skip />
+    <string name="notifications_disabled" msgid="334416731283131597">"Усё адключана"</string>
+    <string name="notifications_partly_blocked" msgid="592071133950126656">"Адключаны катэгорыі: <xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"Бязгучна"</string>
     <string name="notifications_redacted" msgid="4493588975742803160">"Канфідэнцыяльнае змесціва не паказваецца на экране блакіроўкі"</string>
     <string name="notifications_hidden" msgid="3619610536038757468">"Не паказваецца на экране блакіроўкі"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"Рэжым «Не турбаваць» ігнаруецца"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
     <string name="notification_summary_level" msgid="2726571692704140826">"Узровень %d"</string>
+    <string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> дазвол атрыманы</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> дазволы атрыманыя</item>
@@ -3032,20 +3270,30 @@
     <string name="filter_instant_apps" msgid="574277769963965565">"Імгненныя праграмы"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Персанальныя"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Працоўныя"</string>
-    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Заблакiраваныя"</string>
+    <string name="filter_notif_all_apps" msgid="2299049859443680242">"Праграмы: усе"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Праграмы: выключаныя"</string>
+    <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Катэгорыі: тэрміновыя"</string>
+    <string name="filter_notif_low_channels" msgid="4128487387390004604">"Катэгорыі: не вельмі важныя"</string>
+    <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Катэгорыі: выключаныя"</string>
+    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Катэгорыі: ігнаруюць рэжым \"Не турбаваць\""</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Пашыраныя"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Канфігурацыя дадаткаў"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Невядомы дадатак"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"Дазволы дадатку"</string>
-    <!-- no translation found for app_permissions_summary (5163974162150406324) -->
-    <skip />
+    <string name="app_permissions" msgid="4148222031991883874">"Дазволы праграм"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Праграмы, якія выкарыстоўваюць <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Краніце, каб абудзіць"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Дакраніцеся двойчы ў любым месцы экрана, каб абудзіць прыладу"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Адкрыццё спасылак"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Не адкрываць спасылкі, якія падтрымліваюцца"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Адкрыць <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Адкрыццё <xliff:g id="DOMAIN">%s</xliff:g> і іншых URL-адрасоў"</string>
-    <!-- no translation found for domain_urls_apps_summary (6999347849855021374) -->
+    <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Няма праграм, што адкрываюць спасылкі, якія падтрымліваюцца"</string>
+    <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> праграма адкрывае спасылкі, якія падтрымліваюцца</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> праграмы адкрываюць спасылкі, якія падтрымліваюцца</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> праграм адкрываюць спасылкі, якія падтрымліваюцца</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> праграмы адкрываюць спасылкі, якія падтрымліваюцца</item>
+    </plurals>
     <string name="app_link_open_always" msgid="2474058700623948148">"Адкрываць у гэтым дадатку"</string>
     <string name="app_link_open_ask" msgid="7800878430190575991">"Заўсёды пытацца"</string>
     <string name="app_link_open_never" msgid="3407647600352398543">"Не адкрываць у гэтым дадатку"</string>
@@ -3053,20 +3301,20 @@
     <string name="default_apps_title" msgid="1660450272764331490">"Стандартныя"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Стандартныя для працы"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Памочнік і галасавы ўвод"</string>
-    <string name="default_assist_title" msgid="8868488975409247921">"Дадатак-памочнік"</string>
+    <string name="default_assist_title" msgid="8868488975409247921">"Праграма-памочнік"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Зрабіць <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> вашым памочнікам?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Памочніку будзе даступна інфармацыя пра дадаткі, якія выкарыстоўваюцца ў вашай сістэме, у тым ліку інфармацыя, бачная на вашым экране і даступная ў дадатках."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Згаджаюся"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Адмовіцца"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Выбраць галасавы ўвод"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"Дадатак-браўзер"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Браўзер"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Няма браўзера па змаўчанні"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Дадатак для выклікаў"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Праграма для званкоў"</string>
     <string name="default_app" msgid="6864503001385843060">"(Стандартная)"</string>
-    <string name="system_app" msgid="9068313769550747372">"(Сістэмныя)"</string>
+    <string name="system_app" msgid="9068313769550747372">"(Сістэмная)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Стандартныя сістэмныя)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Памяць дадаткаў"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Доступ да даных аб выкарыст."</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Сховішча праграм"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Доступ да гісторыі выкарыстання"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Адкрыць доступ да даных аб выкарыстанні"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Перавагі выкарыстання дадатку"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Доступ да даных аб выкарыстанні дазваляе дадатку адсочваць, якія іншыя дадаткі вы выкарыстоўваеце і як часта, а таксама атрымліваць даныя пра вашага аператара, моўныя налады і іншую інфармацыю."</string>
@@ -3083,16 +3331,24 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Аптымізацыя акумулятара"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Абвесткі аб выкарыстанні"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Паказваць усе праграмы"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Не паказваць дадатк. праграмы"</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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
     <string name="high_power_system" msgid="7362862974428225301">"Аптымізацыя акумулятара недаступна"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Не ўжываць аптымізацыю акумулятара. Акумулятар можа разраджацца хутчэй."</string>
-    <string name="high_power_prompt_title" msgid="4257734526819699048">"Ігнараваць аптымізацыю акумулятара?"</string>
-    <string name="high_power_prompt_body" msgid="4072587909486730876">"Пакінуць дадатак <xliff:g id="APP_NAME">%1$s</xliff:g> працаваць у фоне? Магчыма, будзе выкарыстоўвацца больш зараду акумулятара."</string>
-    <string name="battery_summary" msgid="101415762036784289">"<xliff:g id="PERCENTAGE">%1$d</xliff:g>%% выкарыстана з моманту апошняй поўнай зарадкі"</string>
+    <string name="high_power_prompt_title" msgid="6358673688590282655">"Дазволіць праграме заўсёды працаваць у фонавым рэжыме?"</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Калі вы дазволіце праграме <xliff:g id="APP_NAME">%1$s</xliff:g> заўсёды працаваць у фонавым рэжыме, час працы ад акумулятара можа паменшыцца. \n\nВы можаце змяніць гэта пазней у раздзеле \"Налады &gt; Праграмы і апавяшчэнні\"."</string>
+    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> выкарыстана з моманту апошняй поўнай зарадкі"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Кіраванне энергаспажываннем"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Зарад акумулятара не выкарыстоўваўся з моманту апошняй зарадкі"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Налады дадатку"</string>
@@ -3108,18 +3364,20 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Зараджаць гэту прыладу"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Толькі зарадзіць гэту прыладу"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Забяспечваць сілкаванне"</string>
-    <string name="usb_use_power_only_desc" msgid="4912352581010190141">"Забяспечваць сілкаванне іншай падключанай прылады"</string>
-    <!-- no translation found for usb_use_file_transfers (338076823500744605) -->
-    <skip />
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Зарадзіце падключаную прыладу. Гэта працуе толькі з прыладамі, якія падтрымліваюць USB-зарадку."</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Перадаваць файлы"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Перадача файлаў на іншую прыладу"</string>
-    <!-- no translation found for usb_use_photo_transfers (6743967116266105718) -->
-    <skip />
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Перадача фатаграфій (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Перадача фатаграфій або файлаў, калі МТР не падтрымліваецца (PTP)"</string>
-    <!-- no translation found for usb_use_MIDI (8405244560919283714) -->
-    <skip />
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Выкарыстоўваць прыладу ў якасці MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Выкарыстоўваць гэту прыладу ў якасці MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Выкарыстоўваць USB, каб"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Зарадка гэтай прылады"</string>
+    <string name="usb_summary_power_only" msgid="3629517713817003738">"Падача сілкавання"</string>
+    <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Перадача файлаў"</string>
+    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Перадача фота (PTP)"</string>
+    <string name="usb_summary_MIDI" msgid="5687906612187885908">"Выкарыстанне прылады ў якасці MIDI"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Фонавая праверка"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Поўны доступ у фоне"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"Выкарыстоўваць тэкст з экрана"</string>
@@ -3128,7 +3386,7 @@
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Дазволіць праграме-памочніку доступ да відарыса на экране"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Падсвечванне экрана"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"Падсвечваць краі экрана, калі праграма-памочнік атрымлівае доступ да тэксту на экране або на здымке экрана"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"Дадаткі-памочнікі могуць дапамагаць вам на аснове інфармацыі з экрана, які вы праглядаеце. Пэўныя дадаткі падтрымліваюць як службы запуску, так і службы галасавога ўводу, каб забяспечыць вам комплексную дапамогу."</string>
+    <string name="assist_footer" msgid="1982791172085896864">"Праграмы-памочнікі працуюць з інфармацыяй на экране. Для вашай зручнасці некаторыя з іх падтрымліваюць панэль запуску і галасавы ўвод."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Сяр. знач. выкарыстання памяці"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Максімальнае выкарыст. памяці"</string>
     <string name="memory_usage" msgid="1781358557214390033">"Выкарыстанне памяці"</string>
@@ -3142,12 +3400,12 @@
     <string name="total_memory" msgid="2017287600738630165">"Уся памяць"</string>
     <string name="average_used" msgid="5338339266517245782">"Сярэдняе значэнне (%)"</string>
     <string name="free_memory" msgid="4003936141603549746">"Свабодна"</string>
-    <string name="memory_usage_apps" msgid="5650192998273294098">"Выкарыстанне памяці дадаткамі"</string>
+    <string name="memory_usage_apps" msgid="5650192998273294098">"Выкарыстанне памяці праграмамі"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> дадатак выкарыстоўваў памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
-      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> дадаткі выкарыстоўвалі памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> дадаткаў выкарыстоўвалі памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> дадатку выкарыстоўвалі памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> праграма выкарыстоўвала памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> праграмы выкарыстоўвалі памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> праграм выкарыстоўвалі памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> праграм выкарыстоўвалі памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="6622624669948277693">"Частата"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"Максімальнае выкарыстанне"</string>
@@ -3163,37 +3421,24 @@
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Рэкамендавана для прадоўжвання працы акумулятара"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Дазволіць <xliff:g id="APP">%s</xliff:g> ігнараваць аптымізацыю акумулятара?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Няма"</string>
-    <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"Адключэнне доступу да даных аб выкарыстанні для гэтага дадатку не значыць, што ваш адміністратар не зможа адсочваць выкарыстанне даных дадаткамі ў вашым рабочым профілі."</string>
+    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Адключэнне доступу да даных аб выкарыстанні для гэтай праграмы не значыць, што ваш адміністратар не зможа адсочваць выкарыстанне трафіка праграмамі ў вашым працоўным профілі"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="COUNT_1">%2$d</xliff:g> сімвалаў выкарыстана"</string>
-    <!-- no translation found for draw_overlay_title (7524215631960029502) -->
-    <skip />
-    <!-- no translation found for draw_overlay (6564116025404257047) -->
-    <skip />
-    <!-- no translation found for system_alert_window_settings (8466613169103527868) -->
-    <skip />
+    <string name="draw_overlay" msgid="6564116025404257047">"Паказваць паверх іншых праграм"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"Паказваць паверх іншых праграм"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Праграмы"</string>
-    <!-- no translation found for system_alert_window_access_title (6297115362542361241) -->
-    <skip />
-    <!-- no translation found for permit_draw_overlay (7456536798718633432) -->
-    <skip />
-    <!-- no translation found for app_overlay_permission_preference (9039432222453006038) -->
-    <skip />
-    <!-- no translation found for allow_overlay_description (3879905262954599959) -->
-    <skip />
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Паказваць паверх іншых праграм"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"Дазволіць паказ паверх іншых праграм"</string>
+    <string name="app_overlay_permission_preference" msgid="9039432222453006038">"Дазвол на паказ праграмы паверх іншых"</string>
+    <string name="allow_overlay_description" msgid="8961670023925421358">"Дазволіць гэтай праграме паказвацца паверх іншых праграм, якія вы выкарыстоўваеце. Гэта можа перашкодзіць выкарыстанню гэтых праграм або змяніць спосаб, якім яны могуць паказвацца або працаваць."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr віртуальная рэальнасць сродак праслухоўвання стэрэа служба-памочнік"</string>
-    <!-- no translation found for keywords_system_alert_window (5049498015597864850) -->
-    <skip />
-    <!-- no translation found for overlay_settings (6930854109449524280) -->
-    <skip />
-    <!-- no translation found for system_alert_window_summary (602892301318324492) -->
-    <skip />
+    <string name="keywords_system_alert_window" msgid="5049498015597864850">"паказваць дыялог акна сістэмных абвестак паверх іншых праграм"</string>
+    <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>
-    <!-- no translation found for install_other_apps (6986686991775883017) -->
-    <skip />
-    <!-- no translation found for keywords_install_other_apps (761078076051006558) -->
-    <skip />
+    <string name="app_permission_summary_allowed" msgid="1505409933012886711">"Дазволена"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Забаронена"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Усталёўваць невядомыя праграмы"</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>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_0">%1$d</xliff:g> з <xliff:g id="COUNT_1">%2$d</xliff:g> дадаткаў могуць змяняць сістэмныя налады"</string>
@@ -3204,12 +3449,7 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Дазвол змены сістэмных налад для дадатку"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Дазволіць змяняць сістэмныя налады"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Гэта дазваляе дадатку змяняць сістэмныя налады."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Так"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Не"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Так"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Не"</string>
-    <!-- no translation found for external_source_switch_title (5581865736984836418) -->
-    <skip />
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Дазволіць з гэтай крыніцы"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Павярніце двойчы, каб адкрыць камеру"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Адкрыйце дадатак камеры, двойчы павярнуўшы сваё запясце"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Каб адкр. кам., двойчы кран. кнопку сіл."</string>
@@ -3231,42 +3471,41 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Аўторак, 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Аўторак, 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Аўторак, 18:03"</string>
-    <!-- no translation found for disconnected (4836600637485526329) -->
-    <skip />
+    <string name="disconnected" msgid="4836600637485526329">"Падключэння няма"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> трафіку выкарыстана"</string>
-    <plurals name="notification_summary" formatted="false" msgid="4019451362120557382">
-      <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 name="notification_summary" formatted="false" msgid="3941492005316143599">
+      <item quantity="one">Выключаны для <xliff:g id="COUNT">%d</xliff:g> праграмы</item>
+      <item quantity="few">Выключаны для <xliff:g id="COUNT">%d</xliff:g> праграм</item>
+      <item quantity="many">Выключаны для <xliff:g id="COUNT">%d</xliff:g> праграм</item>
+      <item quantity="other">Выключаны для <xliff:g id="COUNT">%d</xliff:g> праграмы</item>
     </plurals>
-    <string name="notification_summary_none" msgid="3440195312233351409">"Усе праграмы маюць дазвол на адпраўку"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"Уключаны для ўсіх праграм"</string>
     <string name="apps_summary" msgid="193158055537070092">"Усталявана праграм: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"Усталявана 24 праграмы"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> выкарыстана – <xliff:g id="FREE_SPACE">%2$s</xliff:g> свабодна"</string>
+    <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Унутранае сховішча: <xliff:g id="PERCENTAGE">%1$s</xliff:g> занята – <xliff:g id="FREE_SPACE">%2$s</xliff:g> свабодна"</string>
     <string name="display_summary" msgid="6737806235882127328">"Пераходзіць у рэжым сну пасля бяздзейнасці на працягу <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"Шпалеры, рэжым сну, памер шрыфту"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"Пераход у рэжым сну пасля бяздзейнасці на працягу 10 хвілін"</string>
     <string name="memory_summary" msgid="8080825904671961872">"У сярэднім <xliff:g id="USED_MEMORY">%1$s</xliff:g> з <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> памяці выкарыстана"</string>
-    <!-- no translation found for user_summary (2175367953972182552) -->
-    <skip />
+    <string name="users_and_accounts_summary" msgid="245282689646897882">"Бягучы карыстальнік: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="users_summary" msgid="1674864467098487328">"Вы ўвайшлі як <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> з\'яўляецца стандартнай праграмай"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"УКЛ. / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"ВЫКЛ."</string>
     <string name="backup_disabled" msgid="485189128759595412">"Рэзервовае капіраванне адключана"</string>
-    <!-- no translation found for about_summary (924181828102801010) -->
-    <skip />
+    <string name="about_summary" msgid="924181828102801010">"Абноўлена да версіі Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Дзеянне не дапускаецца"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Немагчыма змяніць гучнасць"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Выклікі забаронены"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Адпраўка SMS забаронена"</string>
     <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Выкарыстанне камеры забаронена"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Здымкі экрана забаронены"</string>
-    <string name="default_admin_support_msg" msgid="239311515653633217">"Гэта дзеянне адключана. Каб даведацца больш, звярніцеся да адміністратара вашай арганізацыі."</string>
+    <string name="default_admin_support_msg" msgid="2853684309779513863">"Гэта дзеянне адключана. Каб даведацца больш, звярніцеся да адміністратара вашай арганізацыі."</string>
     <string name="admin_support_more_info" msgid="8901377038510512654">"Дадатковая інфармацыя"</string>
-    <string name="admin_profile_owner_message" msgid="5834937282929663252">"Ваш адміністратар можа адсочваць праграмы і даныя, звязаныя з гэтым працоўным профілем, у тым ліку пра налады, дазволы, карпаратыўны доступ, сеткавую актыўнасць і месцазнаходжанне прылады, і кіраваць імі."</string>
-    <string name="admin_profile_owner_user_message" msgid="7153676784012255048">"Ваш адміністратар можа адсочваць праграмы і даныя, звязаныя з гэтым карыстальнікам, у тым ліку пра налады, дазволы, карпаратыўны доступ, сеткавую актыўнасць і месцазнаходжанне прылады, і кіраваць імі."</string>
-    <string name="admin_device_owner_message" msgid="8734500370023898028">"Ваш адміністратар можа адсочваць праграмы і даныя, звязаныя з гэтай прыладай, у тым ліку пра налады, дазволы, карпаратыўны доступ, сеткавую актыўнасць і месцазнаходжанне прылады, і кіраваць імі."</string>
+    <string name="admin_profile_owner_message" msgid="5860816886981109626">"У вашага адміністратара ёсць магчымасць маніторынгу і адміністравання праграм і даных, звязаных з вашым працоўным профілем, у тым ліку налад, дазволаў, карпаратыўнага доступу, сеткавай актыўнасці і геаданых."</string>
+    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"У вашага адміністратара ёсць магчымасць маніторынгу і адміністравання праграм і даных, звязаных з гэтым карыстальнікам, у тым ліку налад, дазволаў, карпаратыўнага доступу, сеткавай актыўнасці і геаданых."</string>
+    <string name="admin_device_owner_message" msgid="6232893638259790789">"У вашага адміністратара ёсць магчымасць маніторынгу і адміністравання праграм і даных, звязаных з гэтай прыладай, у тым ліку налад, дазволаў, карпаратыўнага доступу, сеткавай актыўнасці і геаданых."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"Выключыць"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"Уключыць"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"Паказаць"</string>
@@ -3294,23 +3533,26 @@
     <string name="color_temperature_toast" msgid="4974218172133854827">"Каб прымяніць змяненне колеру, адключыце экран"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Каб змены ў сродку адсочвання тэлефаніі былі прыменены, трэба перазагрузіць прыладу"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аўтаматычныя абнаўленні сістэмы"</string>
-    <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (патрабуецца перазагрузка)"</string>
     <string name="usage" msgid="2977875522080448986">"Выкарыстанне"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Выкарыстанне мабільнай перадачы даных"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Выкарыстанне мабільнага трафіку"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Выкарыстанне трафіку Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Выкарыстанне даных Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> мабільнага трафіка"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> мабільнага трафіку"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> трафіку Wi-Fi"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> трафіку Ethernet"</string>
     <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>
-    <!-- no translation found for network_restrictions_summary (4301618027244595839) -->
+    <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
+      <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="operator_warning" msgid="1862988028996859195">"Улік даных аператара можа адрознівацца ад уліку прылады"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> выкарыстана"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Папярэджваць аб выкар. даных"</string>
@@ -3327,13 +3569,13 @@
       <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>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Неабмежаваная перадача даных"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Не абмяжоўваць перадачу даных пры ўключанай Эканоміі трафіку"</string>
-    <string name="home_app" msgid="4066188520886810030">"Праграма Галоўнай старонкі"</string>
+    <string name="home_app" msgid="4066188520886810030">"Галоўная праграма"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Няма стандартнай Галоўнай старонкі"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Бяспечны запуск"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Патрабаваць узор для запуску прылады. У час, калі прылада адключана, на ёй нельга прымаць выклікі, паведамленні, апавяшчэнні і не працуе функцыя будзільніка."</string>
@@ -3347,7 +3589,7 @@
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Уключаць аўтаматычна пры ўзроўні зараду акумулятара %1$s"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Не выкарыстоўвае аптымізацыю акумулятара"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Калі прылада заблакіравана, не дазваляць набіраць адказы або іншы тэкст у апавяшчэннях"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"Станд. сродак праверкі правап."</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"Стандартная праверка правапісу"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Выбр.сродак праверкі правапісу"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Не выбрана"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(няма)"</string>
@@ -3379,7 +3621,13 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"няма"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Аб\'ект ранжыравання адсутнічае."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Аб\'ект ранжыравання не ўтрымлівае гэты сімвал."</string>
-    <string name="special_access" msgid="8275242424094109976">"Спецыяльны доступ"</string>
+    <string name="special_access" msgid="3458780842491881155">"Асобы доступ для праграм"</string>
+    <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> праграма можа выкарыстоўваць даныя без абмежаванняў</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> праграмы могуць выкарыстоўваць даныя без абмежаванняў</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> праграм могуць выкарыстоўваць даныя без абмежаванняў</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> праграмы могуць выкарыстоўваць даныя без абмежаванняў</item>
+    </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Вы сапраўды хочаце сцерці карыстальніцкія даныя і перайсці на шыфраванне файлаў?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Сцерці і перайсці..."</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Скінуць абмежаванне частаты ShortcutManager"</string>
@@ -3388,13 +3636,13 @@
     <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="developer_smallest_width" msgid="7516950434587313360">"Найменшая шырыня"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Запыты ад усталяваных праграм на прэміум SMS-доступ не паступалі"</string>
+    <string name="premium_sms_none" msgid="8268105565738040566">"Няма праграм з доступам да платных SMS"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"За прэміум SMS-доступ з вас можа спаганяцца аплата, гэта можа павялічыць вашыя рахункі за паслугі аператара. Калі вы ўключыце дазвол для праграмы, вы будзеце мець магчымасць адпраўляць прэміум SMS з гэтай праграмы."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Прэміум SMS-доступ"</string>
-    <!-- no translation found for bluetooth_disabled (2456198532288640046) -->
-    <skip />
+    <string name="premium_sms_access" msgid="4660047004791638305">"Доступ да платных SMS"</string>
+    <string name="bluetooth_disabled" msgid="2456198532288640046">"Не бачная для іншых прылад"</string>
+    <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Падключана да <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Падключана да некалькіх прылад"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Рэжым дэманстрацыі сістэмнага інтэрфейсу карыстальніка"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Пліткі хуткіх налад для распрацоўшчыкаў"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Мы радыя дапамагчы"</string>
@@ -3410,7 +3658,7 @@
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
     <string name="support_international_phone_title" msgid="1308334014138718455">"Падарожнічаеце за мяжу?"</string>
     <string name="support_international_phone_summary" msgid="208231793637026927">"Можа быць спагнана плата за міжнародны выклік"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Патэлефанаваць"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Тэлефон"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Чат"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Праверце парады і падказкі"</string>
     <string name="support_help_feedback_title" msgid="693440287222186718">"Пашукайце ў даведцы і адпраўце водгук"</string>
@@ -3458,29 +3706,55 @@
     <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_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip-камера"</string>
+    <!-- no translation found for double_tap_power_for_camera_suggestion_title (6500405261202883589) -->
+    <skip />
+    <!-- no translation found for double_tap_power_for_camera_suggestion_summary (7010153544554016996) -->
+    <skip />
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Змена камеры"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <!-- no translation found for double_twist_for_camera_suggestion_title (4689410222517954869) -->
+    <skip />
+    <!-- no translation found for double_twist_for_camera_suggestion_summary (447403641027147153) -->
+    <skip />
+    <!-- no translation found for double_twist_for_camera_suggestion_summary (1724660290703318739) -->
+    <skip />
+    <!-- no translation found for double_twist_for_camera_suggestion_summary (5980398380988039489) -->
+    <skip />
     <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_pickup_title" product="default" msgid="818688002837687268">"Падніміце тэлефон, каб праверыць яго"</string>
+    <!-- no translation found for ambient_display_summary (525662960806416373) -->
+    <skip />
+    <!-- no translation found for ambient_display_suggestion_summary (5987443721392571847) -->
+    <skip />
+    <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>
-    <!-- no translation found for fingerprint_swipe_for_notifications_title (5816346492253270243) -->
+    <!-- no translation found for ambient_display_pickup_summary (4567020486787561873) -->
+    <skip />
+    <!-- no translation found for ambient_display_pickup_summary (5435283849947236648) -->
+    <skip />
+    <!-- no translation found for ambient_display_pickup_summary (8256669101643381568) -->
     <skip />
+    <!-- no translation found for ambient_display_pickup_suggestion_summary (7014700589991761035) -->
+    <skip />
+    <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>
+    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_title (1677291167470357802) -->
+    <skip />
+    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_summary (127592803294414082) -->
+    <skip />
+    <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>
@@ -3491,19 +3765,20 @@
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Падключыцеся да інтэрнэту або звярніцеся да аператара"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Недаступна на прыладах, якія прац. толькі з адным аператарам"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"Усяго даступна: <xliff:g id="SIZE">%1$s</xliff:g>\n\nАпошні запуск <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="8502552575492048305">"Адкрываць спасылкі ў праграмах"</string>
-    <string name="web_action_enable_summary" msgid="4679844581193646863">"Адкрываць спасылкі ў праграмах, якія падтрымліваюцца, нават калі праграмы не ўсталяваны на вашай прыладзе"</string>
-    <string name="web_action_section_title" msgid="806405168097593614">"Праграмы не ўсталяваны"</string>
+    <string name="web_action_enable_title" msgid="4051513950976670853">"Імгненныя праграмы"</string>
+    <string name="web_action_enable_summary" msgid="3108127559723396382">"Адкрывайце спасылкі ў праграмах, нават калі яны не ўсталяваны"</string>
+    <string name="web_action_section_title" msgid="7364647086538399136">"Імгненныя праграмы"</string>
+    <string name="instant_apps_account" msgid="1433620209791992528">"Уліковы запіс імгненных праграм"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Усталяваныя праграмы"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Ваша сховішча зараз знаходзіцца пад кіраваннем менеджара сховішча"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Уліковыя запісы для <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"Наладзіць"</string>
-    <string name="auto_sync_account_title" msgid="7647106425106072285">"Аўтасiнхр. даных улік. запісу"</string>
-    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Аўтасінхр. дан. асаб. ул. зап."</string>
-    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Аўтасінхр. дан. прац. ул. зап."</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"Аўтаматычна сінхранізаваць даныя"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Аўтаматычна сінхранізаваць асабістыя даныя"</string>
+    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Аўтаматычна сінхранізаваць працоўныя даныя"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"Дазволіць праграмам абнаўляць даныя аўтаматычна"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Сінхранізацыя ўліковага запісу"</string>
-    <!-- no translation found for enterprise_privacy_settings (1177106810374146496) -->
-    <skip />
+    <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Інфармацыя пра прыладу пад кіраваннем"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Змяненні і налады знаходзяцца пад кіраваннем вашай арганізацыі"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Змяненні і налады знаходзяцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="enterprise_privacy_header" msgid="7402406406883832509">"Для забеспячэння доступу да вашых працоўных даных ваша арганізацыя можа змяніць налады і ўсталяваць пэўнае праграмнае забеспячэнне на вашу прыладу.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара сваёй арганізацыі."</string>
@@ -3512,42 +3787,42 @@
     <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"Ваш доступ да гэтай прылады"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Даныя, звязаныя з вашым працоўным уліковым запісам, такія як электронная пошта і каляндар"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Спіс праграм на вашай прыладзе"</string>
+    <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"Час і трафік, патрачаныя ў кожнай праграме"</string>
+    <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Самы апошні журнал сеткавага трафіка"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Апошняя справаздача пра памылку"</string>
+    <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Апошні журнал бяспекі"</string>
+    <string name="enterprise_privacy_none" msgid="7706621148858381189">"Няма"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Усталяваныя праграмы"</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"Колькасць праграм – прыблізная. Сюды могуць не ўваходзіць праграмы, усталяваныя не з Крамы Play."</string>
+    <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
+      <item quantity="one">Мінімум <xliff:g id="COUNT_1">%d</xliff:g> праграма</item>
+      <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="enterprise_privacy_location_access" msgid="4158197200885270634">"Доступ да геаданых"</string>
+    <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Дазволы мікрафона"</string>
+    <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Дазволы камеры"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Стандартныя праграмы"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
       <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="enterprise_privacy_number_packages_actionable" formatted="false" msgid="3351021029919034993">
-      <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="enterprise_privacy_usage_stats" msgid="6257434796480671245">"Час і даныя, патрачаныя ў кожнай праграме на вашай прыладзе"</string>
-    <string name="enterprise_privacy_network_logs" msgid="6594098950963377666">"Журналы сеткавага трафіку на вашай прыладзе"</string>
-    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Апошняя справаздача пра памылку"</string>
-    <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Апошні журнал бяспекі"</string>
-    <string name="enterprise_privacy_none" msgid="7706621148858381189">"Няма"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Усталяваныя праграмы"</string>
-    <!-- no translation found for enterprise_privacy_location_access (4158197200885270634) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_microphone_access (5717375623568864441) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_camera_access (4858146118537519375) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_enterprise_set_default_apps (3288495615791128724) -->
-    <skip />
     <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Стандартная клавіятура"</string>
     <string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"Усталявана на <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"Заўсёды ўключаны VPN уключаны"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Заўсёды ўключаны VPN уключаны ў вашым асабістым профілі"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Заўсёды ўключаны VPN уключаны ў вашым працоўным профілі"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Глабальны HTTP-проксі зададзены"</string>
-    <!-- no translation found for enterprise_privacy_ca_certs (5885892204903688909) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_number_ca_certs (9073641163359459048) -->
-    <!-- no translation found for enterprise_privacy_number_ca_certs_actionable (5823294380629654635) -->
+    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Давераныя ўліковыя даныя"</string>
+    <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
+      <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="enterprise_privacy_lock_device" msgid="8791656477097208540">"Адміністратар можа блакіраваць прыладу і скідваць пароль"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Адміністратар можа выдаляць усе даныя прылады"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"Няўдалыя спробы ўводу пароля перад выдаленнем усіх даных прылады"</string>
@@ -3562,32 +3837,59 @@
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Гэта прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Даведацца больш"</string>
+    <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
+      <item quantity="one">Праграмы \"Камера\"</item>
+      <item quantity="few">Праграмы \"Камера\"</item>
+      <item quantity="many">Праграмы \"Камера\"</item>
+      <item quantity="other">Праграмы \"Камера\"</item>
+    </plurals>
+    <string name="default_calendar_app_title" msgid="3545972964391065220">"Праграма \"Каляндар\""</string>
+    <string name="default_contacts_app_title" msgid="3497370557378660098">"Праграма \"Кантакты\""</string>
+    <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
+      <item quantity="one">Паштовыя кліенты</item>
+      <item quantity="few">Паштовыя кліенты</item>
+      <item quantity="many">Паштовыя кліенты</item>
+      <item quantity="other">Паштовыя кліенты</item>
+    </plurals>
+    <string name="default_map_app_title" msgid="7560143381633608567">"Праграма \"Карта\""</string>
+    <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
+      <item quantity="one">Праграмы \"Тэлефон\"</item>
+      <item quantity="few">Праграмы \"Тэлефон\"</item>
+      <item quantity="many">Праграмы \"Тэлефон\"</item>
+      <item quantity="other">Праграмы \"Тэлефон\"</item>
+    </plurals>
+    <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
+    <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"Фота і відэа"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"Музыка і аўдыя"</string>
     <string name="storage_games" msgid="7703159201697117621">"Гульні"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Іншыя праграмы"</string>
     <string name="storage_files" msgid="8581083146777364063">"Файлы"</string>
-    <!-- no translation found for storage_settings_2 (1939009096334525216) -->
-    <skip />
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Сховішча тэлефона"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <!-- no translation found for storage_volume_total (3499221850532701342) -->
-    <skip />
-    <string name="storage_percent_used" msgid="6741397129281819921">"<xliff:g id="PERCENT">%1$s</xliff:g> %%"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"Выкарыстана з <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"занята"</string>
+    <string name="clear_instant_app_data" msgid="2004222610585890909">"Ачысціць даныя праграмы"</string>
+    <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Хочаце выдаліць гэту імгненную праграму?"</string>
     <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>
-    <!-- no translation found for autofill_app (7338387238377914374) -->
-    <skip />
+    <string name="autofill_app" msgid="7338387238377914374">"Сэрвіс аўтазапаўнення"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"аўтаматычнае, запаўненне, аўтазапаўненне"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Зрабіць праграму <xliff:g id="APP_NAME_0">%1$s</xliff:g> вашай праграмай для аўтазапаўнення? <xliff:g id="APP_NAME_1">%1$s</xliff:g> зможа счытваць тое, што ў вас на экране, і запаўняць палі ў іншых праграмах."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Упэўніцеся, што давяраеце гэтай праграме&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Аўтазапаўненне Google&gt;%1$s&lt;/xliff:g&gt; выкарыстоўвае тое, што знаходзіцца на вашым экране, каб вызначыць, што можна запоўніць аўтаматычна."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тэма прылады"</string>
     <string name="default_theme" msgid="7085644992078579076">"Стандартная"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менеджар сховішча: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Выключаны"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Уключаны"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Імгненная праграма"</string>
-    <!-- no translation found for automatic_storage_manager_deactivation_warning (5605210730828410482) -->
+    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Выключыць менеджар сховішча?"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Праграмы для фільмаў і ТБ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Інфармацыя аператара"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Уключыць/выключыць забеспячэнне аператарам"</string>
+    <!-- no translation found for new_device_suggestion_title (8346563796032837800) -->
+    <skip />
+    <!-- no translation found for new_device_suggestion_summary (7172709269203435870) -->
     <skip />
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 297e34963e8e80dfd2881c941344c0960e80c32e..b47a8a1c7bc855b76375d4c53fdae7eef400e43b 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>
@@ -486,6 +476,6 @@
   <string-array name="automatic_storage_management_days">
     <item msgid="687318592238852312">"На повече от 30 дни"</item>
     <item msgid="2900554746706302178">"На повече от 60 дни"</item>
-    <item msgid="5692284879054004388">"На повече от 90 дни"</item>
+    <item msgid="5692284879054004388">"По-стари от 90 дни"</item>
   </string-array>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 968d6959dfa8ed32c7132e4d9c1f4a60b42e55e1..8e1385fb66298d767a2e6f5de2720dae70c4bdaa 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>
@@ -99,17 +101,24 @@
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Заключване на гласовото набиране"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Предотвратява употребата на набирането за Bluetooth при заключен екран"</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth устройства"</string>
-    <string name="bluetooth_device_name" msgid="8415828355207423800">"Име на устройство"</string>
+    <string name="bluetooth_device_name" msgid="8415828355207423800">"Име на устройството"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"Настройки на устройството"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"Настройки на потребителския профил"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Няма зададено име, използва се името на профила"</string>
     <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) -->
@@ -317,7 +329,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Веднага след спящ режим, освен когато екранът се поддържа отключен от <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> след спящ режим, освен когато екранът се поддържа отключен от <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"С информацията за собственика на заключения екран"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Закл. екран: Съобщ."</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Съобщ. на заключен екран"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Приспособления: Акт."</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Деактивирано от администратора"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Няма"</string>
@@ -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,43 +366,42 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"По-късно"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Пропуск. на настройването на отпечатък?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Избрахте да използвате отпечатъка си като един от начините за отключване на телефона си. Ако пропуснете сега, ще трябва да настроите по-късно. Настройването отнема около минута."</string>
     <string name="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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Регистрирането на отпечатък не бе успешно. Опитайте отново или използвайте друг пръст."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Добавяне на друг"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Напред"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Освен за отключване на телефона си можете да използвате отпечатъка си и за упълномощаване на покупки и достъп до приложения. "<annotation id="url">"Научете повече"</annotation></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">"Ако въведете неправилен ПИН код при този опит, служебният ви потребителски профил и свързаните с него данни ще бъдат премахнати от това устройство."</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="1688030823464420974">"Ако въведете неправилна фигура при следващия опит, данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ако въведете неправилен ПИН код при следващия опит, данните от това устройство ще бъдат изтрити."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Ако въведете неправилна парола при следващия опит, данните от това устройство ще бъдат изтрити."</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="5047439819181833824">"Твърде много неправилни опити. Данните от това устройство ще бъдат изтрити."</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">"Разширени настр. за 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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Автоматично включване на Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi ще се включва при наличие на висококачествени запазени мрежи, като например тази в дома ви"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Не е налице, защото сканирането за Wi‑Fi е изключено"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"За да използвате, изберете доставчик на услуги за оценка на мрежите"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Да се избягват лоши връзки"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Да не се използва Wi‑Fi мрежа, освен ако няма добра връзка с интернет"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Да се ползват само мрежи с добра връзка с интернет"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Свързване с отворените мрежи"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Автоматично свързване с висококачествени обществени мрежи"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"За да използвате, изберете доставчик на услуги за оценка на мрежите"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"За да използвате, изберете съвместим доставчик на услуги за оценка на мрежите"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталиране на сертификати"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"С цел подобряване на точността на местоположението системните приложения и услуги пак ще могат да сканират за 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"С цел подобряване на точността на местоположението включете сканирането за Wi-Fi от <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>съответните настройки<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Винаги вкл./по-интензивно използване на батерията"</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="6978257596231155345">"Показване на часа, иконите за известия и друга информация. По-интензивно използване на батерията."</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 +1320,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>
@@ -1292,16 +1340,21 @@
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"Вътрешното хранилище ще се нулира и всички данни ще бъдат изчистени"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google"</li>\n<li>"данни и настройки от системата и приложенията"</li>\n<li>"изтеглени приложения"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На това устройство има други потребители.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Снимки"</li>\n<li>"Други потребителски данни"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Операторите за електронната SIM карта"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Планът ви за мобилна услуга няма да бъде анулиран."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Изтриване на USB хранилището"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1452,7 +1497,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Промяна на PIN кода за отключване"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Начертайте фигура за отключване"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Натиснете „Меню“ за помощ"</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Вдигнете пръст, когато сте готови"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Вдигнете пръст, когато е готово"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Свържете поне <xliff:g id="NUMBER">%d</xliff:g> точки. Опитайте отново."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Фигурата е записана"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"За потвърждение начертайте фигурата отново"</string>
@@ -1491,6 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Екранни четци, дисплей, контроли за взаимодействие"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Настройки при зрителни проблеми"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Можете да персонализирате устройството така, че да отговаря на нуждите ви. Тези функции за достъпност могат да бъдат променени по-късно от „Настройки“."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Увеличаване на размера на шрифта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Екранни четци"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио и екранен текст"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"Телефонът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите проблема, можете да спрете приложението.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Таблетът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите проблема, можете да спрете приложението.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Устройството ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите проблема, можете да спрете приложението.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Телефонът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP_0">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите проблема, можете да спрете <xliff:g id="APP_1">%1$s</xliff:g>.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Таблетът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP_0">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите проблема, можете да спрете <xliff:g id="APP_1">%1$s</xliff:g>.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Устройството ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP_0">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите проблема, можете да спрете <xliff:g id="APP_1">%1$s</xliff:g>.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Спиране на приложението"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Да се спре ли приложението и използването му на заден план?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Телефонът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP_0">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите този проблем, можете да спрете приложението <xliff:g id="APP_1">%1$s</xliff:g> и да му попречите да се изпълнява на заден план."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Таблетът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP_0">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите този проблем, можете да спрете приложението <xliff:g id="APP_1">%1$s</xliff:g> и да му попречите да се изпълнява на заден план."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Устройството ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP_0">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите този проблем, можете да спрете приложението <xliff:g id="APP_1">%1$s</xliff:g> и да му попречите да се изпълнява на заден план."</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="7774807745601479888">"Телефонът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно изисква достъп до местоположението ви, когато не използвате приложението.\n\nЗа да решите проблема, можете да изключите местоположението за това приложение."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Таблетът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно изисква достъп до местоположението ви, когато не използвате приложението.\n\nЗа да решите проблема, можете да изключите местоположението за това приложение."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Устройството ви не е в състояние да управлява батерията нормално, защото <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 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Разбивка след последното пълно зареждане"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Последно пълно зареждане"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Данните за оставащия живот на батерията са приблизителни и могат да се променят въз основа на използването"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Данните за батерията са приблизителни и могат да се променят въз основа на използването"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"При активна употреба"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"При работа на заден план"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Използване на батерията"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има собствено работно пространство, което може да персонализира с приложения, тапет и др. Потребителите могат също да коригират настройки на устройството, които засягат всички – например Wi‑Fi.\n\nКогато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Когато добавите нов потребител, той трябва да настрои работното си пространство.\n\nВсеки потребител може да актуализира приложенията за всички останали потребители."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Настройване на потребителя?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Уверете се, че човекът е налице да вземе устройството и да настрои работното си пространство"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Уверете се, че човекът има възможност да вземе устройството и да настрои работното си пространство."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ще настроите ли потребителския профил сега?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Настройване сега"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сега"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"отключване чрез плъзгане, парола, фигура, ПИН код"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"служебно предизвикателство, работа, потребителски профил"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"служебен потребителски профил, управляван потребителски профил, обединение, обединяване, работа, потребителски профил"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"жест"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"жестове"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"плащане, докосване, плащания"</string>
     <string name="keywords_backup" msgid="470070289135403022">"резервно копие, създаване на резервно копие"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жест"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за Wi-Fi: Настр."</string>
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"За записване докоснете маркер..."</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Само от контакти със звезда"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Никакви"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будилници"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Будилниците са винаги с приоритет и издават звук"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напомняния"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Събития"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Всички обаждащи се"</string>
@@ -2955,7 +3044,7 @@
     <string name="device_feedback" msgid="3238056036766293294">"Отзиви за устройството"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Въведете администраторския ПИН код"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Включено"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Изключване"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"Изключено"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Фикс. на екрани"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Когато настройката е включена, можете да фиксирате текущия екран да се показва, докато не го освободите.\n\nЗа да използвате тази функция:\n\n1. Уверете се, че е включена.\n\n2. Отворете екрана, който искате да фиксирате.\n\n3. Докоснете „Общ преглед“.\n\n4. Прекарайте пръст нагоре и докоснете иконата за фиксиране."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Запитване за фигура за отключване преди освобождаване"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3305,7 +3406,7 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Отчетените от оператора данни може да се различават от показаните на устройството"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Използвали сте <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Предупр. за данните: Задаване"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Предупр. за данните: задаване"</string>
     <string name="data_warning" msgid="209133958008062117">"Предупреждение за данните"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Задаване на лимит за данните"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ограничение за данните"</string>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Помощен жест"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Чувствителност"</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="gesture_setting_on" msgid="3455094265233870280">"Вкл."</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Изкл."</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Програмата за зареждане на опер. с-ма вече е отключена"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Автоматично синхронизиране на данните от служебния профил"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Позволете на приложенията да опресняват автоматично данните"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Синхронизиране на профила"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Синхронизирането е включено за <xliff:g id="ID_1">%1$d</xliff:g> от <xliff:g id="ID_2">%2$d</xliff:g> елемента"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Синхронизирането е включено за всички елементи"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Синхронизирането е изключено за всички елементи"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Информация за управляваното устройство"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Промени и настройки, управлявани от организацията ви"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Промени и настройки, управлявани от <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Нови и вълнуващи неща"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Вижте водещите 5 функции"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Състояние на регистрацията за незабавни съобщения"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Регистрирано"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не е регистрирано"</string>
 </resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 677e7c2fd1bf353aaf9349d14eb59724462a160f..46f85025d9d9ca9077f517f1650bd3f37ec99fe0 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -69,7 +69,7 @@
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"স্ক্যান করা হচ্ছে…"</item>
     <item msgid="8513729475867537913">"সংযুক্ত হচ্ছে..."</item>
-    <item msgid="515055375277271756">"প্রমাণীকরণ হচ্ছে..."</item>
+    <item msgid="515055375277271756">"যাচাইকরণ হচ্ছে..."</item>
     <item msgid="1943354004029184381">"IP ঠিকানা প্রাপ্ত করা হচ্ছে..."</item>
     <item msgid="4221763391123233270">"সংযুক্ত হয়েছে"</item>
     <item msgid="624838831631122137">"স্থগিত করা হয়েছে"</item>
@@ -83,7 +83,7 @@
     <item msgid="7714855332363650812"></item>
     <item msgid="8878186979715711006">"স্ক্যান করা হচ্ছে…"</item>
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> এর সাথে সংযুক্ত হচ্ছে…"</item>
-    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> দিয়ে প্রমাণীকরণ করা হচ্ছে..."</item>
+    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> দিয়ে যাচাইকরণ করা হচ্ছে..."</item>
     <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> থেকে IP ঠিকানা জানা হচ্ছে…"</item>
     <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> তে সংযুক্ত হয়েছে"</item>
     <item msgid="1330262655415760617">"স্থগিত করা হয়েছে"</item>
@@ -122,7 +122,7 @@
     <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"পুশ বোতাম"</item>
-    <item msgid="1624323946324499595">"যুক্ত করা ডিভাইস থেকে পিন"</item>
+    <item msgid="1624323946324499595">"চেনা ডিভাইস থেকে পিন"</item>
     <item msgid="5366790421523328066">"এই ডিভাইস থেকে পিন"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
@@ -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>
@@ -235,14 +225,14 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"অভ্যন্তরীণ ডিভাইসের সঞ্চয়স্থান"</item>
+    <item msgid="8151497958991952759">"ইন্টারনাল ডিভাইসের স্টোরেজ"</item>
     <item msgid="3738430123799803530">"অপসারণযোগ্য SD কার্ড"</item>
     <item msgid="4498124044785815005">"সিস্টেমকে সিদ্ধান্ত নিতে দিন"</item>
   </string-array>
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"অবস্থান"</item>
     <item msgid="255608127647030286">"ব্যক্তিগত"</item>
-    <item msgid="4588829735729884491">"বার্তাপ্রেরণ"</item>
+    <item msgid="4588829735729884491">"মেসেজিং"</item>
     <item msgid="886742181977884584">"মাধ্যম"</item>
     <item msgid="7924928667052300589">"ডিভাইস"</item>
   </string-array>
@@ -250,7 +240,7 @@
     <item msgid="4979188868761515915">"অনির্দিষ্ট অবস্থান"</item>
     <item msgid="5789673140227507995">"সূক্ষ্ম অবস্থান"</item>
     <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"কম্পন"</item>
+    <item msgid="5387405117297558954">"ভাইব্রেট"</item>
     <item msgid="3434165993711230924">"পরিচিতিগুলি পড়ুন"</item>
     <item msgid="616161687718081936">"পরিচিতি পরিবর্তন করুন"</item>
     <item msgid="7638002295329050091">"কল লগ পড়ুন"</item>
@@ -297,7 +287,7 @@
     <item msgid="485564189219029300">"VPN সক্রিয় করুন"</item>
     <item msgid="7155384795265164395">"ওয়ালপেপারে লিখুন"</item>
     <item msgid="1835836196806147034">"পরিকাঠামোর সহায়তা"</item>
-    <item msgid="5989890403088155055">"স্ক্রীনশটে সহায়তা"</item>
+    <item msgid="5989890403088155055">"স্ক্রিনশটে সহায়তা"</item>
     <item msgid="8582699692765917557">"ফোনে্র অবস্থা পড়ুন"</item>
     <item msgid="1474039653814954902">"ভয়েসমেল যোগ করুন"</item>
     <item msgid="7222837656938871633">"SIP ব্যবহার করুন"</item>
@@ -317,7 +307,7 @@
     <item msgid="6602854600289714121">"অবস্থান"</item>
     <item msgid="8677040780775113033">"অবস্থান"</item>
     <item msgid="1660743989948992916">"অবস্থান"</item>
-    <item msgid="8791172739860195290">"কম্পন"</item>
+    <item msgid="8791172739860195290">"ভাইব্রেট"</item>
     <item msgid="383413555642128046">"পরিচিতিগুলি পড়ুন"</item>
     <item msgid="3654594895269697313">"পরিচিতি পরিবর্তন করুন"</item>
     <item msgid="7928393476362362538">"কল লগ পড়ুন"</item>
@@ -345,7 +335,7 @@
     <item msgid="3493046322001257041">"অডিও প্লে করুন"</item>
     <item msgid="136815868796597058">"ক্লিপবোর্ড পড়ুন"</item>
     <item msgid="5238692940326972503">"ক্লিপবোর্ড সংশোধন করুন"</item>
-    <item msgid="5753789168376302997">"মিডিয়া বোতাম"</item>
+    <item msgid="5753789168376302997">"মিডিয়া বোতামগুলি"</item>
     <item msgid="3265262911688671938">"অডিও ফোকাস"</item>
     <item msgid="2098976479485046797">"মাস্টার ভলিউম"</item>
     <item msgid="5660213838861789350">"ভয়েস ভলিউম"</item>
@@ -364,7 +354,7 @@
     <item msgid="2482631530338029480">"VPN সক্রিয় করুন"</item>
     <item msgid="1662979573471871926">"ওয়ালপেপারে লিখুন"</item>
     <item msgid="5964768335278263478">"পরিকাঠামোর সহায়তা"</item>
-    <item msgid="2657138701132782702">"স্ক্রীনশটে সহায়তা"</item>
+    <item msgid="2657138701132782702">"স্ক্রিনশটে সহায়তা"</item>
     <item msgid="8571369610363539266">"ফোনের অবস্থা পড়ুন"</item>
     <item msgid="4542463358215230845">"ভয়েসমেল যোগ করুন"</item>
     <item msgid="864565065016166003">"SIP ব্যবহার করুন"</item>
@@ -478,8 +468,8 @@
   <string-array name="color_picker">
     <item msgid="7631642672260600032">"টিল"</item>
     <item msgid="8332294763632946560">"নীল"</item>
-    <item msgid="2023216417616991392">"বেগুনি নীলবর্ণ"</item>
-    <item msgid="3170497246594232819">"বেগুনি"</item>
+    <item msgid="2023216417616991392">"বেগুনী নীলবর্ণ"</item>
+    <item msgid="3170497246594232819">"বেগুনী"</item>
     <item msgid="4608643045752965568">"গোলাপী"</item>
     <item msgid="6131821495505931173">"লাল"</item>
   </string-array>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 3986bc8f9b4d423ed0c9582c2fede4496251566f..ca8e495d1477ef70d992114578fba20d26c02079 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -25,11 +25,12 @@
     <string name="dlg_switch" msgid="6243971420240639064">"পাল্টান"</string>
     <string name="device_info_default" msgid="7847265875578739287">"অজানা"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
-      <item quantity="one">একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
-      <item quantity="other">একজন বিকাশকারী হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
+      <item quantity="one">একজন ডেভেলপার হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
+      <item quantity="other">একজন ডেভেলপার হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
     </plurals>
-    <string name="show_dev_on" msgid="1110711554982716293">"আপনি এখন একজন বিকাশকারী!"</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"কোনো প্রয়োজন নেই, আপনি ইতিমধ্যেই একজন বিকাশকারী।"</string>
+    <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>
@@ -72,12 +74,12 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USB সঞ্চয়স্থান আনমাউন্ট করুন"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USB স্টোরেজ আনমাউন্ট করুন"</string>
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD কার্ড আনমাউন্ট করুন"</string>
-    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB সঞ্চয়স্থান মুছে ফেলুন"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB স্টোরেজ মুছে ফেলুন"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD কার্ড মুছে ফেলুন"</string>
-    <string name="preview_pager_content_description" msgid="8926235999291761243">"পূর্বরূপ দেখুন"</string>
-    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"পূর্বরূপ, <xliff:g id="NUM_PAGES">%2$d</xliff:g>টির মধ্যে <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> নম্বর পৃষ্ঠা"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"প্রিভিউ"</string>
+    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"প্রিভিউ, <xliff:g id="NUM_PAGES">%2$d</xliff:g>টির মধ্যে <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> নম্বর পৃষ্ঠা"</string>
     <string name="font_size_summary" msgid="1690992332887488183">"স্ক্রীনের পাঠ্য ছোট বা বড় করুন।"</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"আরো ছোট করুন"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"আরো বড় করুন"</string>
@@ -86,9 +88,9 @@
     <string name="font_size_preview_text_headline" msgid="7955317408475392247">"নমুনা পাঠ্য"</string>
     <string name="font_size_preview_text_title" msgid="1310536233106975546">"দ্যা ওয়ান্ডারফুল উইজার্ড অফ অজ"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"অধ্যায় ১১: দ্যা ওয়ান্ডারফুল এমারল্ড সিটি অফ ওজ"</string>
-    <string name="font_size_preview_text_body" msgid="2846183528684496723">"চোখে সবুজ চশমা লাগানো থাকলেও, ডরোথি এবং তার বন্ধু বিস্ময়কর শহরের জাঁকজমক দেখে প্রথমে স্তম্ভিত হয়ে উঠেছিল৷ রাস্তায় সারিবদ্ধভাবে থাকা সুন্দর সুন্দর ঘর, তার সবগুলি সবুজ মার্বেল নির্মিত এবং সর্বত্র চমকদার পান্না দিয়ে খচিত৷ তারা সেই একই সবুজ মার্বেলের তৈরি একটি ফুটপাথ ধরে হেঁটে চলেছিল, যেখানে একটির সাথে আর একটি ব্লগ সারিবদ্ধ পান্না দিয়ে যুক্ত করে কঠিনভাবে সেট করা এবং তা সূর্যের আলোকে চকচক করছিল৷ জানালার ফলকগুলি সবুজ কাচের ছিল; শহরের আকাশে একটি সবুজ ছোপ দেখা যাচ্ছিল, এবং সূর্যের আলোও ছিল সবুজ রঙের৷ \n\nসেখানে অনেক পুরুষ, মহিলা এবং শিশুরা হাঁটা হাঁটি করছিল, সকলে সবুজ রঙের কাপড় পরেছিল, এবং তাদের ত্বকের রঙ ছিল সবুজাভ৷ তারা ডরোথির দিকে তাকিয়ে ছিল এবং বিস্মিত চোখে তার আশ্চর্যজনক নিশ্চিত সহায়ক দৃষ্টি দেখে শিশুদের সবাই পালিয়ে গেল এবং সিংহটিকে দেখার সাথে সাথে তারা তাদের মায়েদের পিছনে লুকিয়ে গেল; কিন্তু কেউ তাদেরকে কিছু বলল না৷ রাস্তার পাশে অনেক দোকান ছিল, ডরোথি দেখল সেখানে রাখা সবকিছুই সবুজ রঙের৷ সবুজ মিছরি এবং সবুজ ভুট্টার খই বিক্রির জন্য সাজানো ছিল, তার সাথে সবুজ জুতা, সবুজ টুপি এবং সব ধরনের সবুজ জামাকাপড়ও ছিল৷ একটা লোক এক জায়গায় দাঁড়িয়ে সবুজ সরবৎ বিক্রি করছিল, এবং যখন একটি শিশু সেটা কিনল, ডরোথি লক্ষ্য করল দামের অর্থ হিসাবে একটি সবুজ পেনি দিতে৷ \n\nদেখে মনে হচ্ছিল সেখানে কোনো ঘোড়া বা অন্য কোনো ধরনের প্রাণী নেই; পুরুষেরা ছোট সবুজ গাড়িতে করে ঠেলে ঠেলে কাছাকাছি জিনিসগুলি বয়ে নিয়ে যাচ্ছিল৷ সবাইকে খুব খুশি, সন্তুষ্ট এবং সমৃদ্ধ বলে মনে হচ্ছিল৷"</string>
+    <string name="font_size_preview_text_body" msgid="2846183528684496723">"চোখে সবুজ চশমা লাগানো থাকলেও, ডরোথি এবং তার বন্ধু বিস্ময়কর শহরের জাঁকজমক দেখে প্রথমে স্তম্ভিত হয়ে উঠেছিল৷ রাস্তায় সারিবদ্ধভাবে থাকা সুন্দর সুন্দর ঘর, তার সবগুলি সবুজ মার্বেল নির্মিত এবং সর্বত্র চমকদার পান্না দিয়ে খচিত৷ তারা সেই একই সবুজ মার্বেলের তৈরি একটি ফুটপাথ ধরে হেঁটে চলেছিল, যেখানে একটির সাথে আর একটি ব্লগ সারিবদ্ধ পান্না দিয়ে যুক্ত করে কঠিনভাবে সেট করা এবং তা সূর্যের আলোকে চকচক করছিল৷ জানালার ফলকগুলি সবুজ কাচের ছিল; শহরের আকাশে একটি সবুজ ছোপ দেখা যাচ্ছিল, এবং সূর্যের আলোও ছিল সবুজ রঙের৷ \n\nসেখানে অনেক পুরুষ, মহিলা এবং শিশুরা হাঁটা হাঁটি করছিল, সকলে সবুজ রঙের কাপড় পরেছিল, এবং তাদের ত্বকের রঙ ছিল সবুজাভ৷ তারা ডরোথির দিকে তাকিয়ে ছিল এবং বিস্মিত চোখে তার আশ্চর্যজনক নিশ্চিত সহায়ক দৃষ্টি দেখে শিশুদের সবাই পালিয়ে গেল এবং সিংহটিকে দেখার সাথে সাথে তারা তাদের মায়েদের পিছনে লুকিয়ে গেল; কিন্তু কেউ তাদেরকে কিছু বলল না৷ রাস্তার পাশে অনেক দোকান ছিল, ডরোথি দেখল সেখানে রাখা সবকিছুই সবুজ রঙের৷ সবুজ মিছরি এবং সবুজ ভুট্টার খই বিক্রির জন্য সাজানো ছিল, তার সাথে সবুজ জুতা, সবুজ টুপি এবং সব ধরনের সবুজ জামাকাপড়ও ছিল৷ একটা লোক এক জায়গায় দাঁড়িয়ে সবুজ সরবৎ বিক্রি করছিল, এবং যখন একটি শিশু সেটা কিনল, ডরোথি লক্ষ্য করল দামের অর্থ হিসেবে একটি সবুজ পেনি দিতে৷ \n\nদেখে মনে হচ্ছিল সেখানে কোনো ঘোড়া বা অন্য কোনো ধরনের প্রাণী নেই; পুরুষেরা ছোট সবুজ গাড়িতে করে ঠেলে ঠেলে কাছাকাছি জিনিসগুলি বয়ে নিয়ে যাচ্ছিল৷ সবাইকে খুব খুশি, সন্তুষ্ট এবং সমৃদ্ধ বলে মনে হচ্ছিল৷"</string>
     <string name="font_size_save" msgid="3450855718056759095">"ঠিক আছে"</string>
-    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB সঞ্চয়স্থান"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB স্টোরেজ"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD কার্ড"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ব্লুটুথ"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"কাছাকাছি সমস্ত ব্লুটুথ ডিভাইসে দৃশ্যমান (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
@@ -104,12 +106,19 @@
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"প্রোফাইল সেটিংস"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"কোনো নাম সেট করা নেই, অ্যাকাউন্ট নাম ব্যবহার করা হচ্ছে"</string>
     <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_rename_device" msgid="4352483834491958740">"এই ডিভাইসটির নাম বদলান"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"নাম বদলান"</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>
@@ -153,10 +162,13 @@
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> আপনার পরিচিতিগুলি এবং কলের ইতিহাস অ্যাক্সেস করতে চায়৷ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>কে অ্যাক্সেস করতে দেবেন?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"আবার জিজ্ঞাসা করবেন না"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"আবার জিজ্ঞাসা করবেন না"</string>
-    <string name="bluetooth_map_request" msgid="4595727689513143902">"বার্তা অ্যাক্সেসের অনুরোধ"</string>
+    <string name="bluetooth_map_request" msgid="4595727689513143902">"মেসেজ অ্যাক্সেসের অনুরোধ"</string>
     <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) -->
@@ -172,10 +184,10 @@
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"এর জন্য বাইপাস প্রক্সি"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"ডিফল্ট পুনরুদ্ধার করুন"</string>
     <string name="proxy_action_text" msgid="2957063145357903951">"সম্পন্ন হয়েছে"</string>
-    <string name="proxy_hostname_label" msgid="8490171412999373362">"প্রক্সি হোস্টনাম"</string>
+    <string name="proxy_hostname_label" msgid="8490171412999373362">"প্রক্সি হোস্টনেম"</string>
     <string name="proxy_error" msgid="8926675299638611451">"মনোযোগ"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ঠিক আছে"</string>
-    <string name="proxy_error_invalid_host" msgid="6865850167802455230">"আপনার টাইপ করা হোস্টনাম বৈধ নয়।The hostname you typed isn\'t valid."</string>
+    <string name="proxy_error_invalid_host" msgid="6865850167802455230">"আপনার টাইপ করা হোস্টনেম বৈধ নয়।"</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"আপনার টাইপ করা বাদ দেওয়ার তালিকা সঠিকভাবে ফরম্যাট করা নেই। বাদ দেওয়া ডোমেনগুলির একটি কমা চিহ্ন দ্বারা বিভাজিত তালিকা টাইপ করুন।"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"আপনাকে পোর্ট ফিল্ডটি সম্পূর্ণ করতে হবে।"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"যদি হোস্ট ফিল্ড খালি থাকে তাহলে পোর্ট ফিল্ড খালি থাকা আবশ্যক।"</string>
@@ -198,14 +210,14 @@
     <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"সিগন্যাল ক্ষমতা:"</string>
     <string name="radio_info_call_status_label" msgid="2611065018172747413">"ভয়েস কলের স্থিতি:"</string>
     <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"ডেটা পাঠানো হয়েছে:"</string>
-    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"বার্তা অপেক্ষ:"</string>
+    <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"মেসেজ অপেক্ষ:"</string>
     <string name="radio_info_phone_number_label" msgid="7942153178953255231">"ফোন নম্বর:"</string>
-    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"রেডিও ব্যান্ড নির্বাচন করুন"</string>
+    <string name="radio_info_band_mode_label" msgid="8730871744887454509">"রেডিও ব্যান্ড বেছে নিন"</string>
     <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"ভয়েস নেটওয়ার্কের প্রকার:"</string>
     <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"ডেটা নেটওয়ার্কের প্রকার:"</string>
     <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"পছন্দের নেটওয়ার্ক সেট করুন:"</string>
-    <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"হোস্টনামে(www.google.com) IPv4 পিংগ করুন:"</string>
-    <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"হোস্টনামে(www.google.com) IPv6 পিংগ করুন:"</string>
+    <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"হোস্টনামে(www.google.com) IPv4 পিং করুন:"</string>
+    <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"হোস্টনামে(www.google.com) IPv6 পিং করুন:"</string>
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"HTTP ক্লায়েন্ট পরীক্ষা:"</string>
     <string name="ping_test_label" msgid="579228584343892613">"পিং পরীক্ষা চালান"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
@@ -219,21 +231,21 @@
     <string name="band_mode_failed" msgid="1495968863884716379">"অসফল"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"সফল"</string>
     <string name="sdcard_changes_instructions" msgid="4482324130377280131">"USB কেবল আবার সংযোগ করা হলে পরিবর্তনগুলি কার্যকরী হবে।"</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB বিপুল সঞ্চয়স্থান সক্ষম করুন"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB বিপুল স্টোরেজ সক্রিয় করুন"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"মোট বাইট:"</string>
-    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB সঞ্চয়স্থান মাউন্ট করা নেই৷"</string>
+    <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB স্টোরেজ মাউন্ট করা নেই৷"</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"কোন SD কার্ড নেই।"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"উপলব্ধ বাইট:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB সঞ্চয়স্থান একটি বড় সঞ্চয়স্থান ডিভাইস হিসাবে ব্যবহার করা হচ্ছে।"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD সঞ্চয়স্থান একটি বড় সঞ্চয়স্থান ডিভাইস হিসাবে ব্যবহার করা হচ্ছে।"</string>
-    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="5128923500235719226">"এখন USB সঞ্চয়স্থান সরানো নিরাপদ।"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB স্টোরেজ একটি বড় স্টোরেজ ডিভাইস হিসাবে ব্যবহার করা হচ্ছে।"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD স্টোরেজ একটি বড় স্টোরেজ ডিভাইস হিসাবে ব্যবহার করা হচ্ছে।"</string>
+    <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="5128923500235719226">"এখন USB স্টোরেজ সরানো নিরাপদ।"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="666233604712540408">"SD কার্ড এখন সরানো নিরাপদ।"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"ব্যবহৃত হওয়ার সময়েই USB সঞ্চয়স্থান সরানো হয়েছে!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"ব্যবহৃত হওয়ার সময়েই USB স্টোরেজ সরানো হয়েছে!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"ব্যবহৃত হওয়ার সময়েই SD কার্ড সরানো হয়েছে!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"ব্যবহৃত বাইট:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"মিডিয়ার জন্য USB সঞ্চয়স্থান স্ক্যান করা হচ্ছে..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"মিডিয়ার জন্য USB স্টোরেজ স্ক্যান করা হচ্ছে..."</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"মিডিয়ার জন্য SD কার্ড স্ক্যান করা হচ্ছে..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB সঞ্চয়স্থান শুধুমাত্র পাঠযোগ্য অবস্থায় মাউন্ট করা।"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB স্টোরেজ শুধুমাত্র পাঠযোগ্য অবস্থায় মাউন্ট করা।"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD কার্ড শুধুমাত্র পাঠযোগ্য অবস্থায় মাউন্ট করা।"</string>
     <string name="skip_label" msgid="47510779345218297">"এড়িয়ে যান"</string>
     <string name="next_label" msgid="4693520878012668114">"পরবর্তী"</string>
@@ -259,13 +271,13 @@
     <string name="display_label" msgid="8074070940506840792">"স্ক্রীন"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"ট্যাবলেট তথ্য"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"ফোন তথ্য"</string>
-    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB সঞ্চয়স্থান"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB স্টোরেজ"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD কার্ড"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"প্রক্সি সেটিংস"</string>
     <string name="cancel" msgid="6859253417269739139">"বাতিল"</string>
     <string name="okay" msgid="1997666393121016642">"ঠিক আছে"</string>
     <string name="forget" msgid="1400428660472591263">"ভুলে যান"</string>
-    <string name="save" msgid="879993180139353333">"সংরক্ষণ করুন"</string>
+    <string name="save" msgid="879993180139353333">"সেভ করুন"</string>
     <string name="done" msgid="6942539184162713160">"সম্পন্ন"</string>
     <string name="settings_label" msgid="1626402585530130914">"সেটিংস"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"সেটিংস"</string>
@@ -285,7 +297,7 @@
     <string name="roaming_disable" msgid="1295279574370898378">"রোমিংয়ে থাকাকালীন ডেটা পরিষেবাগুলি সংযোগ করুন"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"আপনি আপনার হোম নেটওয়ার্ক থেকে ডেটা রোমিং বন্ধ করে দেওয়ার কারণে আপনি ডেটা সংযোগ হারিয়েছেন।"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"এটি চালু করুন"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"আপনাকে উল্লেখযোগ্য পরিমাণে চার্জ করা হতে পারে৷"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"আপনার ব্যালেন্স খরচ হতে পারে৷"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"যখন আপনি ডেটা রোমিংয়ের অনুমতি দেবেন, তখন আপনাকে রোমিং চার্জ ধার্য করা হতে পারে!\n\nএই সেটিংস এই ট্যাবলেটের সমস্ত ব্যবহারকারীর উপর প্রভাব ফেলবে।"</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"যখন আপনি ডেটা রোমিংয়ের অনুমতি দেবেন, তখন আপনাকে রোমিং চার্জ ধার্য করা হতে পারে!\n\nএই সেটিংস এই ফোনের সমস্ত ব্যবহারকারীর উপর প্রভাব ফেলবে।"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"ডেটা রোমিংয়ের অনুমতি দেবেন?"</string>
@@ -294,10 +306,10 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"তারিখ ও সময়"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"তারিখ এবং সময় সেট করুন"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"তারিখ, সময়, সময় অঞ্চল ও ফর্ম্যাট সেট করুন"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"স্বয়ংক্রিয় তারিখ ও সময়"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"অটোমেটিক তারিখ ও সময়"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"নেটওয়ার্ক প্রদত্ত সময় ব্যবহার করুন"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"নেটওয়ার্ক প্রদত্ত সময় ব্যবহার করুন"</string>
-    <string name="zone_auto" msgid="334783869352026648">"স্বয়ংক্রিয় সময় অঞ্চল"</string>
+    <string name="zone_auto" msgid="334783869352026648">"অটোমেটিক টাইম জোন"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"নেটওয়ার্ক প্রদত্ত অঞ্চলের সময় ব্যবহার করুন"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"নেটওয়ার্ক প্রদত্ত অঞ্চলের সময় ব্যবহার করুন"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"২৪-ঘণ্টা বিন্যাস"</string>
@@ -305,37 +317,37 @@
     <string name="date_time_set_time_title" msgid="6296795651349047016">"সময়"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"সময় সেট করুন"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"সময় অঞ্চল"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"সময় অঞ্চল নির্বাচন করুন"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"সময় অঞ্চল বেছে নিন"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"তারিখ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"তারিখ সেট করুন"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"বর্ণানুক্রমে সাজান"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"সময় অঞ্চলের অনুসারে সাজান"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"তারিখ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"সময়"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"স্বয়ংক্রিয় লক"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"অটোমেটিক লক"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> এর পর নিদ্রা মোডে নিয়ে যান"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"অবিলম্বে, শুধুমাত্র <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> দ্বারা আনলক করে রেখে দেওয়ার সময় ছাড়া, নিদ্রা মোডে যাওয়ার পরে"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"শুধুমাত্র <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> দ্বারা আনলক করে রেখে দেওয়ার সময় ছাড়া, নিদ্রা মোডে যাওয়ার <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> পরে"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"লক স্ক্রীনে মালিক তথ্য প্রদর্শন করুন"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"লক স্ক্রীনের বার্তা"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"লক স্ক্রিনে মালিকের তথ্য প্রদর্শন করুন"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"লক স্ক্রিনের মেসেজ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"উইজেটগুলি সক্ষম করুন"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"কোনো কিছুই নয়"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"যেমন, জো এর Android৷"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"যেমন, সুমনের Android"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ব্যবহারকারী তথ্য"</string>
-    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"লক স্ক্রীনে প্রোফাইল তথ্য প্রদর্শন করুন"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"লক স্ক্রিনে প্রোফাইলের তথ্য প্রদর্শন করুন"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"প্রোফাইল তথ্য"</string>
     <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="encryption_and_credential_settings_title" msgid="6514904533438791561">"এনক্রিপশান ও শংসাপত্র"</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>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"স্কিন লকের পছন্দগুলি"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রীন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রীন আনলক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রিন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল স্টোরেজ লক সেট করুন"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রিন আনলক, ক্রেডেনশিয়াল স্টোরেজ লক সেট করুন"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"গোপনীয়তা"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
     <string name="security_status_title" msgid="5848766673665944640">"নিরাপত্তা স্থিতি"</string>
@@ -354,40 +366,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"এটি পরে করুন"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"আঙ্গুলের ছাপ সেট আপ করা এড়িয়ে যাবেন?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"আপনি আপনার ফোন আনলক করার একটি উপায় হিসেবে আপনার আঙ্গুলের ছাপ ব্যবহারের ব্যবস্থাটিকে বেছে নিয়েছেন। আপনি যদি এখনই এটিকে এড়িয়ে যান, তাহলে আপনাকে পরে আবার এটি সেট আপ করতে হবে। সেট আপ করতে মাত্র এক মিনিট এর মত সময় লাগতে পারে।"</string>
     <string name="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>
@@ -408,12 +419,12 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ট্যাবলেট এনক্রিপ্ট করুন"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ফোন এনক্রিপ্ট করুন"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"এনক্রিপ্ট করা"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"আপনি আপনার অ্যাকাউন্ট, সেটিংস, ডাউনলোড করা অ্যাপ্লিকেশন ও সেগুলির ডেটা, মিডিয়া, এবং অন্যান্য ফাইলগুলি এনক্রিপ্ট করতে পারেন। আপনি একটি স্ক্রিন লক সেটআপ করেছেন (যেমন, একটি প্যাটার্ন বা সাংখ্যিক পিন বা পাসওয়ার্ড) তা ধরে নিয়ে, আপনার ট্যাবলেটটি এনক্রিপ্ট করার পরে, যখনই আপনি আপনার ট্যাবলেটের পাওয়ার চালু করবেন তখনই সেটিকে ডিক্রিপ্ট করার জন্য আপনাকে স্ক্রিনটিকে আনলক করতে হবে। ডিক্রিপ্ট করার অন্য একমাত্র উপায় হল ফ্যাক্টরি ডেটা আবার সেট করা, যা আপনার সমস্ত ডেটা মুছে দেবে।\n\nএনক্রিপ্ট করার জন্য এক ঘণ্টা বা তার বেশি সময় লাগতে পারে। আপনাকে অবশ্যই চার্জ রয়েছে এমন একটি ব্যাটারি দিয়ে কাজ শুরু করতে হবে এবং সম্পূর্ণ প্রক্রিয়া চলাকালীন আপনার ট্যাবলেটটিকে প্লাগ ইন করে রাখতে হবে। যদি আপনি এতে বাধা দেন, তাহলে আপনার সমস্ত বা কিছু ডেটা হারিয়ে যেতে পারে।"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"আপনি আপনার অ্যাকাউন্ট, সেটিংস, ডাউনলোড করা অ্যাপ্লিকেশন ও সেগুলির ডেটা, মিডিয়া, এবং অন্যান্য ফাইলগুলি এনক্রিপ্ট করতে পারেন। আপনি একটি স্ক্রিন লক সেট-আপ করেছেন (যেমন, একটি প্যাটার্ন বা সাংখ্যিক পিন বা পাসওয়ার্ড) তা ধরে নিয়ে, আপনার ফোন এনক্রিপ্ট করার পরে, যখনই আপনি আপনার ফোনের পাওয়ার চালু করবেন তখনই সেটিকে ডিক্রিপ্ট করার জন্য আপনাকে স্ক্রিনটিকে আনলক করতে হবে। ডিক্রিপ্ট করার অন্য একমাত্র উপায় হল ফ্যাক্টরি ডেটা আবার সেট করা যা আপনার সমস্ত ডেটা মুছে দেবে।\n\nএনক্রিপ্ট করার জন্য এক ঘণ্টা বা তার বেশি সময় লাগতে পারে। আপনাকে অবশ্যই চার্জ রয়েছে এমন একটি ব্যাটারি দিয়ে কাজ শুরু করতে হবে এবং সম্পূর্ণ প্রক্রিয়া চলাকালীন আপনার ফোনটিকে প্লাগ ইন করে রাখতে হবে। যদি আপনি এতে বাধা দেন, তাহলে আপনার সমস্ত বা কিছু ডেটা হারিয়ে যেতে পারে।"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"আপনি আপনার অ্যাকাউন্ট, সেটিংস, ডাউনলোড করা অ্যাপ্লিকেশন ও সেগুলির ডেটা, মিডিয়া এবং অন্যান্য ফাইলগুলি এনক্রিপ্ট করতে পারেন। আপনি একটি স্ক্রিন লক সেট-আপ করেছেন (যেমন, একটি প্যাটার্ন বা সাংখ্যিক পিন বা পাসওয়ার্ড) তা ধরে নিয়ে, আপনার ট্যাবলেটটি এনক্রিপ্ট করার পরে, যখনই আপনি আপনার ট্যাবলেটের পাওয়ার চালু করবেন তখনই সেটিকে ডিক্রিপ্ট করার জন্য আপনাকে স্ক্রিনটিকে আনলক করতে হবে। ডিক্রিপ্ট করার অন্য একমাত্র উপায় হল ফ্যাক্টরি ডেটা আবার সেট করা, যা আপনার সমস্ত ডেটা মুছে দেবে।\n\nএনক্রিপ্ট করার জন্য এক ঘণ্টা বা তার বেশি সময় লাগতে পারে। আপনাকে অবশ্যই চার্জ রয়েছে এমন একটি ব্যাটারি দিয়ে কাজ শুরু করতে হবে এবং সম্পূর্ণ প্রক্রিয়া চলাকালীন আপনার ট্যাবলেটটিকে প্লাগ-ইন করে রাখতে হবে। যদি আপনি এতে বাধা দেন, তাহলে আপনার সমস্ত বা কিছু ডেটা হারিয়ে যেতে পারে।"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"আপনি আপনার অ্যাকাউন্ট, সেটিংস, ডাউনলোড করা অ্যাপ্লিকেশন ও সেগুলির ডেটা, মিডিয়া এবং অন্যান্য ফাইলগুলি এনক্রিপ্ট করতে পারেন। আপনি একটি স্ক্রিন লক সেট-আপ করেছেন (যেমন, একটি প্যাটার্ন বা সাংখ্যিক পিন বা পাসওয়ার্ড) তা ধরে নিয়ে, আপনার ফোন এনক্রিপ্ট করার পরে, যখনই আপনি আপনার ফোনের পাওয়ার চালু করবেন তখনই সেটিকে ডিক্রিপ্ট করার জন্য আপনাকে স্ক্রিনটিকে আনলক করতে হবে। ডিক্রিপ্ট করার অন্য একমাত্র উপায় হল ফ্যাক্টরি ডেটা আবার সেট করা যা আপনার সমস্ত ডেটা মুছে দেবে।\n\nএনক্রিপ্ট করার জন্য এক ঘণ্টা বা তার বেশি সময় লাগতে পারে। আপনাকে অবশ্যই চার্জ রয়েছে এমন একটি ব্যাটারি দিয়ে কাজ শুরু করতে হবে এবং সম্পূর্ণ প্রক্রিয়া চলাকালীন আপনার ফোনটিকে প্লাগ-ইন করে রাখতে হবে। যদি আপনি এতে বাধা দেন, তাহলে আপনার সমস্ত বা কিছু ডেটা হারিয়ে যেতে পারে।"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"ট্যাবলেট এনক্রিপ্ট করুন"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ফোন এনক্রিপ্ট করুন"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"আপনার ব্যাটারি চার্জ করুন এবং আবার চেষ্টা করুন।"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"আপনার চার্জার প্লাগ ইন করুন এবং আবার চেষ্টা করুন।"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"আপনার চার্জার প্লাগ-ইন করুন এবং আবার চেষ্টা করুন।"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"কোনও লক স্ক্রিন পিন বা পাসওয়ার্ড নেই"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"এনক্রিপশন শুরু করার আগে আপনাকে লক স্ক্রিন পিন বা পাসওয়ার্ড সেট করতে হবে।"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"এনক্রিপ্ট?"</string>
@@ -448,7 +459,9 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ট্যাবলেটটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রিন লক বেছে নিন৷"</string>
     <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="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>
@@ -472,8 +485,8 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"আঙ্গুলের ছাপ + পিন"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"আঙ্গুলের ছাপ + পাসওয়ার্ড"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"আঙ্গুলের ছাপ ছাড়াই চালিয়ে যান"</string>
-    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"আপনি আপনার আঙ্গুলের ছাপ ব্যবহার করে আপনার ফোন আনলক করতে পারবেন। নিরাপত্তার জন্য, এই বিকল্পটির একটি ব্যাক আপ স্ক্রীন লকের প্রয়োজন।"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"প্রশাসক, এনক্রিপশন নীতি বা ক্রেডেনশিয়াল সঞ্চয়স্থান দ্বারা অক্ষম"</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"আপনি আপনার আঙুলের ছাপ ব্যবহার করে আপনার ফোন আনলক করতে পারবেন। নিরাপত্তার জন্য, এই বিকল্পটির একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"প্রশাসক, এনক্রিপশন নীতি বা ক্রেডেনশিয়াল স্টোরেজ দ্বারা অক্ষম"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"কোনো কিছুই নয়"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"সোয়াইপ করুন"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"প্যাটার্ন"</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="1688030823464420974">"পরের বারেও ভুল প্যাটার্ন আঁকলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"পরের বারও ভুল পিন লিখলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"পরের বারেও ভুল পাসওয়ার্ড দিলে এই ডিভাইসের ডেটা মুছে দেওয়া হবে"</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="5047439819181833824">"বহুবার ভুল ইনপুট দিয়েছেন। এই ডিভাইসের ডেটা মুছে দেওয়া হবে।"</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>
@@ -637,13 +666,13 @@
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"সংযুক্ত করুন"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ব্লুটুথ ডিভাইসে সংযোগ করুন"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"এই কাজে ব্যবহার করুন"</string>
-    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"আবার নামকরণ করুন"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"নাম বদলান"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"ইনকামিং ফাইল স্থানান্তরের অনুমতি দিন"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ইন্টারনেট অ্যাক্সেসের জন্য ডিভাইসে সংযুক্ত"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ডিভাইসের সাথে স্থানীয় ইন্টারনেট সংযোগ ভাগ করছে"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ডক সেটিংস"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"অডিওয়ের জন্য ডক ব্যবহার করুন"</string>
-    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"স্পিকার ফোন হিসাবে"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"স্পিকার ফোন হিসেবে"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"সঙ্গীত এবং মিডিয়ার জন্য"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"সেটিংস মনে রাখুন"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"কাস্ট করুন"</string>
@@ -669,18 +698,18 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC চালু করুন"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"অর্থপ্রদান টার্মিনাল, অ্যাক্সেস রিডারগুলির এবং ইন্টারঅ্যাক্টিভ বিজ্ঞাপণ বা ট্যাগগুলির মত NFC এই ডিভাইস এবং আশেপাশে থাকা কোনো ডিভাইস বা টার্গেটগুলির মধ্যে ডেটা বিনিময় করে।"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android বীম"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC এর মাধ্যমে অ্যাপ্লিকেশান সামগ্রী প্রেরণ করতে প্রস্তুত"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC এর মাধ্যমে অ্যাপ্লিকেশন কন্টেন্ট পাঠাতে প্রস্তুত"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"বন্ধ করুন"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC বন্ধ থাকার কারণে অনুপলব্ধ"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android বীম"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"যখন এই বৈশিষ্ট্যটি চালু থাকে, তখন আপনি আরেকটি NFC-সক্ষম ডিভাইসের কাছে ডিভাইসগুলি ধরে সামগ্রী বীম করতে পারবেন। উদাহরণস্বরূপ, আপনি ওয়েব পৃষ্ঠা, YouTube ভিডিও, পরিচিতি এবং আরো অনেক কিছু বীম করতে পারবেন।\n\nশুধু ডিভাইসগুলিকে একসাথে আনুন (সাধারণতঃ পর পর) এবং তারপর আপনার স্ক্রীনে আলতো চাপুন। অ্যাপ্লিকেশানটি নির্ধারণ করবে কি বীম করা হবে।"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"যখন এই বৈশিষ্ট্যটি চালু থাকে, তখন আপনি আরও একটি NFC-সক্ষম ডিভাইসের কাছে ডিভাইসগুলি ধরে সামগ্রী বীম করতে পারবেন। উদাহরণস্বরূপ, আপনি ওয়েব পৃষ্ঠা, YouTube ভিডিও, পরিচিতি এবং আরও অনেক কিছু বীম করতে পারবেন।\n\nশুধু ডিভাইসগুলিকে একসাথে আনুন (সাধারণতঃ পর পর) এবং তারপর আপনার স্ক্রিনে আলতো চাপুন। অ্যাপ্লিকেশনটি নির্ধারণ করবে যে কি বীম করা হবে।"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"ওয়াই-ফাই"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ওয়াই-ফাই চালু করুন"</string>
     <string name="wifi_settings" msgid="29722149822540994">"ওয়াই-ফাই"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"ওয়াই-ফাই সেটিংস"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"ওয়াই-ফাই"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ওয়্যারলেস অ্যাক্সেস পয়েন্ট সেট আপ ও পরিচালনা করুন"</string>
-    <string name="wifi_select_network" msgid="4210954938345463209">"ওয়াই-ফাই নির্বাচন করুন"</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"ওয়াই-ফাই বেছে নিন"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"ওয়াই-ফাই চালু করা হচ্ছে..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"ওয়াই-ফাই বন্ধ করা হচ্ছে..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"ত্রুটি"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"স্বয়ংক্রিয়ভাবে ওয়াই ফাই চালু করুন"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"উচ্চ মানের সংরক্ষিত নেটওয়ার্কের কাছাকাছি এলেই ওয়াই ফাই আবার চালু হবে, যেমন আপনার বাড়ির নেটওয়ার্ক"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"অনুপলব্ধ কারণ ওয়াই-ফাই স্ক্যানিং বন্ধ আছে"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"এটি ব্যবহার করার জন্য একটি নেটওয়ার্ক রেটিং প্রদানকারী বেছে নিন"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"দুর্বল সংযোগগুলি এড়িয়ে চলুন"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ভালো ইন্টারনেট সংযোগ না হলে ওয়াই-ফাই ব্যবহার করবেন না"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"শুধুমাত্র ভাল ইন্টারনেট সংযোগ আছে এমন নেটওয়ার্ক ব্যবহার করুন"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"খোলা নেটওয়ার্কে সংযুক্ত হন"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"উচ্চ গুণমানের বিনামূল্যের নেটওয়ার্কগুলিতে স্বয়ংক্রিয়ভাবে সংযুক্ত হন"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"উচ্চ গুণমানের বিনামূল্যের নেটওয়ার্কগুলিতে অটোমেটিক সংযুক্ত হবে"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"এটি ব্যবহার করার জন্য একটি নেটওয়ার্ক রেটিং প্রদানকারী বেছে নিন"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"এটি ব্যবহার করার জন্য একটি উপযুক্ত নেটওয়ার্ক রেটিং প্রদানকারী বেছে নিন"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"শংসাপত্রগুলি ইনস্টল করুন"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"অবস্থানের যথার্থতা উন্নত করতে, সিস্টেম অ্যাপ্লিকেশান এবং পরিষেবাগুলি এখনও ওয়াই-ফাই নেটওয়ার্কগুলির জন্য স্ক্যান করতে পারে৷ আপনি এটিকে <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>স্ক্যানিং সেটিংস<xliff:g id="LINK_END_1">LINK_END</xliff:g> এর মধ্যে পরিবর্তন করতে পারেন।"</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"আরো নির্ভুলভাবে অবস্থান নির্ণয় করতে <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>স্ক্যানিং সেটিংসে<xliff:g id="LINK_END_1">LINK_END</xliff:g> ওয়াই ফাই স্ক্যানিং চালু করুন।"</string>
@@ -707,9 +739,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"ওয়াই-ফাই  অপ্টিমাইজেশান"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ওয়াই-ফাই চালু থাকাকালীন ব্যাটারি ব্যবহার কমান"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"ওয়াই-ফাই দ্বারা ব্যাটারি ব্যবহার সীমিত করুন"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"ওয়াই ফাই থেকে ইন্টারনেটের অ্যাক্সেস চলে গেলে মোবাইল ডেটা ব্যবহার করুন।"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"ওয়াই-ফাই থেকে ইন্টারনেটের অ্যাক্সেস চলে গেলে মোবাইল ডেটা ব্যবহার করুন।"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"স্বয়ংক্রিয়ভাবে মোবাইল ডেটাতে চলে যান"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"ওয়াই ফাই এ ইন্টারনেট অ্যাক্সেস না থাকলে মোবাইল ডেটা ব্যবহার করুন৷ ডেটা ব্যবহারের খরচ প্রযোজ্য।"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"ওয়াই-ফাই এ ইন্টারনেট অ্যাক্সেস না থাকলে মোবাইল ডেটা ব্যবহার করুন৷ ডেটা ব্যবহারের খরচ প্রযোজ্য।"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"নেটওয়ার্ক যোগ করুন"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"ওয়াই ফাই পছন্দগুলি"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"ওয়াই ফাই স্বয়ংক্রিয়ভাবে আবার চালু হয়"</string>
@@ -737,7 +769,7 @@
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"উন্নত বিকল্পগুলির ড্রপ-ডাউন তালিকা৷ প্রসারিত করতে দুবার আলতো চাপুন৷"</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"ওয়াই-ফাই সুরক্ষিত সেটআপ"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS আরম্ভ হচ্ছে…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"আপনার রাউটারে ওয়াই-ফাই সুরক্ষিত সেটআপ বোতাম টিপুন। এটিকে \"WPS\" বলা হতে পারে বা এই চিহ্ন দ্বারা চিহ্নিত থাকতে পারে:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"আপনার রাউটারে ওয়াই-ফাই সুরক্ষিত সেট-আপ বোতাম টিপুন। এটিকে \"WPS\" বলা হতে পারে বা এই চিহ্ন দ্বারা চিহ্নিত থাকতে পারে:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"আপনার ওয়াই-ফাই রাউটারে <xliff:g id="NUMBER">%1$s</xliff:g> পিন দিন। সেট-আপ সম্পূর্ণ হতে দুই মিনিটের মতো সময় নিতে পারে।"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS সফল হয়েছে। নেটওয়ার্কের সাথে সংযুক্ত হচ্ছে..."</string>
     <string name="wifi_wps_connected" msgid="7153432445748931183">"ওয়াই-ফাই নেটওয়ার্ক <xliff:g id="NETWORK_NAME">%s</xliff:g> এর সাথে সংযুক্ত"</string>
@@ -745,11 +777,11 @@
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ব্যর্থ হয়েছে৷ দয়া করে কয়েক মিনিটের মধ্যে আবার চেষ্টা করুন৷"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"ওয়্যারলেস রাউটার নিরাপত্তা সেটিং (WEP) সমর্থিত নয়"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"ওয়্যারলেস রাউটার নিরাপত্তা সেটিং (TKIP) সমর্থিত নয়"</string>
-    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"প্রমাণীকরণ ব্যর্থ। অনুগ্রহ করে আবার চেষ্টা করুন।"</string>
+    <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"যাচাইকরণ ব্যর্থ। অনুগ্রহ করে আবার চেষ্টা করুন।"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"আরেকটি WPS অধিবেশন শনাক্ত হয়েছে। দয়া করে কয়েক মিনিটের মধ্যে আবার চেষ্টা করুন।"</string>
     <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"ওয়াই-ফাই সংযোগ বিচ্ছিন্ন হয়েছে। WPS এর সেট-আপ বাতিল হয়ে গেছে।"</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"নেটওয়ার্ক নাম"</string>
-    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID প্রবেশ করুন"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID লিখুন"</string>
     <string name="wifi_security" msgid="6603611185592956936">"নিরাপত্তা"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"সিগন্যাল ক্ষমতা"</string>
     <string name="wifi_status" msgid="4824568012414605414">"স্থিতি"</string>
@@ -759,26 +791,27 @@
     <string name="passpoint_label" msgid="6381371313076009926">"এর মাধ্যমে সংরক্ষিত"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> শংসাপত্রগুলি"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP পদ্ধতি"</string>
-    <string name="please_select_phase2" msgid="5231074529772044898">"ধাপ ২ প্রমাণীকরণ"</string>
-    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA শংসাপত্র"</string>
+    <string name="please_select_phase2" msgid="5231074529772044898">"ধাপ ২ যাচাইকরণ"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA সার্টিফিকেট"</string>
     <string name="wifi_eap_domain" msgid="8471124344218082064">"ডোমেন"</string>
-    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ব্যবহারকারীর শংসাপত্র"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ব্যবহারকারীর সার্টিফিকেট"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"পরিচয়"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"নামহীন পরিচয়"</string>
     <string name="wifi_password" msgid="5948219759936151048">"পাসওয়ার্ড"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"পাসওয়ার্ড দেখান"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ব্যান্ড নির্বাচন করুন"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"AP ব্যান্ড বেছে নিন"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"২.৪ GHz ব্যান্ড"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"৫ GHz ব্যান্ড"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP সেটিংস"</string>
     <string name="wifi_shared" msgid="844142443226926070">"অন্য ডিভাইস ব্যবহারকারীদের সাথে শেয়ার করুন"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(অপরিবর্তিত)"</string>
-    <string name="wifi_unspecified" msgid="4917316464723064807">"অনুগ্রহ করে নির্বাচন করুন"</string>
-    <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(একাধিক শংসাপত্র যোগ করা হয়েছে)"</string>
+    <string name="wifi_unspecified" msgid="4917316464723064807">"অনুগ্রহ করে বেছে নিন"</string>
+    <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(একাধিক সার্টিফিকেট যোগ করা হয়েছে)"</string>
     <string name="wifi_use_system_certs" msgid="5270879895056893783">"সিস্টেমের শংসাপত্রগুলি ব্যবহার করুন"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"প্রদান করবেন না"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"যাচাই করবেন না"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"কোনো শংসাপত্র নির্দিষ্ট করা নেই৷ আপনার সংযোগ ব্যক্তিগত করা হবে না৷"</string>
+    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"কোনও সার্টিফিকেট নির্দিষ্ট করা নেই৷ আপনার সংযোগ ব্যক্তিগত করা হবে না৷"</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"নেটওয়ার্কের নাম খুব বড়।"</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"একটি ডোমেন উল্লেখ করা আবশ্যক৷"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS উপলব্ধ"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS উপলব্ধ)"</string>
@@ -801,25 +834,24 @@
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"নেটওয়ার্কের সাথে সংযোগ করতে ব্যর্থ হয়েছে"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ভুলে যান"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"নেটওয়ার্ক ভুলে যেতে করতে ব্যর্থ হয়েছে"</string>
-    <string name="wifi_save" msgid="3331121567988522826">"সংরক্ষণ"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"সেভ করুন"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"নেটওয়ার্ক সংরক্ষণ করতে ব্যর্থ হয়েছে"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"বাতিল করুন"</string>
-    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"সংরক্ষিত নেটওয়ার্ক"</string>
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"সেভ করা নেটওয়ার্ক"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
       <item quantity="one">%dটি নেটওয়ার্ক</item>
       <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>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 অ্যাড্রেসগুলি"</string>
-    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"সংরক্ষিত নেটওয়ার্ক"</string>
+    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"সেভ করা নেটওয়ার্ক"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP সেটিংস"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"এই ব্যবহারকারীর জন্য ওয়াই-ফাই এর উন্নত সেটিংস উপলব্ধ নয়"</string>
-    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"সংরক্ষণ"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"সেভ করুন"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"বাতিল করুন"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"একটি বৈধ IP ঠিকানা টাইপ করুন।"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"একটি বৈধ গেটওয়ে ঠিকানা টাইপ করুন।"</string>
@@ -832,7 +864,7 @@
     <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"ওয়াই-ফাই ডাইরেক্ট"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ডিভাইস সংক্রান্ত তথ্য"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"এই সংযোগটি মনে রাখুন"</string>
-    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ডিভাইসগুলির জন্য অনুসন্ধান করুন"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ডিভাইসগুলির জন্য খুঁজুন"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"অনুসন্ধান করছে..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"ডিভাইস পুনঃনামকরণ করুন"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"পিয়ার ডিভাইসগুলি"</string>
@@ -847,9 +879,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,29 +935,30 @@
     <item msgid="2339246858001475047">"২"</item>
     <item msgid="6200207341126893791">"১"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ওয়াই-ফাই কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশী শক্তিশালী তার উপর নির্ভর করে আপনার ফোন ওয়াই-ফাই নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
+    <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="emergency_address_summary" msgid="306028701568728126">"আপনি যদি ওয়াই ফাই ব্যবহার করে ৯১১ এ কল করেন তাহলে জরুরি পরিষেবাগুলি  আপনার অবস্থান হিসেবে আপনার ঠিকানাকে ব্যবহার করে৷"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
-    <string name="sound_settings" msgid="5534671337768745343">"আওয়াজ"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"সাউন্ড"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ভলিউম"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"সঙ্গীত প্রভাব"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"রিং ভলিউম"</string>
-    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"নিঃশব্দ থাকাকালীন কম্পন"</string>
-    <string name="notification_sound_title" msgid="5137483249425507572">"ডিফল্ট বিজ্ঞপ্তি শব্দ"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"নিঃশব্দ থাকাকালীন ভাইব্রেট"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"ডিফল্ট বিজ্ঞপ্তির সাউন্ড"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"রিংটোন"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"বিজ্ঞপ্তি"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"বিজ্ঞপ্তির জন্য ইনকামিং কল ভলিউম ব্যবহার করুন"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"কর্মস্থলের প্রোফাইল সমর্থন করে না"</string>
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ডিফল্ট বিজ্ঞপ্তি শব্দ"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ডিফল্ট বিজ্ঞপ্তির সাউন্ড"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"মিডিয়া"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"সঙ্গীত এবং ভিডিওগুলির জন্য ভলিউম সেট করুন"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"অ্যালার্ম"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"সংযুক্ত ডকের জন্য অডিও সেটিংস"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ডায়াল প্যাড স্পর্শ টোন"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"আলতো চাপ দিলে শব্দ"</string>
-    <string name="lock_sounds_enable_title" msgid="450098505659399520">"স্ক্রিন লক শব্দ"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"আলতো চাপে কম্পন"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"স্ক্রিন লক করার সাউন্ড"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"আলতো চাপে ভাইব্রেট"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"অপ্রয়োজনীয় আওয়াজ বাতিলকরণ"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"সঙ্গীত, ভিডিও, গেম্স, ও অন্যান্য মিডিয়া"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"রিংটোন ও বিজ্ঞপ্তি"</string>
@@ -948,11 +989,12 @@
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ব্যক্তিগত প্রোফাইল অ্যাকাউন্টগুলি"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"কাজের অ্যাকাউন্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"ব্যক্তিগত অ্যাকাউন্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="1910951467596035063">"অনুসন্ধান করুন"</string>
+    <string name="search_settings" msgid="1910951467596035063">"খুঁজুন"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"অনুসন্ধান সেটিংস এবং ইতিহাস পরিচালনা করুন"</string>
     <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,24 +1021,23 @@
     <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"ব্যাটারির ব্যবহার বেড়ে যায়"</string>
     <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_text" msgid="1837277457033025056">"নাইট লাইট আপনার স্ক্রিনকে হলুদাভ বাদামি দেয়৷ এটি আপনাকে অস্পষ্ট আলোয় স্ক্রিনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং খুব সহজে ঘুমিয়ে পড়তে সহায়তা করে৷"</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>
@@ -1006,7 +1047,7 @@
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"ওয়ালপেপার পরিবর্তন করুন"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"আপনার স্ক্রীন ব্যক্তিগতকৃত করুন"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ওয়ালপেপার বেছে নিন"</string>
-    <string name="screensaver_settings_title" msgid="1770575686476851778">"স্ক্রীন সেভার"</string>
+    <string name="screensaver_settings_title" msgid="1770575686476851778">"স্ক্রিন সেভার"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"চার্জ অথবা ডক করার সময়"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"উভয় ক্ষেত্রেই"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"চার্জ করার সময়"</string>
@@ -1020,8 +1061,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="doze_summary" msgid="3846219936142814032">"যখন আপনি বিজ্ঞপ্তিগুলি পাবেন তখন স্ক্রীন জাগায়"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"অ্যাম্বিয়েন্ট ডিসপ্লে"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"সর্বদা চালু / ব্যাটারির ব্যবহার বেড়ে যায়"</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="6978257596231155345">"সময়, বিজ্ঞপ্তির আইকন ও অন্যান্য তথ্য দেখানো হবে। ব্যাটারির ব্যবহার বেড়ে যায়।"</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>
@@ -1065,11 +1112,11 @@
     <string name="device_info_settings" product="default" msgid="475872867864762157">"ফোন স্থিতি"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"সিস্টেম আপডেটগুলি"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Android সংস্করণ"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android ভার্সন"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android সুরক্ষার প্যাচ লেবেল"</string>
     <string name="model_info" msgid="1952009518045740889">"মডেল"</string>
     <string name="hardware_info" msgid="2605080746512527805">"মডেল ও হার্ডওয়্যার"</string>
-    <string name="hardware_revision" msgid="8893547686367095527">"হার্ডওয়্যার সংস্করণ"</string>
+    <string name="hardware_revision" msgid="8893547686367095527">"হার্ডওয়্যার ভার্সন"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"সরঞ্জাম ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"বেসব্যান্ড ভার্সন"</string>
     <string name="kernel_version" msgid="9192574954196167602">"কার্নেল ভার্সন"</string>
@@ -1080,16 +1127,16 @@
     <string name="device_status" msgid="607405385799807324">"স্থিতি"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"ব্যাটারি, নেটওয়ার্ক, এবং অন্যান্য তথ্যের স্থিতি"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"ফোন নম্বর, সিগন্যাল ইত্যাদি"</string>
-    <string name="storage_settings" msgid="4211799979832404953">"সঞ্চয়স্থান"</string>
-    <string name="storage_usb_settings" msgid="7293054033137078060">"সঞ্চয়স্থান"</string>
-    <string name="storage_settings_title" msgid="8746016738388094064">"সঞ্চয়স্থান সেটিংস"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB সঞ্চয়স্থান আনমাউন্ট করুন, উপলব্ধ সঞ্চয়স্থান দেখুন"</string>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD কার্ড আনমাউন্ট করুন, উপলব্ধ সঞ্চয়স্থান দেখুন"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"স্টোরেজ"</string>
+    <string name="storage_usb_settings" msgid="7293054033137078060">"স্টোরেজ"</string>
+    <string name="storage_settings_title" msgid="8746016738388094064">"স্টোরেজ সেটিংস"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB স্টোরেজ আনমাউন্ট করুন, উপলব্ধ স্টোরেজ দেখুন"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD কার্ড আনমাউন্ট করুন, উপলব্ধ স্টোরেজ দেখুন"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"আমার ফোন নম্বর"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="1007470446618081441">"PRL সংস্করণ"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL ভার্সন"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"মোবাইল নেটওয়ার্ক ধরণ"</string>
@@ -1105,12 +1152,12 @@
     <string name="status_unavailable" msgid="7862009036663793314">"অনুপলব্ধ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"আপ টাইম"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"জাগ্রত সময়"</string>
-    <string name="internal_memory" msgid="9129595691484260784">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
-    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB সঞ্চয়স্থান"</string>
+    <string name="internal_memory" msgid="9129595691484260784">"ইন্টারনাল স্টোরেজ"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB স্টোরেজ"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD কার্ড"</string>
     <string name="memory_available" msgid="5052397223077021181">"উপলব্ধ"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"উপলব্ধ (শুধুমাত্র পঠনযোগ্য)"</string>
-    <string name="memory_size" msgid="6629067715017232195">"মোট স্থান"</string>
+    <string name="memory_size" msgid="6629067715017232195">"মোট জায়গা"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"গণনা করা হচ্ছে..."</string>
     <string name="memory_apps_usage" msgid="5128673488173839077">"অ্যাপ্স এবং অ্যাপ ডেটা"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"মিডিয়া"</string>
@@ -1119,51 +1166,51 @@
     <string name="memory_music_usage" msgid="1363785144783011606">"অডিও (সঙ্গীত, রিংটোন, পডকাস্ট, ইত্যাদি)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"অন্যান্য ফাইলগুলি"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"ক্যাশে করা ডেটা"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"শেয়ার করা সঞ্চয়স্থান আনমাউন্ট করুন"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"শেয়ার করা স্টোরেজ আনমাউন্ট করুন"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD কার্ড আনমাউন্ট করুন"</string>
-    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"অভ্যন্তরীণ USB সঞ্চয়স্থান আনমাউন্ট করুন"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"ইন্টারনাল USB স্টোরেজ আনমাউন্ট করুন"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"আপনি যাতে SD কার্ড নিরাপদে সরাতে পারেন তাই তা আনমাউন্ট করুন"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"মাউন্ট করার জন্য USB সঞ্চয়স্থান ঢোকান"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"মাউন্ট করার জন্য USB স্টোরেজ ঢোকান"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"মাউন্ট করার জন্য একটি SD কার্ড ঢোকান"</string>
-    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB সঞ্চয়স্থান মাউন্ট করুন"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"USB স্টোরেজ মাউন্ট করুন"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD কার্ড মাউন্ট করুন"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
-    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB সঞ্চয়স্থান মুছে ফেলুন"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB স্টোরেজ মুছে ফেলুন"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD কার্ড মুছে ফেলুন"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"অভ্যন্তরীণ USB সঞ্চয়স্থানের সমস্ত ডেটা মুছে দেয়, যেমন সঙ্গীত বা ফটো"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD কার্ডের সমস্ত তথ্য মুছে দেয়, যেমন সঙ্গীত এবং ফটো"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"ক্যাশে করা ডেটা সাফ করবেন?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"এটি সব অ্যাপ্লিকেশানগুলি থেকে ক্যাশে করা ডেটা সাফ করে দেবে।"</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP অথবা PTP ফাংশন সক্রিয়"</string>
-    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB সঞ্চয়স্থান আনমাউন্ট করবেন?"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"USB স্টোরেজ আনমাউন্ট করবেন?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"SD কার্ড আনমাউন্ট করবেন?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"আপনি যদি USB সঞ্চয়স্থান আনমাউন্ট করেন তাহলে আপনার USB সঞ্চয়স্থান আবার মাউন্ট না করা পর্যন্ত আপনি যে অ্যাপ্লিকেশানগুলি ব্যবহার করছেন সেগুলি থেকে যাবে এবং অনুপলব্ধ হতে পারে।"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"আপনি যদি USB স্টোরেজ আনমাউন্ট করেন তাহলে আপনার USB স্টোরেজ আবার মাউন্ট না করা পর্যন্ত আপনি যে অ্যাপ্লিকেশনগুলি ব্যবহার করছেন সেগুলি বন্ধ হয়ে যাবে এবং অনুপলব্ধ হতে পারে।"</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"আপনি যদি SD কার্ড আনমাউন্ট করেন, তাহলে কিছু অ্যাপ্লিকেশান যেগুলি আপনি ব্যবহার করছেন সেগুলি থেমে যাবে এবং SD কার্ড আবার মাউন্ট না করা পর্যন্ত নাও উপলব্ধ হতে পারে।"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB সঞ্চয়স্থান আনমাউন্ট করা যায়নি। পরে আবার চেষ্টা করুন।"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB স্টোরেজ আনমাউন্ট করা যায়নি। পরে আবার চেষ্টা করুন।"</string>
     <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"SD কার্ড আনমাউন্ট করা যায়নি। পরে আবার চেষ্টা করুন।"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB স্টোরেজ আনমাউন্ট করা হবে।"</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD কার্ড আনমাউন্ট করা হবে।"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"আনমাউন্ট করা হচ্ছে"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"আনমাউন্ট করার কাজ চলছে"</string>
-    <string name="storage_low_title" msgid="1388569749716225155">"সঞ্চয়স্থান পূর্ণ হতে চলেছে"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"সিঙ্কের মতো কিছু সিস্টেম ফাংশনগুলি সঠিকভাবে কাজ নাও করতে পারে। অ্যাপ্লিকেশান ও মিডিয়া সামগ্রীর মতো আন পিন করা আইটেমগুলি মুছে ফেলার মাধ্যেমে স্থান মুক্ত করার চেষ্টা করুন।"</string>
-    <string name="storage_menu_rename" msgid="7141058657592615390">"আবার নামকরণ করুন"</string>
+    <string name="storage_low_title" msgid="1388569749716225155">"স্টোরেজ পূর্ণ হতে চলেছে"</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"সিঙ্কের মতো কিছু সিস্টেম কার্যকলাপগুলি সঠিকভাবে কাজ নাও করতে পারে। অ্যাপ ও মিডিয়া সামগ্রীর মতো আন পিন করা আইটেমগুলি মুছে ফেলার মাধ্যমে জায়গা মুক্ত করার চেষ্টা করুন।"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"নাম বদলান"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"মাউন্ট করা"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"বের করে নিন"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"ফর্ম্যাট করুন"</string>
-    <string name="storage_menu_format_public" msgid="7464714208010125682">"পোর্টেবল হিসাবে ফর্ম্যাট করুন"</string>
+    <string name="storage_menu_format_public" msgid="7464714208010125682">"পোর্টেবল হিসেবে ফর্ম্যাট করুন"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"অভ্যন্তরীণ হিসেবে ফর্ম্যাট করুন"</string>
     <string name="storage_menu_migrate" msgid="3969621494238154294">"ডেটা স্থানান্তরন"</string>
     <string name="storage_menu_forget" msgid="6305824238997983426">"ভুলে যান"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"সেট আপ করুন"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ঘুরে দেখুন"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"সঞ্চয়স্থান খালি করুন"</string>
-    <string name="storage_menu_manage" msgid="5914482953856430780">"সঞ্চয়স্থান পরিচালনা করুন"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"স্টোরেজ খালি করুন"</string>
+    <string name="storage_menu_manage" msgid="5914482953856430780">"স্টোরেজ পরিচালনা করুন"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB কম্পিউটার সংযোগ"</string>
-    <string name="usb_connection_category" msgid="7805945595165422882">"হিসাবে সংযুক্ত করুন"</string>
+    <string name="usb_connection_category" msgid="7805945595165422882">"হিসেবে সংযুক্ত করুন"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"মিডিয়া ডিভাইস (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows এ অথবা Android ফাইল স্থানান্তর ব্যবহার করে Mac এ মিডিয়া ফাইলগুলি স্থানান্তর করতে দেয় (www.android.com/filetransfer দেখুন)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ক্যামেরা (PTP)"</string>
@@ -1171,8 +1218,8 @@
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI সক্ষমিত অ্যাপ্লিকেশানগুলিকে আপনার কম্পিউটারে MIDI সফ্টওয়্যারের সঙ্গে USB এর সাথে কাজ করতে দেয়৷"</string>
     <string name="storage_other_users" msgid="808708845102611856">"অন্য ব্যবহারকারীরা"</string>
-    <string name="storage_internal_title" msgid="690771193137801021">"ডিভাইসের সঞ্চয়স্থান"</string>
-    <string name="storage_external_title" msgid="3433462910096848696">"পোর্টেবল সঞ্চয়স্থান"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"ডিভাইসের স্টোরেজ"</string>
+    <string name="storage_external_title" msgid="3433462910096848696">"পোর্টেবল স্টোরেজ"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="TOTAL">%2$s</xliff:g> এর মধ্যে <xliff:g id="USED">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="1303803057698959872">"<xliff:g id="TOTAL">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
@@ -1187,31 +1234,31 @@
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"<xliff:g id="NAME_0">^1</xliff:g> নিরাপদভাবে সরানো হয়েছে, তবে এখনও উপলব্ধ রয়েছে। \n\n<xliff:g id="NAME_1">^1</xliff:g> ব্যবহার করতে, আপনাকে প্রথমে এটি মাউন্ট করতে হবে।"</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"এই <xliff:g id="NAME_0">^1</xliff:g> ত্রুটিপূর্ণ রয়েছে। \n\n<xliff:g id="NAME_1">^1</xliff:g> ব্যবহার করতে, আপনাকে প্রথমে এটি সেট আপ করতে হবে।"</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"এই ডিভাইসটি <xliff:g id="NAME_0">^1</xliff:g> সমর্থন করে না। \n\nএই ডিভাইসের সাথে <xliff:g id="NAME_1">^1</xliff:g> ব্যবহার করতে, আপনাকে প্রথমে এটি সেট আপ করতে হবে।"</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"ফর্ম্যাট করার পর, আপনি অন্যান্য ডিভাইসগুলিতে এই <xliff:g id="NAME_0">^1</xliff:g> ব্যবহার করতে পারেন৷ \n\nএই <xliff:g id="NAME_1">^1</xliff:g> এর সমস্ত ডেটা মুছে ফেলা হবে৷ প্রথমে ব্যাক আপ নেওয়ার কথা বিবেচনা করুন৷ \n\n"<b>"ফটোগুলি এবং অন্য মিডিয়ার ব্যাক আপ নিন"</b>" \nআপনার মিডিয়া ফাইলগুলি এই ডিভাইসের বিকল্প সঞ্চয়স্থানে সরান অথবা একটি USB তার ব্যবহার করে তাদের একটি কম্পিউটারে স্থানান্তর করুন৷ \n\n"<b>"অ্যাপ্লিকেশানগুলির ব্যাক আপ নিন"</b>" \nএই <xliff:g id="NAME_6">^1</xliff:g> এ সঞ্চিত সমস্ত অ্যাপ্লিকেশানগুলি আনইনস্টল করা হবে এবং তাদের ডেটা মুছে ফেলা হবে৷ এই অ্যাপ্লিকেশানগুলি রাথার জন্য তাদের এই ডিভাইসের বিকল্প সঞ্চয়স্থানে সরিয়ে দিন৷"</string>
-    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"যখন আপনি <xliff:g id="NAME_0">^1</xliff:g> সরিয়ে দেবেন, তখন এতে সঞ্চিত অ্যাপ্লিকেশানগুলি কাজ করা বন্ধ করে দেবে, এবং এতে সঞ্চিত মিডিয়া ফাইলগুলি এটি আবার না ঢোকানো পর্যন্ত উপলব্ধ হবে না৷"</b>" \n\nএই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসে কাজ করার জন্য ফর্ম্যাট করা হয়েছে৷ অন্য কোন জায়গায় এটি কাজ করবে না৷"</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"<xliff:g id="NAME">^1</xliff:g> এর মধ্যে থাকা অ্যাপ্লিকেশান, ছবি বা ডেটা ব্যবহার করার জন্য, এটিকে পুনরায় ঢোকান। \n\nঅনুরূপভাবে, ডিভাইস উপলব্ধ না থাকলে আপনি এই সঞ্চয়স্থান মনে নেই বেছে নিতে পারেন। \n\nআপনি যদি মনে নেই বাছেন, তবে ডিভাইসের মধ্যে থাকা সমস্ত ডেটা চিরতরে হারিয়ে যাবে। \n\nআপনি পরে অ্যাপটিকে পুনরায় ইনস্টল করতে পারেন, তবে এই ডিভাইসটিতে যে ডেটা সঞ্চিত আছে তা হারিয়ে যাবে।"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ফর্ম্যাট করার পর, আপনি অন্যান্য ডিভাইসগুলিতে এই <xliff:g id="NAME_0">^1</xliff:g> ব্যবহার করতে পারেন৷ \n\nএর সমস্ত ডেটা <xliff:g id="NAME_1">^1</xliff:g> মুছে ফেলা হবে৷ প্রথমে ব্যাক-আপ নেওয়ার কথা বিবেচনা করুন৷ \n\n"<b>"ফটোগুলি ও অন্য মিডিয়ার ব্যাক-আপ নিন"</b>" \nআপনার মিডিয়া ফাইলগুলি এই ডিভাইসের বিকল্প স্টোরেজে সরান অথবা একটি USB তার ব্যবহার করে তাদের একটি কম্পিউটারে স্থানান্তর করুন৷ \n\n"<b>"অ্যাপগুলির ব্যাক-আপ নিন"</b>" \nএই <xliff:g id="NAME_6">^1</xliff:g> এ মজুত সমস্ত অ্যাপগুলি আনইনস্টল করা হবে এবং তাদের ডেটা মুছে ফেলা হবে৷ এই অ্যাপগুলি রাথার জন্য তাদের এই ডিভাইসের বিকল্প স্টোরেজে সরিয়ে দিন৷"</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"যখন আপনি <xliff:g id="NAME_0">^1</xliff:g> সরিয়ে দেবেন, তখন এতে সঞ্চিত অ্যাপ্লিকেশনগুলি কাজ করা বন্ধ করে দেবে, এবং এতে সঞ্চিত মিডিয়া ফাইলগুলি এটি আবার না ঢোকানো পর্যন্ত উপলব্ধ হবে না৷"</b>" \n\nএই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসে কাজ করার জন্য ফর্ম্যাট করা হয়েছে৷ অন্য কোনও জায়গায় এটি কাজ করবে না৷"</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"<xliff:g id="NAME">^1</xliff:g> এর মধ্যে থাকা অ্যাপ্লিকেশন, ছবি বা ডেটা ব্যবহার করার জন্য, এটিকে পুনরায় ঢোকান। \n\nঅনুরূপভাবে, ডিভাইস উপলব্ধ না থাকলে আপনি এই সঞ্চয়স্থান মনে নেই বেছে নিতে পারেন। \n\nআপনি যদি মনে নেই বাছেন, তবে ডিভাইসের মধ্যে থাকা সমস্ত ডেটা চিরতরে হারিয়ে যাবে। \n\nআপনি পরে অ্যাপটিকে পুনরায় ইনস্টল করতে পারেন, তবে এই ডিভাইসটিতে যে ডেটা সঞ্চিত আছে তা হারিয়ে যাবে।"</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ভুলতে চান?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"<xliff:g id="NAME">^1</xliff:g> -এ সঞ্চিত সমস্ত অ্যাপ্লিকেশান, ফটো, এবং ডেটা চিরতরে হারিয়ে যাবে।"</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"অ্যাপ্লিকেশানগুলি"</string>
-    <string name="storage_detail_images" msgid="6950678857740634769">"চিত্র"</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"<xliff:g id="NAME">^1</xliff:g> -এ সঞ্চিত সমস্ত অ্যাপ্লিকেশন, ফটো, এবং ডেটা চিরতরে হারিয়ে যাবে।"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"অ্যাপ"</string>
+    <string name="storage_detail_images" msgid="6950678857740634769">"ছবি"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"ভিডিও"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"অডিও"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"ক্যাশে করা ডেটা"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"অন্যান্য"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"সিস্টেম"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> এক্সপ্লোর করুন"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"অন্যগুলির মধ্যে, অ্যাপগুলির দ্বারা সংরক্ষিত শেয়ার করা ফাইল, ইন্টারনেট বা ব্লুটুথ থেকে ডাউনলোড করা ফাইল, Android ফাইল এবং এই ধরণের আরো অনেক কিছু অন্তর্ভুক্ত রয়েছে৷\n\n<xliff:g id="NAME">^1</xliff:g> এর দৃশ্যমান সামগ্রী দেখতে, \'ঘুরে দেখুন\' এ আলতো চাপুন৷"</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"অন্যগুলির মধ্যে, অ্যাপগুলির দ্বারা সংরক্ষিত শেয়ার করা ফাইল, ইন্টারনেট বা ব্লুটুথ থেকে ডাউনলোড করা ফাইল, Android ফাইল এবং এই ধরণের আরও অনেক কিছু অন্তর্ভুক্ত রয়েছে৷\n\n<xliff:g id="NAME">^1</xliff:g> এর দৃশ্যমান কন্টেন্ট দেখতে, \'ঘুরে দেখুন\' এ আলতো চাপুন৷"</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"সিস্টেমের মধ্যে Android ভার্সন <xliff:g id="VERSION">%s</xliff:g> চালানোর জন্য ফাইলগুলি সামিল থাকে"</string>
-    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ফটো, গান, অ্যাপ, বা অন্যান্য ডেটা সংরক্ষণ করতে <xliff:g id="SIZE">^2</xliff:g> সঞ্চয়স্থান ব্যবহার করে থাকতে পারেন। \n\nবিশদ বিবরণ জানতে <xliff:g id="USER_1">^1</xliff:g> হিসাবে প্রবেশ করুন।"</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ফটো, গান, অ্যাপ, বা অন্যান্য ডেটা সেভ করতে <xliff:g id="SIZE">^2</xliff:g> স্টোরেজ ব্যবহার করে থাকতে পারেন। \n\nবিশদ বিবরণ জানতে <xliff:g id="USER_1">^1</xliff:g> হিসাবে প্রবেশ করুন।"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"আপনার <xliff:g id="NAME">^1</xliff:g> সেট আপ করুন"</string>
-    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"পোর্টেবল সঞ্চয়স্থান হিসাবে ব্যবহার করুন"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"পোর্টেবল স্টোরেজ হিসাবে ব্যবহার করুন"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ডিভাইসগুলির মধ্যে ফটোগুলি ও অন্যান্য মিডিয়া সরানোর জন্য৷"</string>
-    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"অভ্যন্তরীণ সঞ্চয়স্থান হিসাবে ব্যবহার করুন"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ইন্টারনাল স্টোরেজ হিসাবে ব্যবহার করুন"</string>
     <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"শুধুমাত্র এই ডিভাইসটিতে অ্যাপ্লিকেশান এবং ফটোগুলি সহ কোনো কিছু সঞ্চয় করার জন্য৷ সেইগুলি ফর্ম্যাট করা প্রয়োজন যা এটিকে অন্য ডিভাইসগুলির সাথে কাজ করতে বাধা দেয়৷"</string>
-    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"অভ্যন্তরীণ সঞ্চয়স্থান হিসাবে ফর্ম্যাট করুন"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g> নিরাপদ করার জন্য এটি ফর্ম্যাট করা প্রযোজন হবে৷ \n\nফর্ম্যাট করার পরে এই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসটির মধ্যে কাজ করবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_2">^1</xliff:g> এ বর্তমানে সঞ্চিত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটাটি যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
-    <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"পোর্টেবল সঞ্চয়স্থান হিসাবে ফর্ম্যাট করুন"</string>
-    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> ফর্ম্যাট করার প্রযোজন হবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_1">^1</xliff:g> এ বর্তমানে সঞ্চিত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটাটি যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ইন্টারনাল স্টোরেজ হিসাবে ফর্ম্যাট করুন"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"<xliff:g id="NAME_0">^1</xliff:g> নিরাপদ করার জন্য এটি ফর্ম্যাট করা প্রযোজন হবে৷ \n\nফর্ম্যাট করার পরে এই <xliff:g id="NAME_1">^1</xliff:g> শুধুমাত্র এই ডিভাইসটির মধ্যে কাজ করবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_2">^1</xliff:g> এ বর্তমানে মজুত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটা যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক-আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
+    <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"পোর্টেবল স্টোরেজ হিসাবে ফর্ম্যাট করুন"</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> ফর্ম্যাট করার প্রযোজন হবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_1">^1</xliff:g> এ বর্তমানে মজুত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটা যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক-আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
     <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"মুছুন এবং ফর্ম্যাট করুন"</string>
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ফর্ম্যাট করা হচ্ছে…"</string>
     <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"ফর্ম্যাট করার সময় <xliff:g id="NAME">^1</xliff:g> সরাবেন না৷"</string>
@@ -1242,7 +1289,7 @@
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"প্রক্সি"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"পোর্ট"</string>
-    <string name="apn_user" msgid="455637547356117761">"ব্যবহারকারীর নাম"</string>
+    <string name="apn_user" msgid="455637547356117761">"ইউজারনেম"</string>
     <string name="apn_password" msgid="5412301994998250968">"পাসওয়ার্ড"</string>
     <string name="apn_server" msgid="2436185314756372858">"সার্ভার"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
@@ -1266,13 +1313,14 @@
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO মান"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN মুছে দিন"</string>
     <string name="menu_new" msgid="3014205883303921729">"নতুন APN"</string>
-    <string name="menu_save" msgid="8109345640668285399">"সংরক্ষণ"</string>
+    <string name="menu_save" msgid="8109345640668285399">"সেভ করুন"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"খারিজ করুন"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"নাম ফিল্ডটি খালি থাকতে পারে না।"</string>
     <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>
@@ -1291,17 +1339,22 @@
       <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g>টি অ্যাকাউন্ট রিসেট করা হবে</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"অভ্যন্তরীণ স্টোরেজ এবং সমস্ত ডেটা রিসেট করা হবে"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"এটি আপনার ট্যাবলেটের "<b>"অভ্যন্তরীণ সঞ্চয়স্থান"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশান ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশানগুলি"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"এটি আপনার ফোনের "<b>"অভ্যন্তরীণ সঞ্চয়স্থান"</b>" থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ: \n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশান ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশানগুলি"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"এটি আপনার ট্যাবলেটের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশন ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশনগুলি"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"এটি আপনার ফোনের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ্লিকেশন ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ্লিকেশনগুলি"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"আপনি বর্তমানে নিম্নলিখিত অ্যাকাউন্টে প্রবেশ করে আছেন:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"এই ডিভাইসে অন্যান্য ব্যবহারকারীরাও রয়েছেন৷\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"সঙ্গীত"</li>\n<li>"ফটো"</li>\n<li>"অন্যান্য ব্যবহারকারী ডেটা"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ই-সিম এ থাকা পরিষেবা প্রদানকারী"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"এতে আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"USB সঞ্চয়স্থানটিকে"</b>" মুছে দিতে হবে।"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"SD কার্ডটিকে"</b>" মুছে দিতে হবে।"</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB সঞ্চয়স্থান মুছে ফেলুন"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB স্টোরেজ মুছে ফেলুন"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1370,20 +1412,20 @@
     <string name="location_app_level_permissions" msgid="1825588230817081339">"অ্যাপ-স্তরের অনুমতিগুলি"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"সাম্প্রতিক অবস্থান অনুরোধগুলি"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"সম্প্রতি কোনো অ্যাপ্লিকেশান অবস্থানের অনুরোধ করেনি"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"অবস্থান পরিষেবাগুলি"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"লোকেশন পরিষেবা"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"উচ্চ ব্যাটারির ব্যবহার"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"কম ব্যাটারির ব্যবহার"</string>
     <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>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ব্লুটুথ স্ক্যানিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"যে কোনো সময়ে ব্লুটুথ ডিভাইসগুলিকে সনাক্ত করার জন্য সিস্টেম অ্যাপ্লিকেশান এবং পরিষেবাগুলিকে অনুমতি দিয়ে অবস্থান উন্নত করুন।"</string>
     <string name="location_network_based" msgid="9134175479520582215">"ওয়াই-ফাই ও মোবাইল নেটওয়ার্ক অবস্থান"</string>
-    <string name="location_neighborhood_level" msgid="5141318121229984788">"দ্রুত আপনার অবস্থান নির্ধারণ করতে অ্যাপ্লিকেশানগুলিকে Google অবস্থান পরিষেবা ব্যবহার করতে দিন। বেনামী অবস্থান ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"দ্রুত আপনার লোকেশন নির্ধারণ করতে অ্যাপগুলিকে Google লোকেশন পরিষেবা ব্যবহার করতে দিন। বেনামী লোকেশন ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ওয়াই-ফাই দ্বারা অবস্থান নির্ণয় করা হয়েছে"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS উপগ্রহ"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"আপনার অবস্থান উৎস সন্ধান করতে আপনার ট্যাবলেটের অ্যাপ্লিকেশানগুলিকে GPS ব্যবহার করতে দিন"</string>
@@ -1399,7 +1441,7 @@
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ট্যাবলেট সম্পর্কে"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ফোন সম্পর্কে"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"ইমিউলেট করা ডিভাইস সম্পর্কে"</string>
-    <string name="about_settings_summary" msgid="3371517697156165959">"আইনি তথ্য, স্থিতি, সফ্টওয়্যার সংস্করণ দেখুন"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"আইনি তথ্য, স্থিতি, সফ্টওয়্যার ভার্সন দেখুন"</string>
     <string name="legal_information" msgid="5769301644270604095">"আইনি তথ্য"</string>
     <string name="contributors_title" msgid="5917703088825286504">"প্রদায়কগণ"</string>
     <string name="manual" msgid="3025943393642974445">"ম্যানুয়াল"</string>
@@ -1410,10 +1452,10 @@
     <string name="terms_title" msgid="7697580845616764642">"চুক্তি এবং শর্তাবলী"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"সিস্টেম ওয়েবভিউ লাইসেন্স"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ওয়ালপেপারগুলি"</string>
-    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"উপগ্রহ চিত্র প্রদানকারী:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"উপগ্রহ ছবি প্রদানকারী:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"ম্যানুয়াল"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"ম্যানুয়াল লোড হওয়ার সময়ে একটি সমস্যা হয়েছে।"</string>
-    <string name="settings_license_activity_title" msgid="8525014571806471216">"তৃতীয় পক্ষের লাইসেন্স"</string>
+    <string name="settings_license_activity_title" msgid="8525014571806471216">"থার্ড-পার্টি লাইসেন্স"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"লাইসেন্সগুলি লোড হতে একটা সমস্যা হয়েছে।"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"লোড হচ্ছে..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"নিরাপত্তা তথ্য"</string>
@@ -1421,14 +1463,17 @@
     <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>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"পাসওয়ার্ডগুলি মিলছে না"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"পিন মিলছে না"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"আনলক নির্বাচন করুন"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"আনলক বেছে নিন"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"পাসওয়ার্ড সেট করা হয়েছে"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"পিন সেট করা হয়েছে"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"প্যাটার্ন সেট করা হয়েছে"</string>
@@ -1466,8 +1511,8 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"স্ক্রীন আনলক করতে প্যাটার্ন আঁকা আবশ্যক"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"প্যাটার্ন দৃশ্যমান করুন"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"প্রোফাইলের প্যাটার্ন দৃশ্যমান করুন"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"আলতো চাপে কম্পন"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"পাওয়ার বোতাম চটপট লক হয়"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"আলতো চাপে ভাইব্রেট"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"পাওয়ার বোতাম তৎক্ষণাৎ লক করে"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"শুধুমাত্র <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> দ্বারা আনলক করে রেখে দেওয়ার সময় ছাড়া"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"আনলক প্যাটার্ন সেট করুন"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"আনলক প্যাটার্ন পরিবর্তন করুন"</string>
@@ -1491,15 +1536,18 @@
     <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"আরো সেটিংস বিকল্প সক্ষম করুন"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"অ্যাপ্লিকেশান তথ্য"</string>
-    <string name="storage_label" msgid="8700867073480107253">"সঞ্চয়স্থান"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"অ্যাপের তথ্য"</string>
+    <string name="storage_label" msgid="8700867073480107253">"স্টোরেজ"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"ডিফল্ট দ্বারা খোলে"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ডিফল্ট"</string>
-    <string name="screen_compatibility_label" msgid="663250687205465394">"স্ক্রীন সামঞ্জস্যতা"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"স্ক্রিন সামঞ্জস্যতা"</string>
     <string name="permissions_label" msgid="2605296874922726203">"অনুমতিগুলি"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"ক্যাশে"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"ক্যাশে সাফ করুন"</string>
@@ -1513,9 +1561,9 @@
     <string name="force_stop" msgid="7435006169872876756">"জোর করে বন্ধ করুন"</string>
     <string name="total_size_label" msgid="1048676419552557254">"সর্বমোট"</string>
     <string name="application_size_label" msgid="7376689739076506885">"অ্যাপের মাপ"</string>
-    <string name="external_code_size_label" msgid="3459343140355961335">"USB সঞ্চয়স্থান অ্যাপ্লিকেশান"</string>
+    <string name="external_code_size_label" msgid="3459343140355961335">"USB স্টোরেজ অ্যাপ্লিকেশন"</string>
     <string name="data_size_label" msgid="6117971066063850416">"ব্যবহারকারীর ডেটা"</string>
-    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB সঞ্চয়স্থান ডেটা"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB স্টোরেজ ডেটা"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD কার্ড"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"আনইনস্টল"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"সকল ব্যবহারকারীদের জন্য আনইনস্টল করুন"</string>
@@ -1540,23 +1588,23 @@
     <string name="reset_app_preferences" msgid="1321050641018356925">"অ্যাপ্লিকেশানগুলির পছন্দ আবার সেট করুন"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"অ্যাপ্লিকেশানগুলির পছন্দ আবার সেট করবেন?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"এটি এইগুলির জন্য সমস্ত পছন্দ পরিবর্তন করবে:\n\n "<li>"অক্ষম করা অ্যাপ্লিকেশনগুলি"</li>\n" "<li>"অক্ষম করা অ্যাপ্লিকেশন বিজ্ঞপ্তিগুলি"</li>\n" "<li>"কার্যের জন্য ডিফল্ট অ্যাপ্লিকেশনগুলি"</li>\n" "<li>"অ্যাপ্লিকেশনগুলির জন্য ব্যাকগ্রাউন্ড ডেটা সীমাবদ্ধগুলি"</li>\n" "<li>"যে কোনও অনুমতি সীমাবদ্ধগুলি"</li>\n\n" আপনি কোনও অ্যাপ্লিকেশন ডেটা হারাবেন না।"</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"অ্যাপ্লিকেশানগুলি পুনরায় সেট করুন"</string>
-    <string name="manage_space_text" msgid="8852711522447794676">"স্থান পরিচালনা করুন"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"অ্যাপ্লিকেশনগুলি পুনরায় সেট করুন"</string>
+    <string name="manage_space_text" msgid="8852711522447794676">"জায়গা পরিচালনা করুন"</string>
     <string name="filter" msgid="2018011724373033887">"ফিল্টার"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ফিল্টার বিকল্পগুলি বেছে নিন"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"সমস্ত অ্যাপ"</string>
     <string name="filter_apps_disabled" msgid="5862632369555319938">"অক্ষম করা অ্যাপগুলি"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ডাউনলোড করা"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"চলমান"</string>
-    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB সঞ্চয়স্থান"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB স্টোরেজ"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"SD কার্ডে"</string>
     <string name="not_installed" msgid="2797554494953450291">"এই ব্যবহারকারীর জন্য ইনস্টল করা নেই"</string>
     <string name="installed" msgid="3070865169422600098">"ইনস্টল করা হয়েছে"</string>
     <string name="no_applications" msgid="7336588977497084921">"কোনো অ্যাপ্লিকেশান নেই"</string>
-    <string name="internal_storage" msgid="1584700623164275282">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
-    <string name="internal_storage_sentence" msgid="889098931914857143">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
-    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB সঞ্চয়স্থান"</string>
-    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD কার্ড সঞ্চয়স্থান"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"ইন্টারনাল স্টোরেজ"</string>
+    <string name="internal_storage_sentence" msgid="889098931914857143">"ইন্টারনাল স্টোরেজ"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB স্টোরেজ"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD কার্ড স্টোরেজ"</string>
     <string name="recompute_size" msgid="7722567982831691718">"আকার আবার গণনা করা হচ্ছে..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"অ্যাপ্লিকেশান ডেটা মুছবেন?"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"এই অ্যাপ্লিকেশানের সমস্ত ডেটা স্থায়ীভাবে মুছে যাবে। সমস্ত ফাইল, সেটিংস, অ্যাকাউন্ট, ডেটাবেস ইত্যাদি সবই।"</string>
@@ -1581,7 +1629,7 @@
     <string name="computing_size" msgid="1599186977475211186">"কম্পিউটিং..."</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"প্যাকেজের মাপ গণনা করা যায়নি"</string>
     <string name="empty_list_msg" msgid="3552095537348807772">"আপনার কোনো তৃতীয় পক্ষের অ্যাপ্লিকেশান ইনস্টল করা নেই।"</string>
-    <string name="version_text" msgid="9189073826278676425">"সংস্করণ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="version_text" msgid="9189073826278676425">"ভার্সন<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"সরান"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ট্যাবলেটে সরান"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ফোনে সরান"</string>
@@ -1589,7 +1637,7 @@
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD কার্ডে সরান"</string>
     <string name="moving" msgid="6431016143218876491">"সরানো হচ্ছে"</string>
     <string name="another_migration_already_in_progress" msgid="7817354268848365487">"আরেকটি স্থানান্তরনের কাজ আগে থেকেই চলছে৷"</string>
-    <string name="insufficient_storage" msgid="481763122991093080">"পর্যাপ্ত সঞ্চয়স্থান নেই।"</string>
+    <string name="insufficient_storage" msgid="481763122991093080">"পর্যাপ্ত স্টোরেজ নেই।"</string>
     <string name="does_not_exist" msgid="1501243985586067053">"অ্যাপ্লিকেশানটি বিদ্যমান নেই।"</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"অ্যাপ্লিকেশানটি অনুলিপি-সুরক্ষিত৷"</string>
     <string name="invalid_location" msgid="4354595459063675191">"ইনস্টল করা অবস্থান বৈধ নয়।"</string>
@@ -1599,7 +1647,7 @@
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"আপনি একটি অ্যাপ্লিকেশানকে জোর করে বন্ধ করলে, তা অস্বাভাবিক ব্যবহার করতে পারে।"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"অ্যাপ্লিকেশান সরানো যায়নি। <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <string name="app_install_location_title" msgid="2068975150026852168">"পছন্দের ইনস্টল স্থান"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"পছন্দের ইনস্টল লোকেশন"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"নতুন অ্যাপ্লিকেশানগুলির জন্য পছন্দসই ইনস্টলেশানের অবস্থান পরিবর্তন করুন"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"বিল্ট-ইন অ্যাপ্লিকেশান অক্ষম করবেন?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"অ্যাপ্লিকেশান অক্ষম করুন"</string>
@@ -1609,15 +1657,15 @@
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"বিজ্ঞপ্তিগুলি বন্ধ করবেন?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"আপনি যদি এই অ্যাপ্লিকেশানের জন্য বিজ্ঞপ্তিগুলিকে বন্ধ করনে তাহলে আপনি গুরুত্বপূর্ণ সতর্কতা এবং আপডেটগুলি নাও পেতে পারেন৷"</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"স্টোর"</string>
-    <string name="app_install_details_title" msgid="6905279702654975207">"অ্যাপ্লিকেশানের বিশদ বিবরণ"</string>
+    <string name="app_install_details_title" msgid="6905279702654975207">"অ্যাপের বিশদ বিবরণ"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"অ্যাপটিকে <xliff:g id="APP_STORE">%1$s</xliff:g> থেকে ইনস্টল করা হয়েছে"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> সম্পর্কে আরও তথ্য"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"অ্যাপ্লিকেশান ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"চলমান"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(কখনো ব্যবহৃত হয়নি)"</string>
     <string name="no_default_apps" msgid="2915315663141025400">"কোনো ডিফল্ট অ্যাপ্লিকেশান নেই৷"</string>
-    <string name="storageuse_settings_title" msgid="5657014373502630403">"সঞ্চয়স্থান ব্যবহার"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"অ্যাপ্লিকেশান ব্যবহৃত সঞ্চয়স্থান দেখুন"</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"স্টোরেজ ব্যবহার"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"অ্যাপ্লিকেশন ব্যবহৃত স্টোরেজ দেখুন"</string>
     <string name="service_restarting" msgid="2242747937372354306">"পুনরায় আরম্ভ হচ্ছে"</string>
     <string name="cached" msgid="1059590879740175019">"ক্যাশে করা পশ্চাদপট প্রক্রিয়া"</string>
     <string name="no_running_services" msgid="2059536495597645347">"কিছুই চলছে না।"</string>
@@ -1638,7 +1686,7 @@
     <string name="running_processes_header_title" msgid="6588371727640789560">"ডিভাইস মেমরি"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"অ্যাপ্লিকেশানের RAM ব্যবহার"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"সিস্টেম"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"অ্যাপ্লিকেশানগুলি"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"অ্যাপ"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"খালি"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"ব্যবহৃত"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"ক্যাসে রাখা হয়েছে"</string>
@@ -1659,6 +1707,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>
@@ -1674,7 +1726,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\"।\" প্রবেশ করাতে দুইবার \'স্পেস\' কী টিপুন"</string>
     <string name="show_password" msgid="4837897357002495384">"পাসওয়ার্ড দেখুন"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"টাইপ করার সময় অক্ষরগুলি কয়েক মুহূর্তের জন্য দেখুন"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"এই বানান পরীক্ষকটি হয়তো পাসওয়ার্ড এবং ক্রেডিট কার্ড নম্বর সহ আপনার টাইপ করা সমস্ত পাঠ্য সংগ্রহ করতে সক্ষম হতে পারে। এটি <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> অ্যাপ্লিকেশানের। এই বানান পরীক্ষকটি ব্যবহার করবেন?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"এই বানান পরীক্ষকটি হয়তো পাসওয়ার্ড এবং ক্রেডিট কার্ড নম্বর সহ আপনার টাইপ করা সমস্ত টেক্সট সংগ্রহ করতে সক্ষম হতে পারে। এটি <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> অ্যাপ থেকে এসেছে। এই বানান পরীক্ষকটি ব্যবহার করবেন?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"সেটিংস"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ভাষা"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"কিবোর্ড এবং ইনপুট"</string>
@@ -1683,7 +1735,7 @@
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"কীবোর্ডগুলি পরিচালনা করুন"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"কীবোর্ড সহায়তা"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"ফিজিক্যাল কীবোর্ড"</string>
-    <string name="show_ime" msgid="2658582193437188227">"ভার্চুয়াল কীবোর্ড দেখান"</string>
+    <string name="show_ime" msgid="2658582193437188227">"ভার্চুয়াল কীবোর্ড দেখুন"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"ফিজিক্যাল কীবোর্ড সক্রিয় থাকার সময় এটিকে স্ক্রীনে রাখুন"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"কীবোর্ড শর্টকাট সাহায্যকারী"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"উপলব্ধ শর্টকাটগুলি দেখান"</string>
@@ -1713,7 +1765,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"শব্দ সম্পাদনা করুন"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"সম্পাদনা করুন"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"মুছুন"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"ব্যবহারকারীর অভিধানে আপনার কোনো শব্দ নেই। একটি শব্দ যোগ করতে যোগ করুন (+) বোতাম আলতো চাপুন।"</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"ব্যবহারকারীর অভিধানে আপনার কোনও শব্দ নেই। একটি শব্দ যোগ করতে যোগ (+) বোতাম আলতো চাপুন।"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"সব ভাষার জন্য"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"আরো ভাষা..."</string>
     <string name="testing" msgid="6584352735303604146">"পরীক্ষা করা হচ্ছে"</string>
@@ -1723,19 +1775,19 @@
     <string name="input_method" msgid="5434026103176856164">"ইনপুট পদ্ধতি"</string>
     <string name="current_input_method" msgid="2636466029213488159">"বর্তমান কীবোর্ড"</string>
     <string name="input_method_selector" msgid="4311213129681430709">"ইনপুট পদ্ধতি নির্বাচক"</string>
-    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"স্বয়ংক্রিয়"</string>
+    <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"অটোমেটিক"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"সবসময় দেখান"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"সর্বদা লুকান"</string>
     <string name="configure_input_method" msgid="1317429869771850228">"ইনপুট পদ্ধতিগুলি সেট আপ করুন"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"সেটিংস"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"সেটিংস"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> সেটিংস"</string>
-    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"সক্রিয় ইনপুট পদ্ধতিগুলি নির্বাচন করুন"</string>
+    <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"সক্রিয় ইনপুট পদ্ধতিগুলি বেছে নিন"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"অন-স্ক্রিন কীবোর্ড সেটিংস"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"ফিজিক্যাল কীবোর্ড"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"ফিজিক্যাল কীবোর্ড সেটিংস"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"গ্যাজেট চয়ন করুন"</string>
-    <string name="widget_picker_title" msgid="9130684134213467557">"উইজেট নির্বাচন করুন"</string>
+    <string name="widget_picker_title" msgid="9130684134213467557">"উইজেট বেছে নিন"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"উইজেট তৈরি করে ব্যবহারের অনুমতি দেবেন?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"উইজেট তৈরি করার পরে, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> যে ডেটাগুলি প্রদর্শন করে তা অ্যাক্সেস করতে পারবে।"</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"উইজেট তৈরি করতে এবং তাদের ডেটা অ্যাক্সেস করতে <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> কে সর্বদা অনুমতি দিন"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"স্ক্রিন রিডার, ডিসপ্লে, ইন্টারঅ্যাকশন নিয়ন্ত্রণগুলি"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"দৃষ্টিশক্তি সেটিংস"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"আপনি এই ডিভাইসটি নিজের পছন্দমত সেট করতে পারেন৷ এই অ্যাক্সেসযোগ্যতার বৈশিষ্ট্যগুলি পরে সেটিংসে গিয়ে পরিবর্তন করা যাবে৷"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ফন্ট বড় করুন"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"স্ক্রিন রিডার"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"অডিও এবং অন-স্ক্রিন পাঠ্য"</string>
     <string name="display_category_title" msgid="685461049938269166">"ডিসপ্লে"</string>
@@ -1769,18 +1822,18 @@
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"ক্যাপশান"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"বড় করে দেখা"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"তিনবার ট্যাপ করে বড় করে দেখুন"</string>
-    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"বোতাম দিয়ে ম্যাগনিফাই করুন"</string>
-    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"বোতাম এবং তিনবার ট্যাপ করার মাধ্যমে ম্যাগনিফাই করুন"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"বোতাম দিয়ে বড় করুন"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"বোতাম এবং তিনবার আলতো চাপার মাধ্যমে বড় করুন"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"স্ক্রিনে জুম বাড়ান"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"জুম করতে ৩ বার আলতো চাপ দিন"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"জুম করার জন্য বোতামে ট্যাপ করুন"</string>
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"জুম করার জন্য"</b>" স্ক্রিনে ৩ বার দ্রুত ট্যাপ করুন।\n"<ul><li>"স্ক্রল করতে ২টি বা তার বেশি আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুমের সমন্বয়ের জন্য ২টি বা তার বেশি আঙ্গুল ব্যবহার করুন"</li></ul>\n\n<b>" অস্থায়ী জুমের জন্য"</b>" স্ক্রিনে দ্রুত ৩ বার ট্যাপ করুন এবং তৃতীয় বার ট্যাপ করার সময় আঙ্গুলটি দিয়ে টিপে ধরুন।\n"<ul><li>"স্ক্রিনের উপরে বিভিন্ন দিকে যাওয়ার জন্য আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুম কম করতে আঙ্গুল সরিয়ে নিন"</li></ul>\n\n"কিবোর্ডে অথবা নেভিগেশন বারে জুম করতে পারবেন না।"</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"যখন ম্যাগনিফিকেশন চালু থাকবে তখন দ্রুত ম্যাগনিফাই করতে স্ক্রিনের মাঝখানের অ্যাক্সেসযোগ্যতা বোতামটি ব্যবহার করুন। \n\n"<b>" জুমের জন্য"</b>", অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনো জায়গায় ট্যাপ করুন।\n"<ul><li>"স্ক্রল করতে ২টি বা তার বেশি আঙ্গুল টেনে নিয়ে যান"</li>\n<li>" জুমের সমন্বয়ের জন্য ২ বা তার বেশি আঙ্গুল ব্যবহার করুন "</li></ul>\n\n<b>" অস্থায়ীভাবে জুমের জন্য"</b>"অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনো জায়গায় স্পর্শ করে টিপে ধরুন।\n"<ul><li>"স্ক্রিনের উপরে বিভিন্ন দিকে যাওয়ার জন্য আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুম কম করতে আঙ্গুল সরিয়ে নিন"</li></ul>\n\n"কিবোর্ডে অথবা নেভিগেশন বারে জুম করতে পারবেন না।"</string>
-    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"অ্যাক্সেসযোগ্যতা বোতামটি <xliff:g id="SERVICE">%1$s</xliff:g> এর সাথে সেট করা আছে। ম্যগ্নিফিকেশন ব্যবহার করার জন্য অ্যাক্সেসযোগ্যতা বোতামটি স্পর্শ করে টিপে ধরুন, তারপর ম্যাগনিফিকেশন বেছে নিন।"</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"যখন ম্যাগনিফিকেশন চালু থাকবে তখন দ্রুত ম্যাগনিফাই করতে স্ক্রিনের মাঝখানের অ্যাক্সেসযোগ্যতা বোতামটি ব্যবহার করুন। \n\n"<b>"জুমের জন্য"</b>", অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনও জায়গায় ট্যাপ করুন।\n"<ul><li>"স্ক্রল করতে ২টি বা তার বেশি আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুমের সমন্বয়ের জন্য ২ বা তার বেশি আঙ্গুল ব্যবহার করুন "</li></ul>\n\n<b>"অস্থায়ীভাবে জুমের জন্য"</b>"অ্যাক্সেসযোগ্যতা বোতামটি ট্যাপ করুন, তারপর স্ক্রিনের যেকোনও জায়গায় স্পর্শ করে টিপে ধরুন।\n"<ul><li>"স্ক্রিনের উপরে বিভিন্ন দিকে যাওয়ার জন্য আঙ্গুল টেনে নিয়ে যান"</li>\n<li>"জুম কম করতে আঙ্গুল সরিয়ে নিন"</li></ul>\n\n"কিবোর্ডে অথবা নেভিগেশন বারে জুম করতে পারবেন না।"</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"অ্যাক্সেসযোগ্যতা বোতামটি <xliff:g id="SERVICE">%1$s</xliff:g> এর সাথে সেট করা আছে। ম্যাগনিফিকেশন ব্যবহার করার জন্য অ্যাক্সেসযোগ্যতা বোতামটি স্পর্শ করে টিপে ধরুন, তারপর ম্যাগনিফিকেশন বেছে নিন।"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"সহজ ব্যবহার শর্টকাট"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"শর্টকাট সার্ভিসগুলি"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"লক স্ক্রিন থেকে অনুমতি নিন"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"যখন শর্টকাটটি চালু থাকবে, কোনো অ্যাক্সেসযোগ্যতা বৈশিষ্ট্য চালু করতে আপনি উভয় ভলিউম বোতামকে ৩ সেকেন্ডের জন্য টিপে ধরতে পারেন।"</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"যখন শর্টকাটটি চালু থাকবে, কোনও অ্যাক্সেসযোগ্যতা বৈশিষ্ট্য চালু করতে আপনি উভয় ভলিউম বোতামকে ৩ সেকেন্ডের জন্য টিপে ধরতে পারেন।"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"উচ্চ কনট্রাস্ট যুক্ত পাঠ্য"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"স্ক্রীন বৃহত্তরীকরণ স্বতঃ আপডেট"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"অ্যাপ্লিকেশান ট্রানজিশনের উপর স্ক্রীন বৃহত্তরীকরণ আপডেট"</string>
@@ -1821,7 +1874,7 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"সেটিংস"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"চালু করুন"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"বন্ধ করুন"</string>
-    <string name="captioning_preview_title" msgid="1234015253497016890">"পূর্বরূপ"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"প্রিভিউ"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"মানক বিকল্পগুলি"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ভাষা"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"পাঠ্য আকার"</string>
@@ -1829,13 +1882,13 @@
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"কাস্টম বিকল্পগুলি"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"পশ্চাদপটের রঙ"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"পশ্চাদপট অস্পষ্টতা"</string>
-    <string name="captioning_window_color" msgid="6902052743419717394">"আখ্যান দেওয়ার উইন্ডোর রঙ"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"শিরোনাম দেওয়ার উইন্ডোর রঙ"</string>
     <string name="captioning_window_opacity" msgid="5041556024849862376">"ক্যাপশান দেওয়া উইন্ডোর অস্বচ্ছতা"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"পাঠ্যের রঙ"</string>
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"পাঠ্য অস্পষ্টতা"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"এজ রঙ"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"এজ প্রকার"</string>
-    <string name="captioning_typeface" msgid="1826169240566563259">"হরফ পরিবার"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"ফন্ট ফ্যামিলি"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"ক্যাপশান দেওয়া থাকলে এমন দেখায়"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ডিফল্ট"</string>
@@ -1873,6 +1926,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>
@@ -1882,12 +1939,12 @@
     <string name="print_feature_state_off" msgid="7294876968403966040">"বন্ধ করুন"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Add service"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"মুদ্রক যোগ করুন"</string>
-    <string name="print_menu_item_search" msgid="7025589328240514553">"অনুসন্ধান করুন"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"খুঁজুন"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"মুদ্রকগুলি অনুসন্ধান করা হচ্ছে"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"পরিষেবা অক্ষমিত"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"প্রিন্ট কাজগুলি"</string>
     <string name="print_print_job" msgid="7563741676053287211">"প্রিন্ট কাজ"</string>
-    <string name="print_restart" msgid="8373999687329384202">"পুনর্সূচনা"</string>
+    <string name="print_restart" msgid="8373999687329384202">"রিস্টার্ট করুন"</string>
     <string name="print_cancel" msgid="3621199386568672235">"বাতিল"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> প্রিন্ট করা হচ্ছে"</string>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> অ্যাপটি আপনার ফোনকে জাগিয়ে রাখছে, তাই আপনার ফোন স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> অ্যাপটি আপনার ট্যাবলেট জাগিয়ে রাখছে, তাই আপনার ট্যাবলেট স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> অ্যাপটি আপনার ডিভাইসটিকে জাগিয়ে রাখছে, তাই আপনার ডিভাইস স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> অ্যাপটি আপনার ফোনকে বারবার জাগিয়ে দিচ্ছে, তাই আপনার ফোন স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি <xliff:g id="APP_1">%1$s</xliff:g> অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> অ্যাপটি আপনার ট্যাবলেটকে বারবার জাগিয়ে দিচ্ছে, তাই আপনার ট্যাবলেট স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি <xliff:g id="APP_1">%1$s</xliff:g> অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> অ্যাপটি আপনার ডিভাইসটিকে বারবার জাগিয়ে দিচ্ছে, তাই আপনার ডিভাইসটি স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি <xliff:g id="APP_1">%1$s</xliff:g> অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"অ্যাপ বন্ধ করুন"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"পটভূমিতে ব্যবহার বন্ধ করে অ্যাপটি বন্ধ করবেন?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> অ্যাপটি আপনার ফোনকে বারবার জাগিয়ে দিচ্ছে, তাই আপনার ফোন স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি <xliff:g id="APP_1">%1$s</xliff:g> অ্যাপটি বন্ধ করতে পারেন, যাতে এটি পটভূমিতে আর না চলে।"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> অ্যাপটি আপনার ট্যাবলেটকে বারবার জাগিয়ে দিচ্ছে, তাই আপনার ট্যাবলেটটি স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি <xliff:g id="APP_1">%1$s</xliff:g> অ্যাপটি বন্ধ করতে পারেন, যাতে এটি পটভূমিতে আর না চলে।"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> অ্যাপটি আপনার ডিভাইসটিকে বারবার জাগিয়ে দিচ্ছে, তাই আপনার ডিভাইসটি স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি <xliff:g id="APP_1">%1$s</xliff:g> অ্যাপটি বন্ধ করতে পারেন, যাতে এটি পটভূমিতে আর না চলে।"</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="7774807745601479888">"আপনার ফোন স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না, কারণ আপনি যখন <xliff:g id="APP">%1$s</xliff:g> অ্যাপটি ব্যবহার করেন না, তখনও সেটি আপনার অবস্থান জানার জন্য অনুরোধ করতে থাকে।\n\nএই সমস্যার সমাধানের জন্য আপনি এই অ্যাপের জন্য অবস্থান বিকল্পটি বন্ধ করে দিতে পারেন।"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"আপনার ট্যাবলেট স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না, কারণ আপনি যখন <xliff:g id="APP">%1$s</xliff:g> অ্যাপটি ব্যবহার করেন না, তখনও সেটি আপনার অবস্থান জানার জন্য অনুরোধ করতে থাকে।\n\nএই সমস্যার সমাধানের জন্য আপনি এই অ্যাপের জন্য অবস্থান বিকল্পটি বন্ধ করে দিতে পারেন।"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"আপনার ডিভাইসটি স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না, কারণ আপনি যখন <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>
@@ -1950,10 +2030,10 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ফোন নিষ্ক্রিয়"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"বিবিধ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"নির্ধারিত থেকে বেশী"</string>
-    <string name="power_apps" msgid="2043554781293951327">"অ্যাপগুলি"</string>
+    <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>
@@ -1976,7 +2056,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"শক্তির নির্ণিত ব্যবহার"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"শক্তির নিরীক্ষিত ব্যবহার"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"জোর করে বন্ধ করুন"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"অ্যাপ্লিকেশান তথ্য"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"অ্যাপের তথ্য"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"অ্যাপ্লিকেশান সেটিংস"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"স্ক্রীন সেটিংস"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"ওয়াই-ফাই সেটিংস"</string>
@@ -1997,7 +2077,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"একটি ভিন্ন ব্লুটুথ ডিভাইসের সাথে সংযোগ করে দেখুন"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"অ্যাপ্লিকেশান দ্বারা ব্যবহৃত ব্যাটারি"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"অ্যাপ্লিকেশানটি বন্ধ করুন অথবা আনইনস্টল করুন"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ব্যাটারি সংরক্ষণ মোড নির্বাচন করুন"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ব্যাটারি সংরক্ষণ মোড বেছে নিন"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"অ্যাপ্লিকেশান ব্যাটারি ব্যবহার কমানোর জন্য সেটিংসের প্রস্তাব দিতে পারে"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ব্যবহারকারী দ্বারা ব্যবহৃত ব্যাটারি"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"শক্তির বিবিধ ব্যবহার"</string>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"শেষবার সম্পূর্ণ চার্জ দেওয়ার পর থেকে ব্যাটারির ব্যবহার"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"শেষবার সম্পূর্ণ চার্জ দেওয়ার সময়"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ব্যাটারি ব্যবহারের অবশিষ্ট সময়টি হল আনুমানিক এবং ব্যবহারের উপর ভিত্তি করে সেটি বদলে যেতে পারে"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ব্যাটারি ব্যবহারের ডেটা আনুমানিক এবং ব্যবহারের উপর ভিত্তি করে তা পাল্টাতে পারে"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"সক্রিয়ভাবে ব্যবহার করার সময়"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"যখন এটি পটভূমিতে"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ব্যাটারির ব্যবহার"</string>
@@ -2065,7 +2146,7 @@
     <string name="menu_duration_6h" msgid="1940846763432184132">"৬ ঘণ্টা"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"২৪ ঘণ্টা"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"১ দিন"</string>
-    <string name="menu_show_system" msgid="8864603400415567635">"সিস্টেম দেখান"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"সিস্টেম দেখুন"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"সিস্টেম লুকান"</string>
     <string name="menu_show_percentage" msgid="4717204046118199806">"শতাংশ দেখান"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ব্যবহার করুন"</string>
@@ -2113,17 +2194,17 @@
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"অর্ধ"</string>
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"বন্ধ"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
-    <string name="credentials_title" msgid="4446234003860769883">"ক্রেডেনশিয়াল সঞ্চয়স্থান"</string>
-    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"সঞ্চয়স্থান থেকে ইনস্টল করুন"</string>
+    <string name="credentials_title" msgid="4446234003860769883">"ক্রেডেনশিয়াল স্টোরেজ"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"স্টোরেজ থেকে ইনস্টল করুন"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"SD কার্ড থেকে ইনস্টল করুন"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"সঞ্চয়স্থান থেকে শংসাপত্র ইনস্টল করুন"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD কার্ড থেকে শংসাপত্র ইনস্টল করুন"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"স্টোরেজ থেকে সার্টিফিকেট ইনস্টল করুন"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"এসডি কার্ড থেকে সার্টিফিকেট ইনস্টল করুন"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"ক্রেডেনশিয়াল সাফ করুন"</string>
-    <string name="credentials_reset_summary" msgid="3369361230171260282">"সব শংসাপত্র সরান"</string>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"সব সার্টিফিকেট সরান"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"বিশ্বস্ত ক্রেডেনশিয়াল"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"বিশ্বস্ত CA শংসাপত্রগুলি প্রদর্শন করুন"</string>
-    <string name="user_credentials" msgid="3719013347787187083">"ব্যবহারকারীর শংসাপত্র"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"সংরক্ষিত শংসাপত্র দেখুন এবং সংশোধন করুন"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"ব্যবহারকারীর সার্টিফিকেট"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"সংরক্ষিত সার্টিফিকেট দেখুন এবং সংশোধন করুন"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"উন্নত"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"সঞ্চয়স্থানের প্রকার"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"হার্ডওয়্যার-ব্যাকড"</string>
@@ -2134,19 +2215,19 @@
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"প্রমাণপত্রাদির সঞ্চয়স্থানের জন্য পাসওয়ার্ডটি টাইপ করুন।"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"বর্তমান পাসওয়ার্ড:"</string>
-    <string name="credentials_reset_hint" msgid="6297256880896133631">"সমস্ত সামগ্রী সরাবেন?"</string>
+    <string name="credentials_reset_hint" msgid="6297256880896133631">"সমস্ত কন্টেন্ট সরাবেন?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"পাসওয়ার্ড কমপক্ষে ৮টি অক্ষরের হতে হবে।"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"ভুল পাসওয়ার্ড।"</string>
-    <string name="credentials_reset_warning" msgid="5320653011511797600">"ভুল পাসওয়ার্ড। ক্রেডেনশিয়ালের সঞ্চয়স্থান মুছে দেওয়ার আগে আপনার কাছে আরও একটি সুযোগ আছে।"</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"ভুল পাসওয়ার্ড। ক্রেডেনশিয়ালের সঞ্চয়স্থান মুছে দেওয়ার আগে আপনার কাছে আরও <xliff:g id="NUMBER">%1$d</xliff:g>টি সুযোগ আছে।"</string>
-    <string name="credentials_erased" msgid="2907836028586342969">"ক্রেডেনশিয়াল সঞ্চয়স্থান মুছে ফেলা হয়েছে।"</string>
-    <string name="credentials_not_erased" msgid="7685932772284216097">"ক্রেডেনশিয়াল সঞ্চয়স্থান মুছে ফেলা যাবে না।"</string>
-    <string name="credentials_enabled" msgid="7588607413349978930">"ক্রেডেনশিয়াল সঞ্চয়স্থান সক্ষম।"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"আপনি ক্রেডেনশিয়াল সঞ্চয়স্থান ব্যবহার করার আগে আপনাকে লক স্ক্রিন পিন বা পাসওয়ার্ড সেট করতে হবে।"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"ভুল পাসওয়ার্ড। ক্রেডেনশিয়াল স্টোরেজ মুছে দেওয়ার আগে আপনার কাছে আরও একটি সুযোগ আছে।"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"ভুল পাসওয়ার্ড। ক্রেডেনশিয়াল স্টোরেজ মুছে দেওয়ার আগে আপনার কাছে আরও <xliff:g id="NUMBER">%1$d</xliff:g>টি সুযোগ আছে।"</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"ক্রেডেনশিয়াল স্টোরেজ মুছে ফেলা হয়েছে।"</string>
+    <string name="credentials_not_erased" msgid="7685932772284216097">"ক্রেডেনশিয়াল স্টোরেজ মুছে ফেলা যাবে না।"</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"ক্রেডেনশিয়াল স্টোরেজ সক্ষম।"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"আপনি ক্রেডেনশিয়াল স্টোরেজ ব্যবহার করার আগে আপনাকে লক স্ক্রিন পিন বা পাসওয়ার্ড সেট করতে হবে।"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ব্যবহারের অ্যাক্সেস যুক্ত অ্যাপ্স"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"জরুরি টোন"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"জরুরি কল স্থাপন করা সময় কি ধরণের কার্যকলাপ করবে তা সেট করুন"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"ব্যাক আপ"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"ব্যাক-আপ"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ব্যাকআপ ও পুনরুদ্ধার"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ব্যক্তিগত ডেটা"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"আমার তথ্য ব্যাকআপ করুন"</string>
@@ -2154,12 +2235,12 @@
     <string name="backup_configure_account_title" msgid="3790872965773196615">"ব্যাকআপ অ্যাকাউন্ট"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"অ্যাপ্লিকেশান ডেটা অন্তর্ভুক্ত করুন"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"স্বয়ংক্রিয়ভাবে পুনঃস্থাপন করুন"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"অ্যাপ্লিকেশান পুনরায় ইনস্টল করার সময়, ব্যাক আপ সেটিংস এবং ডেটা পুনরুদ্ধার করুন"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"অ্যাপ পুনরায় ইনস্টল করার সময়, ব্যাক-আপ সেটিংস এবং ডেটা পুনরুদ্ধার করুন"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"ব্যাকঅ্যাপ সার্ভিস সক্রিয় নয়"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"কোনো অ্যাকাউন্ট বর্তমানে ব্যাক আপ ডেটা সংরক্ষণ করছে না"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"কোনও অ্যাকাউন্ট বর্তমানে ব্যাক-আপ ডেটা মজুত রাখছে না"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"আপনার ওয়াই-ফাই পাসওয়ার্ড, বুকমার্ক, অন্যান্য সেটিংস, এবং অ্যাপ্লিকেশান ডেটা ব্যাক আপ করা বন্ধ করুন, এছাড়াও Google সার্ভারগুলিতে সব অনুলিপি মুছে ফেলতে চান?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ডিভাইস ডেটা (যেমন ওয়াই-ফাই এর পাসওয়ার্ড এবং কলের ইতিহাস) এবং অ্যাপ্লিকেশন ডেটা (যেমন অ্যাপ্লিকেশনগুলির দ্বারা সংরক্ষিত সেটিংস এবং ফাইলগুলি) এর ব্যাকআপ নেওয়া বন্ধ করবেন, তার সাথে দূরবর্তী সার্ভারে সমস্ত প্রতিলিপি মুছবেন?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"আপনার ওয়াই-ফাই পাসওয়ার্ড, বুকমার্ক, অন্যান্য সেটিংস এবং অ্যাপ ডেটা ব্যাক-আপ করা বন্ধ করুন, এছাড়াও Google সার্ভারগুলিতে সব কপি মুছে ফেলতে চান?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ডিভাইস ডেটা (যেমন ওয়াই-ফাই এর পাসওয়ার্ড এবং কলের ইতিহাস) এবং অ্যাপ্লিকেশন ডেটা (যেমন অ্যাপ্লিকেশনগুলির দ্বারা সেভ করা সেটিংস এবং ফাইলগুলি) এর ব্যাক-আপ নেওয়া বন্ধ করবেন, তার সাথে দূরবর্তী সার্ভারে সমস্ত কপি মুছবেন?"</string>
     <string name="fullbackup_data_summary" msgid="960850365007767734">"দূরবর্তীভাবে ডিভাইস ডেটার (যেমন, ওয়াই-ফাই এর পাসওয়ার্ডগুলি এবং কলের ইতিহাস) এবং অ্যাপ্লিকেশন ডেটার (যেমন অ্যাপ্লিকেশনগুলির দ্বারা সঞ্চিত সেটিংস এবং ফাইলগুলি)স্বয়ংক্রিয়ভাবে ব্যাকআপ নেওয়া হয়৷\n\nআপনি যখন স্বয়ংক্রিয় ব্যাকআপ চালু করেন তখন দূরবর্তীভাবে ডিভাইস এবং অ্যাপ্লিকেশনের ডেটা পর্যায়ক্রমে সংরক্ষিত হয়৷ অ্যাপ্লিকেশন ডেটা যেকোনও ডেটা হতে পারে যা অ্যাপ্লিকেশন সংরক্ষণ করে (বিকাশকারীর সেটিংস এর উপর ভিত্তি করে), পরিচিতি, মেসেজ এবং ফটোগুলির মতো সম্ভাব্য সংবেদনশীল ডেটা অন্তর্ভুক্ত করে৷"</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"ডিভাইসের প্রশাসকের সেটিংস"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"ডিভাইস প্রশাসক অ্যাপ"</string>
@@ -2183,7 +2264,7 @@
     <string name="untitled_apn" msgid="1230060359198685513">"শিরোনামহীন"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"সাধারণ"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"বিজ্ঞপ্তির লগ"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"রিংটোন ও কম্পন কল করুন"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"রিংটোন ও ভাইব্রেট"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"সিস্টেম"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"ওয়াই-ফাই সেটআপ"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"ওয়াই-ফাই নেটওয়ার্ক<xliff:g id="NETWORK_NAME">%s</xliff:g> এর সাথে সংযোগ স্থাপন করুন"</string>
@@ -2199,7 +2280,7 @@
     <string name="wifi_setup_detail" msgid="2336990478140503605">"নেটওয়ার্ক বিশদ বিবরণ"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"সংযুক্ত করুন"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"ভুলে যান"</string>
-    <string name="wifi_setup_save" msgid="3659235094218508211">"সংরক্ষণ"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"সেভ করুন"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"বাতিল"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"নেটওয়ার্কগুলি স্ক্যান করা হচ্ছে..."</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"একটি নেটওয়ার্কে সংযোগ করতে সেটিতে আলতো চাপুন"</string>
@@ -2236,10 +2317,10 @@
     <string name="sync_error" msgid="5060969083117872149">"সমন্বয় ত্রুটি"</string>
     <string name="last_synced" msgid="4242919465367022234">"শেষ সিঙ্ক হয়েছে: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"এখনই সমন্বয় করুন…"</string>
-    <string name="settings_backup" msgid="2274732978260797031">"ব্যাক আপ সেটিংস"</string>
-    <string name="settings_backup_summary" msgid="7916877705938054035">"আমার সেটিংসের ব্যাক আপ নিন"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"ব্যাক-আপ সেটিংস"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"আমার সেটিংসের ব্যাক-আপ নিন"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"এখন সিঙ্ক করুন"</string>
-    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"সমন্বয় বাতিল করুন"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"সিঙ্ক বাতিল করুন"</string>
     <string name="sync_one_time_sync" msgid="3733796114909082260">"এখনই সিঙ্ক করতে আলতো চাপুন<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
@@ -2254,8 +2335,8 @@
     <string name="header_add_an_account" msgid="756108499532023798">"একটি অ্যাকাউন্ট যোগ করুন"</string>
     <string name="finish_button_label" msgid="481587707657751116">"শেষ"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"অ্যাকাউন্ট সরাবেন?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"এই অ্যাকাউন্টটি মুছে দিলে এটি ট্যাবলেটটি থেকে সমস্ত বার্তা, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"এই অ্যাকাউন্টটি মুছে দিলে এটি ফোন থেকে সমস্ত বার্তা, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"এই অ্যাকাউন্টটি মুছে দিলে এটি ট্যাবলেটটি থেকে সমস্ত মেসেজ, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"এই অ্যাকাউন্টটি মুছে দিলে এটি ফোন থেকে সমস্ত মেসেজ, পরিচিতি এবং অন্য ডেটা মুছে দেবে!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"আপনার প্রশাসক এই পরিবর্তনটি করতে দেবেন না"</string>
     <string name="provider_label" msgid="7724593781904508866">"পুশ সদস্যতাগুলি"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
@@ -2276,12 +2357,12 @@
     <string name="misc_files" msgid="6720680815969643497">"বিবিধ ফাইলগুলি"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> এর মধ্যে <xliff:g id="NUMBER">%1$d</xliff:g> নির্বাচিত"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>টির মধ্যে <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="select_all" msgid="1562774643280376715">"সবগুলি নির্বাচন করুন"</string>
+    <string name="select_all" msgid="1562774643280376715">"সবগুলি বেছে নিন"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"ডেটা ব্যবহার"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"অ্যাপ ডেটা ব্যবহার"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"পরিষেবা প্রদানকারীর ডেটার হিসাব আপনার ডিভাইস থেকে ভিন্ন হতে পারে।"</string>
     <string name="data_usage_app" msgid="4970478397515423303">"অ্যাপ্লিকেশান ব্যবহার"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"অ্যাপ্লিকেশান তথ্য"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"অ্যাপের তথ্য"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"মোবাইল ডেটা"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"ডেটা সীমা সেট করুন"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"ডেটা ব্যবহারের চক্র"</string>
@@ -2328,27 +2409,27 @@
     <string name="data_usage_app_settings" msgid="2279171379771253165">"অ্যাপ্লিকেশান সেটিংস"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"ব্যাকগ্রাউন্ড ডেটা"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"পটভূমিতে মোবাইল ডেটার ব্যবহার সক্ষম করুন"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"এই অ্যাপ্লিকেশানের জন্য পশ্চাদপটের ডেটা সীমাবদ্ধ করতে, প্রথমে মোবাইল ডেটা সীমা সেট করুন।"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"এই অ্যাপ্লিকেশনের জন্য ব্যাকগ্রাউন্ড ডেটা সীমাবদ্ধ করতে, প্রথমে মোবাইল ডেটা সীমা সেট করুন।"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ব্যাকগ্রাউন্ড ডেটা সীমাবদ্ধ করবেন?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"এই বৈশিষ্ট্যটি যখন শুধুমাত্র মোবাইল নেটওয়ার্ক উপলব্ধ তখন কাজ বন্ধ করার জন্য পশ্চাদপট ডেটার উপর নির্ভরশীল হয় এমন অ্যাপ্লিকেশানের উপর প্রভাব ফেলতে পারে।\n\nআপনি অ্যাপ্লিকেশন মধ্যে উপলব্ধ সেটিংসে আরো উপযুক্ত ডেটা ব্যবহার নিয়ন্ত্রণ সম্পর্কে জানতে পারবেন।"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"মোবাইল ডেটার সীমা সেট করলে একমাত্র তখনই পটভূমির ডেটা সীমাবদ্ধ করা সম্ভব।"</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ডেটা স্বতঃ সিঙ্ক চালু করবেন?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ওয়েবে আপনার অ্যাকাউন্টে আপনি যে পরিবর্তন করবেন সেটি স্বয়ংক্রিয়ভাবে আপনার ট্যাবলেটে অনুলিপি করা হবে।\n\nকোনো কোনো অ্যাকাউন্ট আপনার ট্যাবলেটে করা পরিবর্তনগুলি স্বয়ংক্রিয়ভাবে ওয়েবে অনুলিপি করতে পারবে। Google অ্যাকাউন্ট এভাবেই কাজ করে।"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ওয়েবে আপনার অ্যাকাউন্টে আপনি যে পরিবর্তন করবেন সেটি স্বয়ংক্রিয়ভাবে আপনার ফোনে অনুলিপি করা হবে।\n\nকোনো কোনো অ্যাকাউন্ট আপনার ফোনে করা পরিবর্তনগুলি স্বয়ংক্রিয়ভাবে ওয়েবে অনুলিপি করতে পারবে। Google অ্যাকাউন্ট এভাবেই কাজ করে।"</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ডেটা স্বতঃ সিঙ্ক বন্ধ করবেন?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"এটি ডেটা এবং ব্যাটারি ব্যবহার সংরক্ষণ করবে, কিন্তু আপনাকে সাম্প্রতিক তথ্য সংগ্রহ করতে ম্যানুয়ালি প্রতিটি অ্যাকাউন্ট সিঙ্ক করতে হবে। আপডেট হলে আপনি তখন বিজ্ঞপ্তি পাবেন না।"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ডেটা অটোমেটিক সিঙ্ক চালু করবেন?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ওয়েবে আপনার অ্যাকাউন্টে আপনি যে পরিবর্তন করবেন সেটি অটোমেটিক আপনার ট্যাবলেটে কপি করা হবে।\n\nকোনও কোনও অ্যাকাউন্ট আপনার ট্যাবলেটে করা পরিবর্তনগুলি অটোমেটিক ওয়েবে কপি করতে পারবে। Google অ্যাকাউন্ট এভাবেই কাজ করে।"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ওয়েবে আপনার অ্যাকাউন্টে আপনি যে পরিবর্তন করবেন সেটি অটোমেটিক আপনার ফোনে কপি করা হবে।\n\nকোনও কোনও অ্যাকাউন্ট আপনার ফোনে করা পরিবর্তনগুলি অটোমেটিক ওয়েবে কপি করতে পারবে। Google অ্যাকাউন্ট এভাবেই কাজ করে।"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ডেটা অটোমেটিক সিঙ্ক বন্ধ করবেন?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"এটি ডেটা এবং ব্যাটারির খরচ বাঁচাবে, কিন্তু আপনাকে সাম্প্রতিক তথ্য সংগ্রহ করতে ম্যানুয়ালি প্রতিটি অ্যাকাউন্ট সিঙ্ক করতে হবে। আপডেট হলে আপনি তখন বিজ্ঞপ্তি পাবেন না।"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"ব্যবহার চক্র আবার সেট করার তারিখ"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"প্রতিটি মাসের তারিখ:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"সেট"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ডেটা ব্যবহার সতর্কতা সেট করুন"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ডেটা ব্যবহার সীমা সেট করুন"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ডেটা ব্যবহার সীমিত করা"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ট্যাবলেট মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ট্যাবলেট আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডাটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ফোন মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ফোন আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডাটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ট্যাবলেট মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ট্যাবলেট আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডেটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ফোন মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ফোন আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই যাতে কম মোবাইল ডেটা খরচ হোক এমনভাবে সীমা সেট করার কথা ভাবতে পারেন।"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ব্যাকগ্রাউন্ড ডেটা সীমাবদ্ধ করবেন?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"আপনি যদি পটভূমির মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"আপনি যদি পটভূমির মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ট্যাবলেটের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"আপনি যদি পটভূমির মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ফোনের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"আপনি যদি ব্যাকগ্রাউন্ডের মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই-ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"আপনি যদি ব্যাকগ্রাউন্ডের মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই-ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ট্যাবলেটের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"আপনি যদি ব্যাকগ্রাউন্ডের মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই-ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ফোনের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"সতর্কতা"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"সীমা"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"সরানো অ্যাপ্লিকেশানগুলি"</string>
@@ -2358,7 +2439,7 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> ব্যবহার সম্পর্কে, যেহেতু আপনার ট্যাবলেট দ্বারা পরিমাপ করা হয়। আপনার ক্যারিয়ার ব্যবহারের জন্য আলাদা করে চার্জ করতে পারে।"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> ব্যবহার সম্পর্কে, যেহেতু আপনার ফোন দ্বারা পরিমাপ করা হয়। আপনার ক্যারিয়ার ব্যবহারের জন্য আলাদা করে চার্জ করতে পারে।"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"নেটওয়ার্ক সীমাবদ্ধতা"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"পটভূমির ডেটা সীমাবদ্ধ থাকলে পরিমাপ করা নেটওয়ার্কগুলিকে মোবাইল নেটওয়ার্ক হিসাবে ধরা হয়। বড় ডাউনলোডের জন্য এইসব নেটওয়ার্ক ব্যবহারের আগে অ্যাপগুলি সতর্ক বার্তা দেখাতে পারে।"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"পটভূমির ডেটা সীমাবদ্ধ থাকলে পরিমাপ করা নেটওয়ার্কগুলিকে মোবাইল নেটওয়ার্ক হিসেবে ধরা হয়। বড় ডাউনলোডের জন্য এইসব নেটওয়ার্ক ব্যবহারের আগে অ্যাপগুলি সতর্ক মেসেজ দেখাতে পারে।"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"মোবাইল নেটওয়ার্কগুলি"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"পরিমাপ করা ওয়াই-ফাই নেটওয়ার্ক"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"পরিমাপ করা নেটওয়ার্ক নির্বাচন করতে,ওয়াই-ফাই চালু করুন।"</string>
@@ -2372,16 +2453,16 @@
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP সিক্রেট"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec আইডেন্টিফায়ার"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec আগে থেকে শেয়ার করা কী"</string>
-    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec ব্যবহারকারী শংসাপত্র"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA শংসাপত্র"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec ব্যবহারকারী সার্টিফিকেট"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA সার্টিফিকেট"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec সার্ভার সার্টিফিকেট"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"উন্নত বিকল্প দেখান"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS অনুসন্ধান ডোমেনগুলি"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS সার্ভার (যেমন ৮.৮.৮.৮)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"ফরওয়ার্ডিং রুটগুলি (উদাহরণ 10.0.0.0 / 8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"ব্যবহারকারীর নাম"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ইউজারনেম"</string>
     <string name="vpn_password" msgid="6756043647233596772">"পাসওয়ার্ড"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"অ্যাকাউন্ট তথ্য সংরক্ষণ করুন"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"অ্যাকাউন্ট তথ্য সেভ করুন"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(অব্যবহৃত)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(সার্ভার যাচাই করবেন না)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(সার্ভার থেকে প্রাপ্ত)"</string>
@@ -2392,7 +2473,7 @@
     <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"দিয়ে থাকা তথ্য সর্বদা-চালু VPN গুলিতে কাজ করে না"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"বাতিল"</string>
     <string name="vpn_done" msgid="8678655203910995914">"খারিজ করুন"</string>
-    <string name="vpn_save" msgid="4233484051644764510">"সংরক্ষণ"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"সেভ করুন"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"সংযুক্ত করুন"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"প্রতিস্থাপন করুন"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"VPN প্রোফাইল সম্পাদনা করুন"</string>
@@ -2400,7 +2481,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> এতে সংযোগ করুন"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"এই VPN থেকে সংযোগ বিচ্ছিন্ন করবেন?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"সংযোগ বিচ্ছিন্ন করুন"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"<xliff:g id="VERSION">%s</xliff:g> সংস্করণ"</string>
+    <string name="vpn_version" msgid="1939804054179766249">"ভার্সন<xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN সরিয়ে দিন"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"বিদ্যমান VPN প্রতিস্থাপন করতে চান?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"সর্বদা-চালু VPN সেট করতে চান?"</string>
@@ -2422,30 +2503,30 @@
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"সর্বদা-চালু সক্রিয় আছে"</string>
     <string name="vpn_require_connection" msgid="8388183166574269666">"VPN বিহীন সংযোগগুলি ব্লক করুন"</string>
     <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN সংযোগ প্রয়োজন?"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"সর্বদা সংযুক্ত থাকতে একটি VPN প্রোফাইল নির্বাচন করুন। এই VPN এ সংযুক্ত থাকাকালীন শুধুমাত্র নেটওয়ার্ক ট্রাফিকের অনুমতি দেওয়া হবে।"</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"সর্বদা সংযুক্ত থাকতে একটি VPN প্রোফাইল বেছে নিন। এই VPN এ সংযুক্ত থাকাকালীন শুধুমাত্র নেটওয়ার্ক ট্রাফিকের অনুমতি দেওয়া হবে।"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"কোনো কিছুই নয়"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"সর্বদা-চালু VPN এর সার্ভার্র এবং DNS উভয়েরই জন্য IP ঠিকানা প্রয়োজন।"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"কোনো নেটওয়ার্ক সংযোগ নেই। দয়া করে পরে আবার চেষ্টা করুন।"</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN থেকে সংযোগ বিচ্ছিন্ন হয়েছে"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"কোনো কিছুই নয়"</string>
-    <string name="vpn_missing_cert" msgid="5357192202207234745">"একটি শংসাপত্র পাওয়া যাচ্ছে না। প্রোফাইলটি সম্পাদনা করুন।"</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"একটি সার্টিফিকেট পাওয়া যাচ্ছে না। প্রোফাইলটি সম্পাদনা করুন।"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"সিস্টেম"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ব্যবহারকারী"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"অক্ষম করুন"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"সক্ষম করুন"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"সরান"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"বিশ্বাস"</string>
-    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"সিস্টেমের CA শংসাপত্র সক্ষম করবেন?"</string>
-    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"সিস্টেমের CA শংসাপত্র অক্ষম করবেন?"</string>
-    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"স্থায়ীভাবে ব্যবহারকারী CA শংসাপত্র সরাবেন?"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"সিস্টেমের CA সার্টিফিকেট সক্ষম করবেন?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"সিস্টেমের CA সার্টিফিকেট অক্ষম করবেন?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"স্থায়ীভাবে ব্যবহারকারী CA সার্টিফিকেট সরাবেন?"</string>
     <string name="credential_contains" msgid="3984922924723974084">"এই এন্ট্রিতে এগুলি রয়েছে:"</string>
     <string name="one_userkey" msgid="6034020579534914349">"একটি ব্যবহারকারী কী"</string>
-    <string name="one_usercrt" msgid="2150319011101639509">"একটি ব্যবহারকারী শংসাপত্র"</string>
-    <string name="one_cacrt" msgid="6844397037970164809">"একটি CA শংসাপত্র"</string>
-    <string name="n_cacrts" msgid="5979300323482053820">"%dটি CA শংসাপত্র"</string>
+    <string name="one_usercrt" msgid="2150319011101639509">"একটি ব্যবহারকারী সার্টিফিকেট"</string>
+    <string name="one_cacrt" msgid="6844397037970164809">"একটি CA সার্টিফিকেট"</string>
+    <string name="n_cacrts" msgid="5979300323482053820">"%dটি CA সার্টিফিকেট"</string>
     <string name="user_credential_title" msgid="1954061209643070652">"শংসাপত্রের বিশদ বিবরণ"</string>
-    <string name="user_credential_removed" msgid="6514189495799401838">"সরানো শংসাপত্র: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
-    <string name="user_credential_none_installed" msgid="3729607560420971841">"কোনো ব্যবহারকারীর শংসাপত্র ইনস্টল করা নেই"</string>
+    <string name="user_credential_removed" msgid="6514189495799401838">"সরানো সার্টিফিকেট: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"কোনও ব্যবহারকারীর সার্টিফিকেট ইনস্টল করা নেই"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"বানান পরিক্ষক"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"এখানে আপনার বর্তমান সম্পূর্ণ ব্যাকআপ পাসওয়ার্ড টাইপ করুন"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"এখানে পুরো ব্যাকআপের জন্য একটি নতুন পাসওয়ার্ড টাইপ করুন"</string>
@@ -2463,17 +2544,17 @@
       <item quantity="other">টি শংসাপত্রের উপরে ভরসা করুন বা সেগুলিকে সরান</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার ডিভাইসের জন্য একটি শংসাপত্র কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার ডিভাইসের জন্য একটি শংসাপত্র কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার ডিভাইসের জন্য একটি সার্টিফিকেট কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশন এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার ডিভাইসের জন্য একটি সার্টিফিকেট কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশন, এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার কর্মস্থলের প্রোফাইলের জন্য শংসাপত্রের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ কর্মস্থলের নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার কর্মস্থলের প্রোফাইলের জন্য শংসাপত্রের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ কর্মস্থলের নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই শংসাপত্রগুলির সম্পর্কে আরো তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g>আপনার অফিস প্রোফাইলের জন্য সার্টিফিকেটের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশন এবং নিরাপদ ওয়েবসাইটগুলি সহ অফিস নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> আপনার অফিস প্রোফাইলের জন্য সার্টিফিকেটের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশন, এবং নিরাপদ ওয়েবসাইটগুলি সহ অফিস নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"একজন তৃতীয় পক্ষ ইমেল অ্যাপ্লিকেশান, এবং নিরাপদ ওয়েবসাইটগুলি সহ আপনার নেটওয়ার্ক ক্রিয়াকলাপ নিরীক্ষণ করতে সক্ষম হবে। \n\nআপনার ডিভাইসে ইনস্টল করা একটি বিশ্বস্ত ক্রেডেনশিয়াল এটিকে সম্ভব করছে।"</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
-      <item quantity="one">টি শংসাপত্র পরীক্ষা করুন</item>
-      <item quantity="other">টি শংসাপত্র পরীক্ষা করুন</item>
+      <item quantity="one">টি সার্টিফিকেট পরীক্ষা করুন</item>
+      <item quantity="other">টি সার্টিফিকেট পরীক্ষা করুন</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"ব্যবহারকারীগণ"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ব্যবহারকারীরা ও প্রোফাইলগুলি"</string>
@@ -2490,15 +2571,15 @@
     <string name="user_nickname" msgid="5148818000228994488">"ডাকনাম"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"যোগ করুন"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"আপনি <xliff:g id="USER_COUNT">%1$d</xliff:g> জন পর্যন্ত ব্যবহারকারী যোগ করতে পারেন"</string>
-    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ব্যবহারকারীদের তাদের নিজস্ব অ্যাপ্লিকেশান এবং সামগ্রী আছে"</string>
-    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"আপনি আপনার অ্যাকাউন্ট থেকে অ্যাপ্লিকেশান এবং সামগ্রী অ্যাক্সেস সীমাবদ্ধ করতে পারেন"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ব্যবহারকারীদের তাঁদের নিজস্ব অ্যাপ্লিকেশন এবং কন্টেন্ট আছে"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"আপনি আপনার অ্যাকাউন্ট থেকে অ্যাপ্লিকেশন এবং কন্টেন্ট অ্যাক্সেস সীমাবদ্ধ করতে পারেন"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ব্যবহারকারী"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"সীমাবদ্ধ প্রোফাইল"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"নতুন ব্যবহারকারী জুড়বেন?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"আপনি একাধিক ব্যবহারকারী তৈরি করে অন্যদের সাথে এই ডিভাইস শেয়ার করতে পারেন। প্রতিটি ব্যবহারকারীদের কাছে তাদের নিজস্ব স্থান রয়েছে যা তারা অ্যাপ্লিকেশান, ওয়ালপেপার, এবং আরো অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। ব্যবহারকারীরা ওয়াই-ফাই এর মত ডিভাইস সেটিংস সামঞ্জস্য করতে পারবেন যার প্রভাব পড়বে সকলের উপর।\n\nনতুন ব্যবহারকারী তৈরি হওয়ার পরে, সেই ব্যক্তিকে তাদের স্থান সেট আপ করতে হবে।\n\nঅন্যান্য ব্যবহারকারীদের হয়ে যে কোনো ব্যবহারকারী অ্যাপ্লিকেশানগুলি আপডেট করতে পারবেন।"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"আপনি একাধিক ব্যবহারকারী তৈরি করে অন্যদের সাথে এই ডিভাইস শেয়ার করতে পারেন। প্রতিটি ব্যবহারকারীদের কাছে তাঁদের নিজস্ব জায়গা রয়েছে যা তারা অ্যাপ, ওয়ালপেপার, এবং আরও অনেক কিছু দিয়ে কাস্টমাইজ করতে পারেন। ব্যবহারকারীরা ওয়াই-ফাই এর মতো ডিভাইস সেটিংস সামঞ্জস্য করতে পারবেন যার প্রভাব পড়বে সকলের ওপর।.\n\nনতুন ব্যবহারকারী তৈরি হওয়ার পরে, সেই ব্যক্তিকে তাঁদের জায়গা সেট-আপ করতে হবে।.\n\nঅন্যান্য ব্যবহারকারীদের হয়ে যেকোনও ব্যবহারকারী অ্যাপগুলি আপডেট করতে পারবেন।"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"আপনি একজন নতুন ব্যবহারকারী জুড়লে তাকে তার জায়গা সেট আপ করে নিতে হবে।\n\nযেকোনো ব্যবহারকারী অন্য সব ব্যবহারকারীর জন্য অ্যাপ্লিকেশান আপডেট করতে পারবেন।"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"এখন ব্যবহারকারী সেট আপ করবেন?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"নিশ্চিত করুন যে ব্যক্তিটি ডিভাইসটি নেওয়ার জন্য এবং তার স্থান সেট আপ করার জন্য উপলব্ধ আছেন"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"নিশ্চিত করুন, যে ব্যক্তিটি ডিভাইসটি নেওয়ার জন্য এবং তার জায়গা সেট-আপ করার জন্য উপলব্ধ আছেন"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"এখনই প্রোফাইল সেট আপ করবেন?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"এখনই সেট আপ করুন"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"এখনই নয়"</string>
@@ -2514,8 +2595,8 @@
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"এই ব্যবহারকারী সরাবেন?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"এই প্রোফাইলটি সরাবেন?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"কর্মস্থলের প্রোফাইল সরাবেন?"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"আপনি এই ট্যাবলেটে আপনার স্থান ও ডেটা হারিয়ে ফেলবেন। আপনি এটিকে পূর্বাবস্থায় ফেরাতে পারবেন না।"</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"আপনি এই ফোনে আপনার স্থান ও ডেটা হারিয়ে ফেলবেন। আপনি এটিকে পূর্বাবস্থায় ফেরাতে পারবেন না।"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"আপনি এই ট্যাবলেটে আপনার জায়গা ও ডেটা হারিয়ে ফেলবেন। আপনি এটিকে আগের অবস্থায় ফেরাতে পারবেন না।"</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"আপনি এই ফোনে আপনার জায়গা ও ডেটা হারিয়ে ফেলবেন। আপনি এটিকে আগের অবস্থায় ফেরাতে পারবেন না।"</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"সব অ্যাপ্লিকেশান ও ডেটা মুছে ফেলা হবে।"</string>
     <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"যদি আপনি চালিয়ে যান তবে এই প্রোফাইলের সমস্ত অ্যাপ্লিকেশান ও ডেটা মুছে ফেলা হবে৷"</string>
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"সব অ্যাপ্লিকেশান ও ডেটা মুছে ফেলা হবে।"</string>
@@ -2538,7 +2619,7 @@
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> এর তথ্য ও পরিচিতি"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"অ্যাপ্লিকেশান এবং সামগ্রীর অনুমতি দিন"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"সীমাবদ্ধ সহ অ্যাপ্লিকেশানগুলি"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"অ্যাপ্লিকেশানের জন্য সেটিংস প্রসারিত করুন"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"অ্যাপ্লিকেশনের জন্য সেটিংস খুলুন"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"এই সেটিংটি এই ট্যাবলেটের সব ব্যবহারকারীদের প্রভাবিত করবে।"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"এই সেটিংটি এই ফোনের সব ব্যবহারকারীদের প্রভাবিত করবে।"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ভাষা পরিবর্তন করুন"</string>
@@ -2551,9 +2632,9 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"ডিফল্ট ব্যবহার করুন"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"সবসময়"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"অন্য কোনো অর্থপ্রদান অ্যাপ্লিকেশান খুলে থাকার সময় ব্যতিত"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"ট্যাপ করে অর্থপ্রদান করুন টার্মিন্যালে, এর মাধ্যমে অর্থ প্রদান করুন:"</string>
-    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"টার্মিনালে অর্থপ্রদানের পদ্ধতি"</string>
-    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"একটি অর্থপ্রদানের অ্যাপ্লিকেশান সেট আপ করুন৷ তারপরে যোগাযোগহীন চিহ্ন সহ কোনো টার্মিনালের উপর শুধু আপনার ফোনের পিছনের দিকটি ধরুন৷"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"ট্যাপ করে অর্থপ্রদান করুন টার্মিন্যালে, এর মাধ্যমে পেমেন্ট করুন:"</string>
+    <string name="nfc_how_it_works_title" msgid="1984068457698797207">"টার্মিনালে পেমেন্টের পদ্ধতি"</string>
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"একটি পেমেন্টের অ্যাপ্লিকেশান সেট আপ করুন৷ তারপরে যোগাযোগহীন চিহ্ন সহ কোনো টার্মিনালের উপর শুধু আপনার ফোনের পিছনের দিকটি ধরুন৷"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"বুঝেছি"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"আরো..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"আপনার পছন্দ হিসেবে সেট করুন?"</string>
@@ -2563,8 +2644,8 @@
     <string name="restriction_menu_reset" msgid="2067644523489568173">"সীমাবদ্ধগুলি সরান"</string>
     <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="help_label" msgid="6886837949306318591">"সহায়তা ও মতামত"</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>
@@ -2587,8 +2668,8 @@
     <string name="preferred_network_type_title" msgid="3431041717309776341">"পছন্দের নেটওয়ার্ক"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (প্রস্তাবিত)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"কর্মস্থলের সিম"</string>
-    <string name="user_restrictions_title" msgid="5794473784343434273">"অ্যাপ্লিকেশান &amp; সামগ্রী অ্যাক্সেস"</string>
-    <string name="user_rename" msgid="8523499513614655279">"আবার নামকরণ করুন"</string>
+    <string name="user_restrictions_title" msgid="5794473784343434273">"অ্যাপ্লিকেশন ও কন্টেন্ট অ্যাক্সেস"</string>
+    <string name="user_rename" msgid="8523499513614655279">"নাম বদলান"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"অ্যাপ্লিকেশান সীমাবদ্ধগুলি সেট করুন"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> দ্বারা নিয়ন্ত্রিত"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"এই অ্যাপ্লিকেশানটি আপনার অ্যাকাউন্টগুলি করতে পারবে:"</string>
@@ -2608,7 +2689,7 @@
     <string name="wizard_finish" msgid="3286109692700083252">"শেষ"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ফটো তুলুন"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"গ্যালারি থেকে ফটো চয়ন করুন"</string>
-    <string name="user_image_photo_selector" msgid="5492565707299454873">"ফটো নির্বাচন করুন"</string>
+    <string name="user_image_photo_selector" msgid="5492565707299454873">"ফটো বেছে নিন"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
     <string name="sim_setup_wizard_title" msgid="1732682852692274928">"সিম কার্ডগুলি"</string>
     <string name="sim_settings_title" msgid="6822745211458959756">"সিম কার্ডগুলি"</string>
@@ -2621,7 +2702,7 @@
     <string name="select_sim_for_data" msgid="2366081042162853044">"ডেটার জন্য একটি সিম বেছে নিন"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"ডেটা সিম পাল্টাতে এক মিনিট পর্যন্ত সময় লাগতে পারে..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"এর মাধ্যমে কল করুন"</string>
-    <string name="sim_select_card" msgid="211285163525563293">"একটি সিম কার্ড নির্বাচন করুন"</string>
+    <string name="sim_select_card" msgid="211285163525563293">"একটি সিম কার্ড বেছে নিন"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"সিম <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
     <string name="sim_slot_empty" msgid="8964505511911854688">"সিম খালি"</string>
     <string name="sim_editor_name" msgid="1722945976676142029">"সিম এর নাম"</string>
@@ -2630,9 +2711,9 @@
     <string name="sim_editor_carrier" msgid="5684523444677746573">"পরিষেবা প্রদানকারী"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"সংখ্যা"</string>
     <string name="sim_editor_color" msgid="2542605938562414355">"সিম এর রঙ"</string>
-    <string name="sim_card_select_title" msgid="6668492557519243456">"সিম কার্ড নির্বাচন করুন"</string>
+    <string name="sim_card_select_title" msgid="6668492557519243456">"সিম কার্ড বেছে নিন"</string>
     <string name="color_orange" msgid="4417567658855022517">"কমলা"</string>
-    <string name="color_purple" msgid="3888532466427762504">"বেগুনি"</string>
+    <string name="color_purple" msgid="3888532466427762504">"বেগুনী"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"কোনো সিম কার্ড ঢোকানো নেই"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"সিম এর স্থিতি"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"ডিফল্ট সিম থেকে কল ব্যাক করুন"</string>
@@ -2654,19 +2735,22 @@
       <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="app_and_notification_dashboard_title" msgid="7838365599185397539">"অ্যাপ্স &amp; বিজ্ঞপ্তি"</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>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"ডিফল্ট অ্যাপ্স"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"ডিফল্ট অ্যাপ"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"ভাষা, সময়, ব্যাকআপ, আপডেট"</string>
     <string name="search_results_title" msgid="1796252422574886932">"সেটিংস"</string>
-    <string name="search_menu" msgid="6283419262313758339">"সেটিংসে অনুসন্ধান করুন"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"সেটিংসে অনুসন্ধান করুন"</string>
+    <string name="search_menu" msgid="6283419262313758339">"সেটিংস খুঁজুন"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"সেটিংস খুঁজুন"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, নেটওয়ার্ক সংযোগ"</string>
-    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"পাঠ্য বার্তা, পাঠ্য বার্তা পাঠানো, বার্তাগুলি, বার্তালাপ"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"টেক্সট মেসেজ, টেক্সট মেসেজ পাঠানো, মেসেজগুলি, মেসেজিং"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"সেলুলার, মোবাইল, সেলুলার পরিষেবা প্রদানকারী, ওয়্যারলেস, ডেটা, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, কল করুন, কল করা হচ্ছে"</string>
     <string name="keywords_home" msgid="3626170808219458848">"লঞ্চার"</string>
@@ -2674,14 +2758,14 @@
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"স্ক্রীন অস্পষ্ট করুন, টাচস্ক্রীন, ব্যাটারি"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"স্ক্রীন অস্পষ্ট করুন, টাচস্ক্রীন, ব্যাটারি"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"স্ক্রীন অস্পষ্ট করুন, রাত্রি, আভা"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"পটভূমি, ব্যক্তিগত করুন, প্রদর্শন কাস্টমাইজ করুন"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ব্যাকগ্রাউন্ড, ব্যক্তিগতকরণ, কাস্টমাইজ ডিসপ্লে"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"পাঠ্য আকার"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"প্রকল্প, কাস্ট করুন"</string>
-    <string name="keywords_storage" msgid="3299217909546089225">"স্থান, ডিস্ক, হার্ড ড্রাইভ, ডিভাইসের ব্যবহার"</string>
+    <string name="keywords_storage" msgid="3299217909546089225">"জায়গা, ডিস্ক, হার্ড ড্রাইভ, ডিভাইসের ব্যবহার"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"পাওয়ারের ব্যবহার, চার্জ"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"বানান, অভিধান, বানান-পরীক্ষা, স্বতঃ-সংশোধন"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"শনাক্তকারী, ইনপুট, স্পিচ, বলুন, ভাষা, হ্যান্ডসফ্রী, হ্যান্ড ফ্রী, শনাক্তকরণ, আপত্তিকর, শব্দ, অডিও, ইতিহাস, ব্লুটুথ হেডসেট"</string>
-    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"হার, ভাষা, ডিফল্ট, কথা বলা, কথা বলছে, tts, অ্যাক্সেসযোগ্যতা, স্ক্রীন রিডার, অন্ধ"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"হার, ভাষা, ডিফল্ট, কথা বলা, কথা বলছে, tts, অ্যাক্সেসযোগ্যতা, স্ক্রিন রিডার, অন্ধ"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ঘড়ি, সেনাবাহিনী"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"আবার সেট করুন, পুনরুদ্ধার করুন, ফ্যাক্টরি"</string>
     <string name="keywords_factory_data_reset" msgid="5894970373671252165">"মোছা, মুছুন, পুনরুদ্ধার করুন, সাফ করুন, সরান"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"আনলক করতে, পাসওয়ার্ড, প্যাটার্ন, পিন স্লাইড করুন"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"কর্মস্থলের প্রতিদ্বন্দ্বিতা, কর্মস্থল, প্রোফাইল"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"কর্মস্থলের প্রোফাইল, পরিচালিত প্রোফাইল, ঐক্যবদ্ধ, একীকরণ, কাজ, প্রোফাইল"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ইঙ্গিত"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ইঙ্গিত"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"অর্থপ্রদান, আলতো চাপা, পেমেন্ট"</string>
-    <string name="keywords_backup" msgid="470070289135403022">"ব্যাকআপ, ব্যাক আপ"</string>
+    <string name="keywords_backup" msgid="470070289135403022">"ব্যাক-আপ, ব্যাক-আপ করুন"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ইঙ্গিত"</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>
@@ -2716,10 +2801,10 @@
     <string name="status_write_success" msgid="5228419086308251169">"সফল!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC ট্যাগে ডেটা লিখতে ব্যর্থ হয়েছে৷ যদি সমস্যাটি থেকে যায়, তবে অন্য একটি ট্যাগ দিয়ে চেষ্টা করুন"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ট্যাগ লিখনযোগ্য নয়৷ দয়া করে একটি আলাদা ট্যাগ ব্যবহার করুন৷"</string>
-    <string name="default_sound" msgid="8821684447333687810">"ডিফল্ট শব্দ"</string>
+    <string name="default_sound" msgid="8821684447333687810">"ডিফল্ট সাউন্ড"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"রিং ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g> তে রয়েছে"</string>
     <string name="sound_dashboard_summary" msgid="3402435125958012986">"ভলিউম, কম্পন, বিরক্ত করবেন না"</string>
-    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"রিঙ্গারকে কম্পন অবস্থায় সেট করা হয়েছে"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"রিঙ্গারকে ভাইব্রেট অবস্থায় সেট করা হয়েছে"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"রিঙ্গারকে নীরব অবস্থায় সেট করা হয়েছে"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"রিং ভলিউম ৮০% তে রয়েছে"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"মিডিয়া ভলিউম"</string>
@@ -2727,24 +2812,24 @@
     <string name="ring_volume_option_title" msgid="6767101703671248309">"রিং ভলিউম"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"বিজ্ঞপ্তির ভলিউম"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ফোন রিংটোন"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"ডিফল্ট বিজ্ঞপ্তি শব্দ"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"ডিফল্ট বিজ্ঞপ্তির সাউন্ড"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"শব্দটি অ্যাপ দ্বারা দেওয়া হয়েছে"</string>
-    <string name="notification_sound_default" msgid="565135733949733766">"বিজ্ঞপ্তির ডিফল্ট শব্দ"</string>
-    <string name="alarm_ringtone_title" msgid="6344025478514311386">"ডিফল্ট অ্যালার্মের শব্দ"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"এছাড়াও কল এলে ভাইব্রেট করুন"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"ডিফল্ট বিজ্ঞপ্তির সাউন্ড"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"ডিফল্ট অ্যালার্মের সাউন্ড"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"কল এলে ভাইব্রেট হবে"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"অন্যান্য শব্দগুলি"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ডায়াল প্যাডের টোনগুলি"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"স্ক্রিন লক হওয়ার শব্দ"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"চার্জ হওয়ার সময় শব্দগুলি"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"ডকিং শব্দগুলি"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"স্পর্শ শব্দ"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"আলতো চাপে কম্পন"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"আলতো চাপে ভাইব্রেট"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"ডক স্পিকার শুরু"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"সমস্ত অডিও"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"কেবলমাত্র মিডিয়া অডিও"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"নীরব"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"সতর্কতা"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"কম্পন"</string>
+    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ভাইব্রেট"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ধ্বনিগুলিতে শক্তি"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"কোনো স্বয়ংক্রিয় নিয়ম চালু করা নেই"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
@@ -2774,24 +2859,25 @@
     <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"কোনো কাস্টম শব্দ যোগ করবেন?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"এই ফাইলটি <xliff:g id="FOLDER_NAME">%s</xliff:g> ফোল্ডারে কপি করা হবে"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"রিংটোনগুলি"</string>
-    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"অন্যান্য শব্দ এবং কম্পন"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"অন্যান্য সাউন্ড এবং ভাইব্রেশন"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"বিজ্ঞপ্তি"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"উন্নত"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"কর্মস্থলের বিজ্ঞপ্তিগুলি"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"একাধিক বিজ্ঞপ্তি ডট দেখাতে দিন"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"মিটমিট করা আলো"</string>
-    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"লক স্ক্রীনে"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"লক স্ক্রিনে"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"সমস্ত বিজ্ঞপ্তির সামগ্রীগুলি দেখান"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"সংবেদনশীল বিজ্ঞপ্তির সামগ্রী লুকান"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"কোনো বিজ্ঞপ্তি দেখাবেন না"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"সংবেদনশীল বিজ্ঞপ্তির কন্টেন্ট লুকান"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"কোনও বিজ্ঞপ্তি দেখাবেন না"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে বিজ্ঞপ্তি প্রদর্শন করতে চান?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"বিজ্ঞপ্তিগুলি"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"সমস্ত কর্মস্থলের বিজ্ঞপ্তির সামগ্রী দেখান"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"সংবেদনশীল কর্মস্থলের বিজ্ঞপ্তির সামগ্রী লুকান"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"সমস্ত কর্মস্থলের বিজ্ঞপ্তির কন্টেন্ট দেখুন"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"সংবেদনশীল কর্মস্থলের বিজ্ঞপ্তির কন্টেন্ট লুকান"</string>
     <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>
@@ -2799,13 +2885,17 @@
     <string name="notification_importance_min" msgid="5455049524984686275">"কোনো শব্দ বা ভিজ্যুয়াল বাধা নেই"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"শব্দ করবে না"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"শব্দ করে"</string>
-    <string name="notification_importance_high" msgid="2082429479238228527">"শব্দ করে ও স্ক্রীনে ভেসে ওঠে"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"সাউন্ড হবে ও স্ক্রিনে ভেসে উঠবে"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"নিম্ন"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"মাঝারি"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"বেশি"</string>
     <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="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>
@@ -2821,7 +2911,7 @@
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"বন্ধ করুন"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"বাতিল করুন"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"(ভিআর)VR সহায়তাকারী পরিষেবাগুলি"</string>
-    <string name="no_vr_listeners" msgid="2689382881717507390">"vr সহায়তাকারী পরিষেবা হিসাবে চলার জন্য কোনো অ্যাপ্লিকেশান ইনস্টল করা নেই৷"</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"vr সহায়তাকারী পরিষেবা হিসেবে চলার জন্য কোনো অ্যাপ্লিকেশান ইনস্টল করা নেই৷"</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"<xliff:g id="SERVICE">%1$s</xliff:g> এর জন্য (ভিআর)VR পরিষেবার অ্যাক্সেসের অনুমতি দেবেন?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"ভার্চুয়াল রিয়ালিটি মোডে আপনি যখন অ্যাপ্লিকেশানগুলি ব্যবহার করবেন তখন <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> চালাতে পারবেন৷"</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"যখন ডিভাইসটি (ভিআর)VR মোডে থাকে"</string>
@@ -2833,8 +2923,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>
@@ -2863,21 +2951,21 @@
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"বিজ্ঞপ্তির ডট দেখান"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'বিরক্ত করবেন না\' ওভাররাইড করুন"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"যখন শুধুমাত্র অগ্রাধিকার সাপেক্ষে \'বিরক্ত করবেন না\' সেট করা থাকবে তখন বাধাদানের ক্ষেত্রে এই বিজ্ঞপ্তিগুলিকে চালু থাকতে দিন"</string>
-    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"লক স্ক্রীনে"</string>
+    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"লক স্ক্রিনে"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"অবরুদ্ধ"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"অগ্রাধিকার"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"সংবেদনশীল"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"সম্পন্ন হয়েছে"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"গুরুত্ব"</string>
     <string name="notification_show_lights_title" msgid="7671781299688190532">"মিটমিট করা আলো"</string>
-    <string name="notification_vibrate_title" msgid="1646667807969755957">"কম্পন"</string>
-    <string name="notification_channel_sound_title" msgid="3899212238513507941">"শব্দ"</string>
+    <string name="notification_vibrate_title" msgid="1646667807969755957">"ভাইব্রেট"</string>
+    <string name="notification_channel_sound_title" msgid="3899212238513507941">"সাউন্ড"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"মুছুন"</string>
-    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"নতুন নাম দিন"</string>
+    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"নাম বদলান"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"নিয়মের নাম"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"নিয়মের নাম লিখুন"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"নিয়মের নামটি ইতিমধ্যেই ব্যবহারে রয়েছে"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"আরো জুড়ুন"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"আরও জুড়ুন"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"নিয়ম মুছুন"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"কোন ধরণের নিয়ম চান বাছুন"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"\"<xliff:g id="RULE">%1$s</xliff:g>\" নিয়ম মুছে ফেলবেন?"</string>
@@ -2892,9 +2980,9 @@
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"এর জন্য ইভেন্টগুলি চলাকালীন"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"<xliff:g id="CALENDAR">%1$s</xliff:g> এর জন্য ইভেন্টগুলি চলাকালীন"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"যেকোনো ক্যালেন্ডার"</string>
-    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"যেখানে উত্তর হ\'ল <xliff:g id="REPLY">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"যেখানে উত্তর হল <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"যেকোনো ক্যালেন্ডার"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"যখানে উত্তর হ\'ল"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"যেখানে উত্তর হল"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"হ্যাঁ, হয়তো বা উত্তর দেয় নি"</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"হ্যাঁ অথবা হয়তো"</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"হ্যাঁ"</string>
@@ -2910,14 +2998,15 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> থেকে <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"কল"</string>
-    <string name="zen_mode_messages" msgid="5886440273537510894">"বার্তাগুলি"</string>
-    <string name="zen_mode_all_messages" msgid="6449223378976743208">"সমস্ত বার্তা"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"মেসেজ"</string>
+    <string name="zen_mode_all_messages" msgid="6449223378976743208">"সমস্ত মেসেজ"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"নির্বাচিত বার্তাগুলি"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"যে কোনো ব্যক্তির কাছ থেকে"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"শুধুমাত্র পরিচিতিদের থেকে"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"শুধুমাত্র তারকাচিহ্নিত পরিচিতিদের থেকে"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"কোনো কিছুই নয়"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"অ্যালার্মগুলি"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"অ্যালার্ম সর্বদা অগ্রাধিকার পায় এবং সেগুলি থেকে আওয়াজ হয়"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"অনুস্মারকগুলি"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ইভেন্টগুলি"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"সমস্ত কলার"</string>
@@ -2943,9 +3032,9 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"শুধুমাত্র <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> পর্যন্ত অ্যালার্মগুলি পরিবর্তন করুন"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"সর্বদা বাধা দেওয়াতে পরিবর্তন করুন"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"স্ক্রীন চালু থাকলে অবরুদ্ধ করুন"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রীনে দেখতে পাওয়া বা উপস্থিত হওয়া থেকে আটকান"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রিনে দেখতে পাওয়া বা উপস্থিত হওয়া থেকে আটকান"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"স্ক্রীন বন্ধ থাকলে অবরুদ্ধ করুন"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রীণ চালু করা বা বিজ্ঞপ্তি লাইটটি জ্বলা ও নেভা থেকে আটকান"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"বিরক্ত করবেন না\' দ্বারা নীরব করা বিজ্ঞপ্তিগুলিকে স্ক্রিন চালু করা বা বিজ্ঞপ্তি লাইটটি জ্বলা ও নেভা থেকে আটকান"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"\'বিরক্ত করবেন না\' ব্যবহার করলে নীরব করা বিজ্ঞপ্তিগুলির স্ক্রীন চালু হওয়া থেকে আটকায়"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"বন্ধ আছে"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"যখন স্ক্রীন চালু থাকে"</string>
@@ -2965,19 +3054,14 @@
     <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>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"এই ডিভাইসটি চালু হওয়ার আগে সেটি আপনার প্যাটার্ন চাইবে এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য প্যাটার্ন দরকার?"</string>
-    <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_pin" msgid="2317181134653424679">"এই ডিভাইসটি চালু হওয়ার আগে সেটি আপনার পিন চাইবে এমন পদ্ধতির মাধ্যমে আরও সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, মেসেজ বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য পিন দরকার?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"এই ডিভাইসটি চালু হওয়ার আগে সেটি আপনার প্যাটার্ন চাইবে এমন পদ্ধতির মাধ্যমে আরও সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, মেসেজ বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য প্যাটার্ন দরকার?"</string>
+    <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="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>
@@ -2997,14 +3081,14 @@
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"সমর্থিত লিঙ্কগুলি"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"অন্যান্য ডিফল্টগুলি"</string>
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> এ ব্যবহৃত <xliff:g id="SIZE">%1$s</xliff:g>"</string>
-    <string name="storage_type_internal" msgid="6042049833565674948">"অভ্যন্তরীণ সঞ্চয়স্থান"</string>
-    <string name="storage_type_external" msgid="7738894330670001898">"বাহ্যিক সঞ্চয়স্থান"</string>
+    <string name="storage_type_internal" msgid="6042049833565674948">"ইন্টারনাল স্টোরেজ"</string>
+    <string name="storage_type_external" msgid="7738894330670001898">"এক্সটারনাল স্টোরেজ"</string>
     <string name="app_data_usage" msgid="7942375313697452803">"অ্যাপ ডেটা ব্যবহার"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="DATE">%2$s</xliff:g> পর্যন্ত <xliff:g id="SIZE">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="storage_used" msgid="7128074132917008743">"ব্যবহৃত সঞ্চয়স্থানের পরিমান"</string>
     <string name="change" msgid="6657848623929839991">"পরিবর্তন করুন"</string>
-    <string name="change_storage" msgid="600475265207060436">"সঞ্চয়স্থান পরিবর্তন করুন"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"অ্যাপ বিজ্ঞপ্তিগুলি"</string>
+    <string name="change_storage" msgid="600475265207060436">"স্টোরেজ পরিবর্তন করুন"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"অ্যাপ বিজ্ঞপ্তি"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"চালু আছে"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"সবকিছু বন্ধ আছে"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%1$d</xliff:g>টি বিভাগ বন্ধ আছে"</string>
@@ -3029,7 +3113,7 @@
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"কোন অনুমতি দেওয়া হয় নি"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"কোন অনুমতির অনুরোধ জানানো হয় নি"</string>
-    <string name="filter_all_apps" msgid="1988403195820688644">"সমস্ত অ্যাপ্লিকেশান"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"সমস্ত অ্যাপ্লিকেশন"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"ইনস্টল করা অ্যাপগুলি"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"ঝটপট অ্যাপ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
@@ -3043,10 +3127,10 @@
     <string name="advanced_apps" msgid="4812975097124803873">"উন্নত"</string>
     <string name="configure_apps" msgid="6685680790825882528">"অ্যাপ্লিকেশান কনফিগার করুন"</string>
     <string name="unknown_app" msgid="5275921288718717656">"অজানা অ্যাপ্লিকেশান"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"অ্যাপ্লিকেশানের অনুমতি"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"অ্যাপ্লিকেশনের অনুমতি"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"যে অ্যাপগুলি <xliff:g id="APPS">%1$s</xliff:g> ব্যবহার করছে"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"জাগাতে আলতো চাপুন"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"ডিভাইসকে জাগাতে স্ক্রীনের যেকোনো জায়গায় দুবার আলতো চাপুন"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"ডিভাইসকে জাগাতে স্ক্রিনের যেকোনও জায়গায় দুবার ট্যাপ করুন"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"লিঙ্কগুলি খুলছে"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"সমর্থিত লিঙ্কগুলি খোলে না"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> খোলে"</string>
@@ -3063,7 +3147,7 @@
     <string name="default_apps_title" msgid="1660450272764331490">"ডিফল্ট"</string>
     <string name="default_for_work" msgid="9152194239366247932">"কর্মস্থলের জন্য ডিফল্ট"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"সহায়তা এবং ভয়েস ইনপুট"</string>
-    <string name="default_assist_title" msgid="8868488975409247921">"অ্যাপ্লিকেশান সহায়তা"</string>
+    <string name="default_assist_title" msgid="8868488975409247921">"অ্যাপ্লিকেশন সহায়তা"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> -কে আপনার সহায়ক করবেন?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"সহায়কটি আপনার স্ক্রীনে প্রদর্শিত বা অ্যাপ্লিকেশানগুলির মধ্যে অ্যাক্সেসযোগ্য তথ্য সহ, আপনার সিস্টেমে ব্যবহারে থাকা অ্যাপ্লিকেশানগুলির তথ্য পড়তে পারবে৷"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"সম্মত"</string>
@@ -3075,7 +3159,7 @@
     <string name="default_app" msgid="6864503001385843060">"(ডিফল্ট)"</string>
     <string name="system_app" msgid="9068313769550747372">"(সিস্টেম)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(সিস্টেম ডিফল্ট)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"অ্যাপ্লিকেশানের সঞ্চয়স্থান"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"অ্যাপ্লিকেশনের স্টোরেজ"</string>
     <string name="usage_access" msgid="5479504953931038165">"ব্যবহার অ্যাক্সেস"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"ব্যবহার অ্যাক্সেসের অনুমতি"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"পছন্দের অ্যাপ্লিকেশানগুলির ব্যবহার"</string>
@@ -3095,6 +3179,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>
@@ -3110,8 +3203,8 @@
     <string name="additional_permissions" msgid="6463784193877056080">"অতিরিক্ত অনুমতিগুলি"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"আরো <xliff:g id="COUNT">%1$d</xliff:g>টি"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"ত্রুটির প্রতিবেদন শেয়ার করবেন?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"আপনার আইটি প্রশাসক এই ডিভাইসটির সমস্যা নিবারণে সহায়তা করতে একটি ত্রুটির প্রতিবেদন চেয়েছেন৷ অ্যাপ্লিকেশান এবং ডেটা শেয়ার করা হতে পারে৷"</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"আপনার আইটি প্রশাসক এই ডিভাইসটির সমস্যা নিবারণে সহায়তা করতে একটি ত্রুটির প্রতিবেদন চেয়েছেন৷ অ্যাপ্লিকেশানগুলি এবং ডেটা শেয়ার করা হতে পারে এবং আপনার ডিভাইসটিকে অস্থায়ীভাবে ধীর করে দিতে পারে৷"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"আপনার আইটি প্রশাসক এই ডিভাইসটির সমস্যা নিবারণে সহায়তা করতে একটি ত্রুটির প্রতিবেদন চেয়েছেন৷ অ্যাপ্লিকেশন এবং ডেটা শেয়ার করা হতে পারে৷"</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"আপনার আইটি প্রশাসক এই ডিভাইসটির সমস্যা নিবারণে সহায়তা করতে একটি ত্রুটির প্রতিবেদন চেয়েছেন৷ অ্যাপ্লিকেশনগুলি এবং ডেটা শেয়ার করা হতে পারে এবং আপনার ডিভাইসটিকে অস্থায়ীভাবে ধীর করে দিতে পারে৷"</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"এই ত্রুটির প্রতিবেদনটি আপনার আইটি প্রশাসকের সাথে শেয়ার করা হচ্ছে৷ আরো বিস্তারিত জানার জন্য তাদের সাথে যোগাযোগ করুন৷"</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"শেয়ার করুন"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"প্রত্যাখ্যান করুন"</string>
@@ -3119,28 +3212,28 @@
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"শুধুমাত্র ডিভাইটি চার্জ করুন"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"পাওয়ার সরবরাহ করুন"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"সংযুক্ত ডিভাইসটি চার্জ করুন। শুধুমাত্র USB চার্জিং সমর্থিত ডিভাইসেই এটি করা যাবে।"</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ফাইলগুলি স্থানান্তর করুন"</string>
-    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"অন্য ডিভাইসে ফাইলগুলিকে স্থানান্তর করুন"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ফটোগুলির স্থানান্তর (PTP)"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ফাইল ট্রান্সফার করুন"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"অন্য ডিভাইসে ফাইল ট্রান্সফার করুন"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ফটো ট্রান্সফার করুন (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"যদি MTP সমর্থিত না হয় তবে ফটো বা ফাইলগুলি স্থানান্তর করুন (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI হিসাবে ডিভাইসটি ব্যবহার করুন"</string>
-    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI হিসাবে এই ডিভাইসটি ব্যবহার করুন"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI হিসেবে ডিভাইসটি ব্যবহার করুন"</string>
+    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI হিসেবে এই ডিভাইসটি ব্যবহার করুন"</string>
     <string name="usb_use" msgid="3256040963685055320">"এটি করতে USB ব্যবহার করুন"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"এই ডিভাইসটি চার্জ করা হচ্ছে"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"সংযুক্ত ডিভাইসটি চার্জ করা হচ্ছে"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ফাইলগুলি স্থানান্তর করা হচ্ছে"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ফটোগুলি স্থানান্তর করা হচ্ছে (PTP)"</string>
-    <string name="usb_summary_MIDI" msgid="5687906612187885908">"ডিভাইসটিকে MIDI হিসাবে ব্যবহার করা হচ্ছে"</string>
+    <string name="usb_summary_MIDI" msgid="5687906612187885908">"ডিভাইসটিকে MIDI হিসেবে ব্যবহার করা হচ্ছে"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"ব্যাকগ্রাউন্ড পরীক্ষা"</string>
     <string name="background_check_title" msgid="4534254315824525593">"সম্পূর্ণ পটভূমি অ্যাক্সেস করুন"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"স্ক্রীন থেকে পাঠ্য ব্যবহার করুন"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"সহায়তা অ্যাপ্লিকেশানটিকে স্ক্রীনের সামগ্রীসমূহকে পাঠ্য হিসাবে অ্যাক্সেস করার অনুমতি দিন"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"স্ক্রীনশট ব্যবহার করুন"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"সহায়তা অ্যাপ্লিকেশানটিকে স্ক্রীনের একটি চিত্র অ্যাক্সেস করার অনুমতি দিন"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"সহায়তা অ্যাপ্লিকেশনটিকে স্ক্রিনের সামগ্রীসমূহকে টেক্সট হিসাবে অ্যাক্সেস করার অনুমতি দিন"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"স্ক্রিনশট ব্যবহার করুন"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"সহায়তা অ্যাপ্লিকেশনটিকে স্ক্রিনের একটি ছবি অ্যাক্সেস করার অনুমতি দিন"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"স্ক্রীন ফ্ল্যাশ করুন"</string>
-    <string name="assist_flash_summary" msgid="9160668468824099262">"যখন সহায়তা অ্যাপ্লিকেশান স্ক্রীন বা স্ক্রীনশট থেকে পাঠ্য অ্যাক্সেস করে তখন স্ক্রীনের প্রান্তগুলিকে ফ্ল্যাশ করুন"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"সহায়তা অ্যাপ্লিকেশান আপনার দেখা স্ক্রীনের তথ্যের উপর ভিত্তি করে আপনাকে সহায্য করতে পারে৷ কিছু অ্যাপ্লিকেশান আপনাকে ইন্টিগ্রেটেড সহায়তা দিতে উভয় লঞ্চার এবং ভয়েস ইনপুট পরিষেবাগুলিকে সমর্থন করে৷"</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"যখন সহায়তা অ্যাপ্লিকেশন স্ক্রিন বা স্ক্রিনশট থেকে টেক্সট অ্যাক্সেস করে তখন স্ক্রিনের প্রান্তগুলিকে ফ্ল্যাশ করুন"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"সহায়তা অ্যাপ্লিকেশন আপনার দেখা স্ক্রিনের তথ্যের উপর ভিত্তি করে আপনাকে সহায্য করতে পারে৷ কিছু অ্যাপ্লিকেশন আপনাকে ইন্টিগ্রেটেড সহায়তা দিতে উভয় লঞ্চার এবং ভয়েস ইনপুট পরিষেবাগুলিকে সমর্থন করে৷"</string>
     <string name="average_memory_use" msgid="829566450150198512">"গড় মেমরির ব্যবহার"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"সর্বাধিক মেমরির ব্যবহার"</string>
     <string name="memory_usage" msgid="1781358557214390033">"মেমরির ব্যবহার"</string>
@@ -3187,8 +3280,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>
@@ -3209,14 +3302,14 @@
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"আপনার স্ক্রীন আনলক না করেই দ্রুত ক্যামেরা খুলুন"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"প্রদর্শনের আকার"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"স্ক্রীনের আইটেমগুলিকে ছোট বা বড় করুন"</string>
-    <string name="screen_zoom_keywords" msgid="9176477565403352552">"ঘনত্ব হিসাবে প্রদর্শন, স্ক্রিন জুম করা, স্কেল, স্কেলের মাপ"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"ঘনত্ব হিসেবে প্রদর্শন, স্ক্রিন জুম করা, স্কেল, স্কেলের মাপ"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"স্ক্রীনের আইটেমগুলিকে ছোট বা বড় করুন। আপনার স্ক্রীনের কিছু অ্যাপ্লিকেশান অবস্থান পরিবর্তন করতে পারে।"</string>
-    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"পূর্বরূপ দেখুন"</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"প্রিভিউ"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"আরো ছোট করুন"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"আরো বড় করুন"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"অ"</string>
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"প"</string>
-    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"হাই সমীর!"</string>
+    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"হাই সুমন!"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"হাই, আজকে কফি খাওয়া যাক, দেখা করবে?"</string>
     <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"ভাল কথা৷ আমি একটি জায়গা জানি যেটা এখান থেকে খুব দূরে নয়৷"</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"ঠিক আছে!"</string>
@@ -3244,7 +3337,7 @@
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> হল ডিফল্ট"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"চালু / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"বন্ধ"</string>
-    <string name="backup_disabled" msgid="485189128759595412">"ব্যাক আপ নেওয়া অক্ষম করা রয়েছে"</string>
+    <string name="backup_disabled" msgid="485189128759595412">"ব্যাক-আপ নেওয়া অক্ষম করা রয়েছে"</string>
     <string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g> এ আপডেট করা হয়েছে"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"কাজটি অনুমোদিত নয়"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"ভলিউম পরিবর্তন করা যাবে না"</string>
@@ -3275,9 +3368,18 @@
     <string name="condition_work_title" msgid="7293722361184366648">"কর্মস্থলের প্রোফাইল বন্ধ রয়েছে"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"অ্যাপ, পটভূমি সিঙ্ক এবং আপনার কর্মস্থলের প্রোফাইলের সাথে সম্পর্কিত অন্য বৈশিষ্ট্যগুলিকে বন্ধ করা হয়েছে৷"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"নাইট লাইট চালু আছে"</string>
-    <string name="condition_night_display_summary" msgid="5443722724310650381">"স্ক্রীন হলুদাভ বাদামি আভা ধারণ করে৷ এটি আপনাকে ঘুমিয়ে পড়তে সহায়তা করতে পারে৷"</string>
+    <string name="condition_night_display_summary" msgid="5443722724310650381">"স্ক্রিন হলুদাভ বাদামি আভা ধারণ করে৷ এটি আপনাকে ঘুমিয়ে পড়তে সহায়তা করতে পারে৷"</string>
     <string name="suggestions_title" 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>
@@ -3296,8 +3398,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>
@@ -3317,23 +3418,23 @@
       <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>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"অবাধ ডেটার ব্যবহার"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"ডেটা সেভার চালু থাকার সময়ে অবাধ ডেটা অ্যাক্সেসের অনুমতি দিন"</string>
-    <string name="home_app" msgid="4066188520886810030">"হোম অ্যাপ্লিকেশান"</string>
+    <string name="home_app" msgid="4066188520886810030">"হোম অ্যাপ"</string>
     <string name="no_default_home" msgid="7184117487704520238">"কোনো ডিফল্ট হোম নেই"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"নিরাপদ স্টার্ট-আপ"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"আপনার ডিভাইসটিকে চালু করার জন্য প্যাটার্নের প্রয়োজন আছে। বন্ধ থাকার সময়ে, এই ডিভাইসটি কল, বার্তা, বিজ্ঞপ্তি বা অ্যালার্মগুলি পেতে পারবে না।"</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"আপনার ডিভাইসটিকে চালু করার জন্য প্যাটার্নের প্রয়োজন আছে। বন্ধ থাকার সময়ে, এই ডিভাইসটি কল, মেসেজ, বিজ্ঞপ্তি বা অ্যালার্মগুলি পেতে পারবে না।"</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"আপনার ডিভাইস চালু করার জন্য পিন প্রয়োজন। বন্ধ থাকার সময়ে এই ডিভাইসটি কল, মেসেজ, বিজ্ঞপ্তি বা অ্যালার্মগুলি পেতে পারবে না।"</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"আপনার ডিভাইসটিকে চালু করার জন্য পাসওয়ার্ডের প্রয়োজন আছে। বন্ধ থাকার সময়ে, এই ডিভাইসটি কল, বার্তা, বিজ্ঞপ্তি বা অ্যালার্মগুলি পেতে পারবে না।"</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"আপনার ডিভাইসটিকে চালু করার জন্য পাসওয়ার্ডের প্রয়োজন আছে। বন্ধ থাকার সময়ে, এই ডিভাইসটি কল, মেসেজ, বিজ্ঞপ্তি বা অ্যালার্মগুলি পেতে পারবে না।"</string>
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"অন্য একটি আঙ্গুলের ছাপ যোগ করুন"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"একটি আলাদা আঙুল দিয়ে আনলক করুন"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"চালু আছে / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"বন্ধ আছে / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"কখনই স্বয়ংক্রিয়ভাবে চালু করবেন না"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"কখনই নিজে থেকে চালু হবে না"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s ব্যাটারি থাকলে স্বয়ংক্রিয়ভাবে চালু করুন"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"ব্যাটারি অপটিমাইজেশান ব্যবহার করা হচ্ছে না"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"যদি ডিভাইসটি লক থাকে তাহলে, বিজ্ঞপ্তিগুলির মধ্যে উত্তর বা অন্যান্য পাঠ্য লেখা আটকায়"</string>
@@ -3347,7 +3448,7 @@
     <string name="notification_log_details_group" msgid="2430467015200368698">"গোষ্ঠী"</string>
     <string name="notification_log_details_group_summary" msgid="7945543958255585829">"(সারাংশ)"</string>
     <string name="notification_log_details_visibility" msgid="2552873780715930971">"দৃশ্যমানতা"</string>
-    <string name="notification_log_details_public_version" msgid="4247242364605495240">"সর্বজনীনন-সংস্করণ"</string>
+    <string name="notification_log_details_public_version" msgid="4247242364605495240">"সর্বজনীন-ভার্সন"</string>
     <string name="notification_log_details_priority" msgid="8371354971235991398">"অগ্রাধিকার"</string>
     <string name="notification_log_details_importance" msgid="2153168790791683139">"গুরুত্ব"</string>
     <string name="notification_log_details_explanation" msgid="1914295130775393551">"ব্যাখ্যা"</string>
@@ -3363,8 +3464,8 @@
     <string name="notification_log_details_icon" msgid="8939114059726188218">"আইকন"</string>
     <string name="notification_log_details_parcel" msgid="243148037601903212">"পার্সেলের আকার"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
-    <string name="notification_log_details_sound" msgid="5506232879598808099">"শব্দ"</string>
-    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"কম্পন"</string>
+    <string name="notification_log_details_sound" msgid="5506232879598808099">"সাউন্ড"</string>
+    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"ভাইব্রেট"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"ডিফল্ট"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"কোনো কিছুই নয়"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"রেঙ্কিং অবজেক্ট অনুপস্থিত।"</string>
@@ -3379,10 +3480,9 @@
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager রেট-লিমিটিং আবার সেট করুন"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager রেট-লিমিটিং আবার সেট করা হয়েছে"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"লক স্ক্রিন বিজ্ঞপ্তিগুলি নিয়ন্ত্রণ করুন"</string>
-    <string name="notification_suggestion_summary" msgid="8521159741445416875">"বিজ্ঞপ্তির সামগ্রী দেখান বা লুকান"</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>
@@ -3393,13 +3493,13 @@
     <string name="demo_mode" msgid="2798762752209330277">"সিস্টেম UI ডেমো মোড"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"দ্রুত সেটিংস ডেভেলপার টাইলস"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"আপনাকে সাহায্য করতে আমরা প্রস্তুত"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘন্টা এখানে রয়েছি"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘন্টা এখানে রয়েছি"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"যে কোনো সমস্যার সমাধান করার জন্য আমাদের সহায়তা টিম এখানে রয়েছে"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"আমাদের সহায়তা টিম সপ্তাহে সাত দিন ২৪ ঘন্টা এখানে রয়েছে"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"সহায়তা অনুসন্ধান করুন বা সহায়তা প্রদান চালু থাকার সময়ে আমাদের সাথে যোগযোগ করুন (স্থানীয় সময়):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘণ্টা এখানে রয়েছি"</string>
+    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"আমরা আপনাকে সহায়তা করার জন্য সপ্তাহে সাত দিন ২৪ ঘণ্টা এখানে রয়েছি"</string>
+    <string name="support_escalation_summary" msgid="8473084168776014405">"যেকোনও সমস্যার সমাধান করার জন্য আমাদের সহায়তা টিম এখানে রয়েছে"</string>
+    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"আমাদের সহায়তা টিম সপ্তাহে সাত দিন ২৪ ঘণ্টা এখানে রয়েছে"</string>
+    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"সহায়তা খুঁজুন বা সহায়তা প্রদান চালু থাকার সময়ে আমাদের সাথে যোগযোগ করুন (স্থানীয় সময়):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ফোনের মাধ্যমে সহায়তা প্রদান করার সময় (স্থানীয় সময়)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"সহায়তা অনুসন্ধান করুন বা টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"সহায়তা খুঁজুন বা টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
     <string name="support_country_list_title" msgid="823853371280534111">"এর জন্য সমর্থন:"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
@@ -3408,9 +3508,9 @@
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"ফোন"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"চ্যাট করুন"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"টিপ এবং কৌশলগুলি এক্সপ্লোর করুন"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"সহায়তায় অনুসন্ধান করুন এবং মতামত পাঠান"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"সহায়তায় খুঁজুন এবং মতামত পাঠান"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"সহায়তায় যোগাযোগ করুন"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"প্রবেশ করুন"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"সাইন-ইন করুন"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"সাইন ইন করতে পারছেন না?"</string>
     <string name="support_disclaimer_title" msgid="4825302018208770031">"সিস্টেমের তথ্য পাঠান"</string>
     <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"আর দেখাবেন না"</string>
@@ -3440,38 +3540,45 @@
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"হেডফোন"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"পেরিফেরাল ইনপুট"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ব্লুটুথ"</string>
-    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"সঞ্চয়স্থান পরিচালনা করুন"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"সঞ্চয়স্থান খালি করার কাজে সহায়তা করার জন্য, সঞ্চয়স্থানের পরিচালক আপনার ডিভাইস থেকে ব্যাক আপ নেওয়া ফটো এবং ভিডিওগুলিকে সরিয়ে দেয়৷"</string>
+    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"স্টোরেজ পরিচালনা করুন"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"স্টোরেজ খালি করার কাজে সাহায্য করার জন্য, স্টোরেজ ম্যানেজার আপনার ডিভাইস থেকে ব্যাক-আপ নেওয়া ফটো এবং ভিডিওগুলিকে সরিয়ে দেয়৷"</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ফটো এবং ভিডিওগুলিকে সরান"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"সঞ্চয়স্থানের পরিচালক"</string>
-    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"স্বয়ংক্রিয়"</string>
+    <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"অটোমেটিক"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ম্যানুয়াল"</string>
-    <string name="deletion_helper_preference_title" msgid="5271510052022285884">"এখনই স্থান খালি করুন"</string>
+    <string name="deletion_helper_preference_title" msgid="5271510052022285884">"এখনই জায়গা খালি করুন"</string>
     <string name="gesture_preference_title" msgid="5280023307132819052">"অঙ্গভঙ্গিগুলি"</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_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="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="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="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="assist_gesture_title" msgid="7746563137898655539">"সহায়ক সঙ্কেত"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"সংবেদনশীলতা"</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="gesture_setting_on" msgid="3455094265233870280">"চালু আছে"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"বন্ধ আছে"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"বুটলোডার ইতিমধ্যেই আনলক করা হয়েছে"</string>
@@ -3484,14 +3591,17 @@
     <string name="web_action_section_title" msgid="7364647086538399136">"ঝটপট অ্যাপগুলি"</string>
     <string name="instant_apps_account" msgid="1433620209791992528">"ঝটপট অ্যাপগুলির অ্যাকাউন্ট"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ইনস্টল করা অ্যাপ্স"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"আপনার সঞ্চয়স্থান এখন সঞ্চয়স্থান পরিচালকের দ্বারা পরিচালিত হচ্ছে"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"আপনার স্টোরেজ এখন স্টোরেজ ম্যানেজারের দ্বারা পরিচালিত হচ্ছে"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> এর অ্যাকাউন্ট"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"কনফিগার"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"ডেটা স্বয়ংক্রিয়ভাবে সিঙ্ক করুন"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"ডেটা অটোমেটিক সিঙ্ক হবে"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"ব্যাক্তিগত ডেটা স্বয়ংক্রিয়ভাবে সিঙ্ক করুন"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"কাজের ডেটা স্বয়ংক্রিয়ভাবে সিঙ্ক করুন"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"অ্যাপকে স্বয়ংক্রিয়ভাবে ডেটা রিফ্রেশ করতে দিন"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"অ্যাপকে অটোমেটিক ডেটা রিফ্রেশ করতে দিন"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"অ্যাকাউন্ট সিঙ্ক"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g>টির মধ্যে <xliff:g id="ID_1">%1$d</xliff:g>টি আইটেমের জন্য সিঙ্ক চালু আছে"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"সমস্ত আইটেমের জন্য সিঙ্ক চালু আছে"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"সমস্ত আইটেমের জন্য সিঙ্ক বন্ধ আছে"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"পরিচালিত ডিভাইসের তথ্য"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"আপনার প্রতিষ্ঠান দ্বারা পরিচালিত পরিবর্তন এবং সেটিংগুলি"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দ্বারা পরিচালিত পরিবর্তন এবং সেটিংগুলি"</string>
@@ -3515,7 +3625,7 @@
     <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"অবস্থানের অনুমতি"</string>
     <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"মাইক্রোফোনের অনুমতি"</string>
     <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"ক্যামেরার অনুমতি"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"ডিফল্ট অ্যাপগুলি"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"ডিফল্ট অ্যাপ"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>টি অ্যাপ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>টি অ্যাপ</item>
@@ -3528,8 +3638,8 @@
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"বৈশ্বিক HTTP প্রক্সী সেট করা আছে"</string>
     <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"বিশ্বস্ত শংসাপত্রগুলি"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
-      <item quantity="one">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA শংসাপত্র</item>
-      <item quantity="other">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA শংসাপত্র</item>
+      <item quantity="one">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA সার্টিফিকেট</item>
+      <item quantity="other">কমপক্ষে <xliff:g id="COUNT_1">%d</xliff:g>টি CA সার্টিফিকেট</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"প্রশাসক ডিভাইসটি লক করতে ও পাসওয়ার্ড আবার সেট করতে পারেন"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"প্রশাসক ডিভাইসের সমস্ত ডেটা মুছে দিতে পারবেন"</string>
@@ -3542,7 +3652,7 @@
     <string name="do_disclosure_generic" msgid="8653670456990823307">"আপনার প্রতিষ্ঠান এই ডিভাইসটি পরিচালনা করে।"</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"এই ডিভাইসটি <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দ্বারা পরিচালিত।"</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
-    <string name="do_disclosure_learn_more" msgid="2416766240581561009">"আরো জানুন"</string>
+    <string name="do_disclosure_learn_more" msgid="2416766240581561009">"আরও জানুন"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
       <item quantity="one">ক্যামেরা অ্যাপগুলি</item>
       <item quantity="other">ক্যামেরা অ্যাপগুলি</item>
@@ -3561,7 +3671,7 @@
     <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"ফটো এবং ভিডিওগুলি"</string>
-    <string name="storage_music_audio" msgid="789779084825206838">"গান এবং অডিও"</string>
+    <string name="storage_music_audio" msgid="789779084825206838">"মিউজিক ও অডিও"</string>
     <string name="storage_games" msgid="7703159201697117621">"গেম্স"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"অন্যান্য অ্যাপ্লিকেশান"</string>
     <string name="storage_files" msgid="8581083146777364063">"ফাইল"</string>
@@ -3572,6 +3682,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>
@@ -3579,11 +3690,17 @@
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;নিশ্চিত করুন যে এই অ্যাপটি বিশ্বাসযোগ্য&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; কোনও তথ্য নিজে থেকে পূরণ করা যাবে কি না, তা নির্ণয় করতে &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; অ্যাপটি আপনার স্ক্রিনে যা দেখা যাচ্ছে সেই অনুযায়ী সিদ্ধান্ত নেয়।"</string>
     <string name="device_theme" msgid="4571803018917608588">"ডিভাইসের থিম"</string>
     <string name="default_theme" msgid="7085644992078579076">"ডিফল্ট"</string>
-    <string name="storage_manager_indicator" msgid="1516810749625915020">"সঞ্চয়স্থান পরিচালক: <xliff:g id="STATUS">^1</xliff:g>"</string>
+    <string name="storage_manager_indicator" msgid="1516810749625915020">"স্টোরেজ ম্যানেজার: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"বন্ধ আছে"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"চালু আছে"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"ঝটপট অ্যাপ"</string>
-    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"সঞ্চয়স্থান পরিচালক বন্ধ করবেন?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"সিনেমা এবং TV অ্যাপগুলি"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"সঞ্চয়স্থান ব্যবহার হয়েছে"</string>
+    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"স্টোরেজ ম্যানেজার বন্ধ করবেন?"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"সিনেমা ও টিভি অ্যাপ"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"পরিষেবা প্রদানকারীর ব্যবস্থামূলক তথ্য"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ট্রিগার পরিষেবা প্রদানকারীর ব্যবস্থা"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"নতুন এবং উত্তেজনাপূর্ণ আর কি আছে?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"সেরা ৫টি বৈশিষ্ট্য ব্যবহার করে দেখুন"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS রেজিস্ট্রেশনের স্থিতি"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"রেজিস্টার করা"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"রেজিস্টার করা নয়"</string>
 </resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index b5de1a9f56073b2d80024183ad40eb10d269085f..edb66b6cb2133c2977c1aa96024d0f5d72e0d9d6 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -62,8 +62,8 @@
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"Mali"</item>
     <item msgid="6986443533756848935">"Zadano"</item>
-    <item msgid="38373998008112077">"Velika"</item>
-    <item msgid="7635254317531872272">"Najveće"</item>
+    <item msgid="38373998008112077">"Veliki"</item>
+    <item msgid="7635254317531872272">"Najveći"</item>
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
@@ -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>
@@ -175,6 +165,14 @@
     <item msgid="937786527870979616">"MSCHAPv2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ništa"</item>
+    <item msgid="7480272092408291086">"MSCHAPv2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ništa"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -192,7 +190,7 @@
     <item msgid="168893341855953140">"Automatska konfiguracija proksija"</item>
   </string-array>
   <string-array name="apn_auth_entries">
-    <item msgid="3856896061242872146">"Nema"</item>
+    <item msgid="3856896061242872146">"Ništa"</item>
     <item msgid="5756844015743664882">"PAP"</item>
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ili CHAP"</item>
@@ -242,7 +240,7 @@
     <item msgid="4979188868761515915">"približna lokacija"</item>
     <item msgid="5789673140227507995">"tačna lokacija"</item>
     <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"vibriraj"</item>
+    <item msgid="5387405117297558954">"vibracija"</item>
     <item msgid="3434165993711230924">"čitaj kontakte"</item>
     <item msgid="616161687718081936">"prromijeni kontakte"</item>
     <item msgid="7638002295329050091">"čitaj zapisnik poziva"</item>
@@ -271,11 +269,11 @@
     <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 zvuka zvona"</item>
-    <item msgid="6325739889222559394">"jačina zvuka za medijske sadržaje"</item>
+    <item msgid="4270236897655923007">"jačina zvona"</item>
+    <item msgid="6325739889222559394">"jačina zvuka medija"</item>
     <item msgid="5762123934816216821">"jačina zvuka alarma"</item>
     <item msgid="785049718065337473">"jačina zvuka za obavještenja"</item>
     <item msgid="6700305533746877052">"jačina zvuka za Bluetooth vezu"</item>
@@ -309,7 +307,7 @@
     <item msgid="6602854600289714121">"Lokacija"</item>
     <item msgid="8677040780775113033">"Lokacija"</item>
     <item msgid="1660743989948992916">"Lokacija"</item>
-    <item msgid="8791172739860195290">"Vibriraj"</item>
+    <item msgid="8791172739860195290">"Vibracija"</item>
     <item msgid="383413555642128046">"Čitaj kontakte"</item>
     <item msgid="3654594895269697313">"Promijeni kontakte"</item>
     <item msgid="7928393476362362538">"Čitaj zapisnik poziva"</item>
@@ -341,8 +339,8 @@
     <item msgid="3265262911688671938">"Audio fokus"</item>
     <item msgid="2098976479485046797">"Centar za upravljanje zvukom"</item>
     <item msgid="5660213838861789350">"Jačina glasa"</item>
-    <item msgid="7983336752371254444">"Jačina zvuka zvona"</item>
-    <item msgid="7878027809189330917">"Jačina zvuka medijskog sadržaja"</item>
+    <item msgid="7983336752371254444">"Jačina zvona"</item>
+    <item msgid="7878027809189330917">"Jačina zvuka medija"</item>
     <item msgid="7260546305036218513">"Jačina zvuka alarma"</item>
     <item msgid="9103719301075748925">"Jačina zvuka za obavještenja"</item>
     <item msgid="7025966722295861512">"Jačina zvuka za Bluetooth vezu"</item>
@@ -373,9 +371,9 @@
     <item msgid="9039213578110332702">"Jačina zvuka za pristupačnost"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Kratak"</item>
-    <item msgid="2560532955514699713">"Srednji"</item>
-    <item msgid="2372711992605524591">"Dugi"</item>
+    <item msgid="3511504869290423954">"Kratko"</item>
+    <item msgid="2560532955514699713">"Srednje"</item>
+    <item msgid="2372711992605524591">"Dugo"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="1319652728542138112">"Zadano"</item>
@@ -389,11 +387,11 @@
     <item msgid="561832997193039673">"Mala početna slova"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
-    <item msgid="4800919809575254054">"Veoma mala"</item>
-    <item msgid="6781094565687692782">"Mala"</item>
+    <item msgid="4800919809575254054">"Vrlo mali"</item>
+    <item msgid="6781094565687692782">"Mali"</item>
     <item msgid="8222123259497646551">"Normalna"</item>
-    <item msgid="5813217276778560466">"Velika"</item>
-    <item msgid="9044232017390975191">"Veoma velika"</item>
+    <item msgid="5813217276778560466">"Veliki"</item>
+    <item msgid="9044232017390975191">"Vrlo veliki"</item>
   </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="4733815704128258753">"Zadano"</item>
@@ -461,7 +459,7 @@
     <item msgid="7438189122367820362">"Usluga (pokrenuta)"</item>
     <item msgid="918687422516982498">"Usluga (ponovno pokretanje)"</item>
     <item msgid="6807727069641853029">"Prijemnik"</item>
-    <item msgid="6782857406100845127">"Kuća"</item>
+    <item msgid="6782857406100845127">"Početna"</item>
     <item msgid="2860945127596974299">"Posljednja aktivnost"</item>
     <item msgid="8610560843693675830">"Keširana (aktivnost)"</item>
     <item msgid="4338089220026248848">"Keširana (aktivnost klijenta)"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 6dcddda855f659b9580477a5b82ff8bb13539571..5868c1a00132fc600abef87a534cd6e449c379cd 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -23,7 +23,6 @@
     <string name="deny" msgid="6947806159746484865">"Odbij"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"Prebaci"</string>
-    <string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak vas dijeli od toga da postanete programer.</item>
       <item quantity="few">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> koraka vas dijele od toga da postanete programer.</item>
@@ -31,6 +30,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 +42,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 +108,26 @@
     <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>
+    <!-- no translation found for bluetooth_disconnect_title (7830252930348734303) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (8208712728668714199) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (6611038575213485336) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_all_profiles (3995834526315103965) -->
+    <skip />
+    <!-- no translation found for bluetooth_disconnect_dialog_ok (3308586619539119106) -->
+    <skip />
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemate dozvolu da mijenjate postavke za Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidljiv obližnjim uređajima, dok su otvorene Bluetooth postavke."</string>
+    <!-- no translation found for bluetooth_pairing_pref_title (7429413067477968637) -->
+    <skip />
+    <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>
+    <!-- no translation found for bluetooth_footer_mac_message (1109366350000220283) -->
+    <skip />
+    <!-- no translation found for bluetooth_footer_mac_message (6807634484499166486) -->
+    <skip />
+    <!-- no translation found for bluetooth_footer_mac_message (8413944740341742061) -->
+    <skip />
     <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 +139,8 @@
     <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>
+    <!-- no translation found for bluetooth_show_received_files (3144149432555230410) -->
+    <skip />
     <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 +176,11 @@
     <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>
+    <!-- no translation found for bluetooth_device_name_summary (4757990010751789977) -->
+    <skip />
+    <string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vaši uređaji"</string>
+    <!-- no translation found for bluetooth_pairing_page_title (7712127387361962608) -->
+    <skip />
     <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) -->
@@ -171,8 +194,8 @@
     <string name="proxy_clear_text" msgid="5555400754952012657">"Obriši"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Priključak za proksi"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Zaobilazni proksi za"</string>
-    <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovi zadane vrijednosti"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"Završeno"</string>
+    <string name="proxy_defaultView_text" msgid="6387985519141433291">"Vrati na zadano"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Gotovo"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Proksi hostname"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pažnja"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Uredu"</string>
@@ -284,8 +307,8 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"Dopusti prijenos podataka mobilnom mrežom"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Dozvoli prijenos podataka u romingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roming podataka"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Povezuj se na usluge prenosa podataka u romingu"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Povezuj se na usluge prenosa podataka u romingu"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Povezivanje na usluge prijenosa podataka u romingu"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Povezivanje na usluge prijenosa podataka u romingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Ostali ste bez veze za prijenos podataka jer ste napustili matičnu mrežu dok je roming podataka isključen."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Uključi"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Može doći do značajnih troškova."</string>
@@ -295,8 +318,8 @@
     <string name="networks" msgid="6333316876545927039">"Izbor operatera"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Odaberite operatera"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum i vrijeme"</string>
-    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Postavi datum i vrijeme"</string>
-    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Postavi datum, vrijeme, vremensku zonu i formate"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Postavljanje datuma i vremena"</string>
+    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Postavljanje datuma, vremena, vremenske zone i formata"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatski datum i vrijeme"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Koristi vrijeme koje definira mreža"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Koristi vrijeme koje definira mreža"</string>
@@ -304,13 +327,13 @@
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Vremensku zonu obezbjeđuje mreža"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Vremensku zonu obezbjeđuje mreža"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-satni format"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"Koristi 24-satni format"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"Korištenje 24-satnog formata"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Vrijeme"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"Postavi vrijeme"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"Postavljanje vremena"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"Vremenska zona"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"Odaberi vremensku zonu"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Odabir vremenske zone"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datum"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"Postavi datum"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"Postavljanje vremena"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortiraj po abecedi"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Poredaj po vremenskim zonama"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
@@ -322,8 +345,8 @@
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Prikaži informacije o vlasniku na zaključanom ekranu"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Poruka na zaključanom ekranu"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogući vidžete"</string>
-    <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Onemogućeno od strane administratora"</string>
-    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nijedno"</string>
+    <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Onemogućio administrator"</string>
+    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Ništa"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Npr. Edinov Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Podaci o korisniku"</string>
@@ -332,14 +355,19 @@
     <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="9087149148665560415">"Sigurnost i zaključavanje ekrana"</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>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Postavke zaključanog ekrana"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje SIM kartice, zaključavanje pohrane akreditiva"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje pohrane akreditiva"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
-    <string name="disabled_by_administrator_summary" msgid="5989801404248162477">"Onemogućio administrator"</string>
-    <string name="security_status_title" msgid="5848766673665944640">"Stanje sigurnosti"</string>
-    <string name="security_dashboard_summary" msgid="7778812098315813315">"Lokacija, otisak"</string>
+    <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Onemogućio administrator"</string>
+    <string name="security_status_title" msgid="5848766673665944640">"Sigurnosni status"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Zaključavanje ekrana, otisak prsta"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaključavanje ekrana"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravljanje otiscima prstiju"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Koristi otisak za"</string>
@@ -351,62 +379,77 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> otisak prsta je registrovano</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključaj otiskom prsta"</string>
+    <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_unlock_disabled (1550756694054944874) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_introduction_message_setup (6817326798834882531) -->
+    <skip />
     <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 da spriječite druge osobe da koriste ovaj tablet ukoliko bude izgubljen, ukraden ili njegov sadržaj 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 biti u mogućnosti da spriječite druge osobe da koriste ovaj uređaj ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</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 da spriječite druge osobe da koriste ovaj telefon ukoliko bude izgubljen, ukraden ili njegov sadržaj 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 da spriječite 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 da spriječite 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 da spriječite druge osobe da koriste ovaj telefon ako ga izgubite ili vam ga ukradu."</string>
+    <!-- no translation found for security_settings_fingerprint_enroll_introduction_continue_setup (1961957425135180242) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (1581834104051243425) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (4629503416877189572) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text_frp (2423428240245737909) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text (5219287483885558525) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text (1466238255429527112) -->
+    <skip />
+    <!-- no translation found for lock_screen_intro_skip_dialog_text (3008526710555416125) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_title (3051496861358227199) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_find_sensor_message (8793966374365960368) -->
+    <skip />
     <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">"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>
+    <!-- no translation found for security_settings_fingerprint_enroll_start_title (2068961812439460133) -->
+    <skip />
     <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">"Blago pomjerajte prst kako biste dodali sve različite dijelove svog 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 za 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>
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_title (2819679722403209778) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_repeat_message (6158989350522518586) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_title (7567276170287972230) -->
+    <skip />
+    <!-- no translation found for security_settings_fingerprint_enroll_finish_message (4796715961273420536) -->
+    <skip />
     <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>
+    <!-- no translation found for security_settings_fingerprint_enroll_touch_dialog_message (2989019978041986175) -->
+    <skip />
     <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>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Dodaj još jedan"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Naprijed"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Osim otključavanja telefona, otisak prsta takođe možete koristiti za odobravanje kupovine i pristup aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7007548031540826618">"Opcija za zaključavanje ekrana nije omogućena. Obratite se administratoru organizacije da biste saznali više. "<annotation id="admin_details">"Više detalja"</annotation>\n\n"I dalje možete koristiti otisak prsta za autorizaciju kupovine i pristup aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Opcija zaključavanja ekrana je onemogućena. Da saznate više, obratite se administratoru organizacije. "<annotation id="admin_details">"Više informacija"</annotation>\n\n"I dalje možete koristiti otisak prsta za odobravanje kupovine i pristup aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Podignite prst, zatim ponovo dodirnite senzor"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Možete dodati do <xliff:g id="COUNT">%d</xliff:g> otisaka prstiju"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Dodali ste maksimalan broj otisaka prstiju"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nije moguće dodati još otisaka prstiju"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Ukloniti sve otiske prstiju?"</string>
-    <string name="fingerprint_last_delete_message" msgid="8318926239554839722">"Otiske prstiju nećete moći koristiti za otključavanje telefona, autoriziranje kupovine i prijavljivanje u aplikacije."</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="8840100810725902159">"Nećete moći koristiti otiske prstiju da otključate svoj radni profil, odobrite kupovine ili se prijavite na radne aplikacije."</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Otiske prstiju nećete moći koristiti za otključavanje telefona, odobravanje kupovine ili prijavljivanje u aplikacije"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Otiske prstiju nećete moći koristiti za otključavanje radnog profila, odobravanje kupovine ili prijavljivanje u radne aplikacije"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Da, ukloni"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Upotrijebite otisak prsta da biste nastavili."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifriranje"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifriraj tablet"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifriraj telefon"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifriranje telefona"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrirano"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"Možete šifrirati svoje račune, postavke, preuzete aplikacije i njihove podatke, medijske podatke i druge datoteke. Nakon šifriranja tableta, uz pretpostavku da ste postavili zaključavanje ekrana (tj. postavili uzorak, numerički PIN ili lozinku), bit će potrebno da otključate ekran prilikom svakog uključivanja kako biste izvršili dešifriranje. Jedina alternativa dešifriranju je ponovno postavljanje na fabričke postavke uz brisanje svih vaših podataka.\n\nZa šifriranje je potreban jedan sat ili duže. Morate započeti sa napunjenom baterijom, a tablet treba biti priključen na napajanje tokom cijelog postupka. U slučaju prekida, izgubit ćete jedan dio ili sve svoje podatke"</string>
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Možete šifrirati svoje račune, postavke, preuzete aplikacije i njihove podatke, medijske sadržaje i druge datoteke. Nakon šifriranja telefona, uz pretpostavku da ste postavili zaključavanje ekrana (tj. postavili uzorak, numerički PIN ili lozinku), bit će potrebno da otključate ekran prilikom svakog uključivanja kako biste izvršili dešifriranje. Jedina alternativa dešifriranju je ponovno postavljanje na fabričke postavke uz brisanje svih vaših podataka.\n\nZa šifriranje je potreban jedan sat ili duže. Morate započeti sa napunjenom baterijom, a telefon treba biti priključen na napajanje tokom cijelog postupka. U slučaju prekida, izgubit ćete jedan dio ili sve svoje podatke."</string>
@@ -432,14 +475,14 @@
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Šifriranje je prekinuto te se ne može završiti. Zbog toga podaci sa vašeg tableta više nisu dostupni. \n\n Da biste nastavili koristiti tablet, treba da izvršite vraćanje tableta na fabričke postavke. Nakon što izvršite postavke tableta nakon vraćanja na fabričke postavke, moći ćete vratiti sve podatke za koje postoji sigurnosna kopija na Google računu."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Šifriranje je prekinuto te se ne može završiti. Zbog toga podaci sa vašeg telefona više nisu dostupni. \n\nDa biste nastavili koristiti telefon, treba da izvršite vraćanje telefona na fabričke postavke. Nakon što izvršite postavke telefona nakon vraćanja na fabričke postavke, moći ćete vratiti sve podatke za koje postoji sigurnosna kopija na Google računu."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Dešifriranje nije uspjelo"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti tablet, morate izvršiti ponovno postavljanje na fabričke postavke. Prilikom podešavanja tableta nakon ponovnog postavljanja, imat ćete priliku da obnovite podatke čija rezervna kopija je spremljena u vaš Google račun."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti telefon, morate izvršiti ponovno postavljanje na fabričke postavke. Prilikom podešavanja telefona nakon ponovnog postavljanja, imat ćete priliku da obnovite podatke čija rezervna kopija je spremljena u vaš Google račun."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti tablet, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja tableta nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Unesena lozinka je ispravna, ali nažalost vaši podaci su oštećeni. \n\nDa biste nastavili koristiti telefon, morate izvršiti vraćanje na fabričke postavke. Prilikom podešavanja telefona nakon ponovnog postavljanja, imat ćete priliku da vratite podatke čija sigurnosna kopija je spremljena u vaš Google račun."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Promijeni način unosa"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Postavite zaključavanje ekrana"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaštitite svoj uređaj"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Koristite otisak prsta"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Otključajte otiskom prsta"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberi zaklj. ekrana"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zaključavanje ekrana"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Odaberi zaklj. profila"</string>
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaštitite svoj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaštitite svoj uređaj"</string>
@@ -449,14 +492,18 @@
     <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>
     <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"Zaključ. radnog prof."</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Promijeni zaključavanje ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Promijeni ili onemog. uzorak, PIN ili lozinku"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Odaberite način za zaključavanje ekrana"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nema"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
-    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Prevucite"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Prevlačenje prstom"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Nema sigurnosti"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Uzorak"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Srednja sigurnost"</string>
@@ -471,9 +518,9 @@
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Otisak prsta i lozinka"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Nastavi bez postavljanja otiska prsta"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Možete otključati telefon pomoću otiska prsta. Iz sigurnosnih razloga, ova opcija zahtijeva rezervni način zaključavanja ekrana."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Onemogućio admin, pravilo šifr. ili pohrana akred."</string>
-    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nema"</string>
-    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prevucite"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Onemogućio administrator, pravila šifriranja ili pohrana akreditiva"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ništa"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prevlačenje prstom"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Uzorak"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Lozinka"</string>
@@ -517,20 +564,28 @@
     <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 ukloniti."</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 ukloniti."</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 kodu 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>
-    <string name="lockpassword_password_too_long" msgid="4520363269062591833">"Ukupan broj znakova mora biti manji od <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="lockpassword_pin_too_long" msgid="4010052843684165845">"Ukupan broj cifara mora biti manji od <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="lockpassword_pin_contains_non_digits" msgid="5537252833154289817">"Mora sadržavati samo cifre 0-9."</string>
-    <string name="lockpassword_pin_recently_used" msgid="214840704635573454">"Administrator uređaja ne dozvoljava korištenje nedavnog PIN-a."</string>
+    <string name="lockpassword_password_too_long" msgid="4591720174765403476">"Ukupan broj znakova mora biti manji od <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"Ukupan broj cifara mora biti manji od <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"Mora sadržavati isključivo cifre 0-9."</string>
+    <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"Administrator uređaja ne dozvoljava korištenje nedavnog PIN koda"</string>
     <string name="lockpassword_illegal_character" msgid="8049611046639943217">"Ne može sadržavati nevažeći znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"Mora sadržavati najmanje jedno slovo"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"Mora sadržavati najmanje jednu cifru"</string>
@@ -565,16 +620,15 @@
       <item quantity="few">Mora sadržavati najmanje <xliff:g id="COUNT">%d</xliff:g> znaka koja nisu slova</item>
       <item quantity="other">Mora sadržavati najmanje <xliff:g id="COUNT">%d</xliff:g> znakova koji nisu slova</item>
     </plurals>
-    <string name="lockpassword_password_recently_used" msgid="4687102591995446860">"Administrator uređaja ne dozvoljava korištenje nedavne lozinke."</string>
-    <string name="lockpassword_pin_no_sequential_digits" msgid="6830610582179569631">"Rastući, opadajući ili ponavljajući niz cifara nije dozvoljen"</string>
+    <string name="lockpassword_password_recently_used" msgid="942665351220525547">"Administrator uređaja ne dozvoljava korištenje nedavne lozinke"</string>
+    <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"Nije dozvoljen rastući, opadajući ili ponavljajući niz cifara"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Uredu"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Otkaži"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Otkaži"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Naprijed"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Postavljanje je završeno."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacije za administratora uređaja"</string>
-    <!-- no translation found for number_of_device_admins_none (7185056721919496069) -->
-    <skip />
+    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacije administratora uređaja"</string>
+    <string name="number_of_device_admins_none" msgid="7185056721919496069">"Nema aktivnih aplikacija"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> aktivna aplikacija</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> aktivne aplikacije</item>
@@ -582,7 +636,12 @@
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Pouzdani agenti"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Da biste koristili, prvo postavite zaključavanje ekrana"</string>
-    <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Prikažite ili deaktivirajte usluge povjerenja"</string>
+    <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Nema"</string>
+    <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aktivni pouzdani agent</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aktivna pouzdana agenta</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aktivnih pouzdanih agenata</item>
+    </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Uključi Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -626,8 +685,24 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcije..."</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Napredno"</string>
     <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 Bluetooth uređajima u blizini."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"U svrhu poboljšanja preciznosti lociranja, sistemske aplikacije i usluge i dalje mogu detektirati Bluetooth uređaje. Ovu postavku 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_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>
+    <!-- no translation found for bluetooth_connect_failed (4500234659813241053) -->
+    <skip />
+    <!-- no translation found for device_details_title (6576953269221085300) -->
+    <skip />
+    <!-- no translation found for bluetooth_device_mac_address (2513724313558236181) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_title (38467834196432400) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_body (9087609557757135712) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_body (7785695793007576501) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_body (251257782642157557) -->
+    <skip />
+    <!-- no translation found for bluetooth_unpair_dialog_forget_confirm_button (3829370108973879006) -->
+    <skip />
     <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>
@@ -648,7 +723,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kao spikerfon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Za muziku i medijske sadržaje"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Ekran"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emitiranje"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Omogući bežični prikaz"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nije pronađen nijedan uređaj u blizini."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Povezuje se"</string>
@@ -667,15 +742,15 @@
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> želi isključiti Wi-Fi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Dopusti razmjenu podataka kada tablet dodirne drugi uređaj"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Dopusti razmjenu podataka kada telefon dodirne drugi uređaj"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Omogućavanje razmjene podataka kada telefon dodirne drugi uređaj"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Uključite NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC razmjenjuje podatke između ovog i drugih uređaja ili ciljeva u blizini, kao što su terminali za plaćanje, čitači pristupa i interaktivni oglasi ili oznake."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Spremno za prijenos sadržaja aplikacije preko NFC-a"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Spremno za prijenos sadržaja aplikacije putem NFC-a"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Isključeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nedostupno jer je NFC isključen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Kada je uključena ova funkcija, možete emitirati sadržaj aplikacije na drugi uređaj koji je sposoban za NFC komunikaciju dok držite uređaje blizu jedan drugome. Naprimjer, možete emitirati web stranice, videozapise s YouTube lokacije, kontakte i još mnogo toga.\n\nSamo postavite uređaje zajedno (u pravilu, poleđinu uz poleđinu) a zatim dodirnite svoj ekran. Aplikacija će sama prepoznati šta treba emitirati."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Kada je uključena ova funkcija, možete emitirati sadržaj aplikacije na drugi uređaj koji podržava NFC tako što ćete približiti uređaje jedan drugome. Naprimjer, možete emitirati web stranice, videozapise s YouTubea, kontakte i još mnogo toga.\n\nSamo približite uređaje jedan drugome (u pravilu, poleđinu uz poleđinu) a zatim dodirnite svoj ekran. Aplikacija će sama prepoznati šta treba emitirati."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Uključite Wi‑Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -685,27 +760,24 @@
     <string name="wifi_select_network" msgid="4210954938345463209">"Odaberite Wi-Fi"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Uključivanje Wi-Fi..."</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Isključivanje Wi-Fi..."</string>
-    <string name="wifi_see_all_networks_button_title" msgid="2463270265855243076">"Vidi sve mreže"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Greška"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Opseg od 5 GHz nije dostupan u ovoj zemlji"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"U načinu rada u avionu"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Otvori obavještenja mreže"</string>
-    <!-- no translation found for wifi_notify_open_networks_summary (8422402819267219458) -->
-    <skip />
-    <string name="wifi_wakeup" msgid="5685581457584270802">"Ponovo uključi Wi‑Fi"</string>
-    <!-- no translation found for wifi_wakeup_summary (7843701854850824229) -->
-    <skip />
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Obavještenja o otvorenim mrežama"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Obavijesti me kada bude dostupna javna mreža visokog kvaliteta"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"Automatsko uključivanje Wi-Fi veze"</string>
+    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi veza se automatski ponovo uključuje u blizini sačuvanih mreža visokog kvaliteta, kao što je kućna mreža"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nije dostupno jer je skeniranje Wi-Fi mreže isključeno"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbjegavaj slabe veze"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne koristi se Wi-Fi mreža ako njena Internet veza nije dobra"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Koristiti samo mreže koje imaju dobru internet vezu"</string>
-    <!-- no translation found for use_open_wifi_automatically_title (6851951242903078588) -->
-    <skip />
-    <!-- no translation found for use_open_wifi_automatically_summary (8371085123988132834) -->
-    <skip />
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliraj certifikate"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"U svrhu poboljšanja preciznosti lociranja, sistemske aplikacije i usluge i dalje mogu skenirati nove Wi-Fi mreže. 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="use_open_wifi_automatically_title" msgid="6851951242903078588">"Povezivanje na otvorene mreže"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatsko povezivanje na javne mreže visokog kvaliteta"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliranje certifikata"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Radi poboljšanja preciznosti lociranja, sistemske aplikacije i usluge i dalje mogu skenirati nove Wi-Fi mreže. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Radi poboljšanja preciznosti lociranja, uključite skeniranje Wi-Fi mreža 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="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Ne prikazuj ponovo"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Držite Wi-Fi uključenim za vrijeme spavanja"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Zadrži Wi-Fi uključenim tokom mirovanja"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi za vrijeme spavanja"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pojavio se problem prilikom mijenjanja postavke"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Poboljšaj učinkovitost"</string>
@@ -716,9 +788,11 @@
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Automatsko prebacivanje na prijenos mobilnih podataka"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Koristite prijenos mobilnih podataka kada Wi-Fi mreža nema pristup internetu. Mogući su troškovi za prijenos podataka."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj mrežu"</string>
-    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi postavke"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Postavke za Wi-Fi"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi veza se uključuje ponovo automatski"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi veza se ne uključuje ponovo automatski"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi mreže"</string>
-    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pritisni WPS dugme"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS dugme"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Više opcija"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Unos PIN-a za WPS"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
@@ -769,7 +843,7 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimni identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Lozinka"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Prikaži lozinku"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Odaberite AP Band"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Odaberite opseg pristupne tačke"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Opseg od 2.4 GHz"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Opseg od 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP postavke"</string>
@@ -795,8 +869,7 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ova mreža nema pristup Internetu. Ostati povezan na nju?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Ne pitaj me više za ovu mrežu"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi mreža nije povezana na Internet"</string>
-    <!-- no translation found for lost_internet_access_text (9029649339816197345) -->
-    <skip />
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"Možete se prebaciti na mobilnu mrežu kad god je Wi‑Fi veza loša. Mogu nastati troškovi prijenosa podataka."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Prebaci na mobilnu mrežu"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Ostani na Wi-Fi mreži"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nemoj više prikazivati"</string>
@@ -808,13 +881,17 @@
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Čuvanje mreže nije uspjelo"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Otkaži"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Sačuvane mreže"</string>
+    <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
+      <item quantity="one">%d mreža</item>
+      <item quantity="few">%d mreže</item>
+      <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="6547625164186585943">"Maska podmreže"</string>
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podmreže"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <string name="wifi_details_ipv6_address_header" msgid="4334059712014889425">"IPv6 adrese"</string>
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adrese"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Sačuvane mreže"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP postavke"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Napredne Wi-Fi postavke nisu dostupne za ovog korisnika"</string>
@@ -844,24 +921,38 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Otkazati poziv?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Da li želite otkazati poziv za povezivanje s uređajem <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zaboraviti ovu grupu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prijenosni Wi-Fi hotspot"</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>
-    <!-- no translation found for wifi_hotspot_off_subtext (2745508221200463254) -->
+    <!-- no translation found for wifi_hotspot_off_subtext (5466126533609394170) -->
     <skip />
-    <!-- no translation found for wifi_hotspot_off_subtext (7746761268472599794) -->
+    <!-- no translation found for wifi_hotspot_tethering_on_subtext (5752490509369962007) -->
     <skip />
-    <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>
-    <!-- no translation found for wifi_tether_enabled_subtext (7842111748046063857) -->
+    <!-- no translation found for wifi_hotspot_tethering_on_subtext (6461075246164300670) -->
     <skip />
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Pogreška kod prijenosnog Wi-Fi hotspot"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Podešavanje Wi-Fi hotspot"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Postavke Wi-Fi hotspot"</string>
-    <!-- no translation found for wifi_hotspot_configure_ap_text_summary (5560680057727007011) -->
+    <!-- no translation found for wifi_hotspot_on_local_only_subtext (2068110388011294735) -->
     <skip />
-    <!-- no translation found for wifi_tether_configure_subtext (2050196439900426456) -->
+    <!-- no translation found for wifi_hotspot_name_title (1341735529132128887) -->
     <skip />
+    <!-- no translation found for wifi_hotspot_name_summary_connecting (3378299995508671967) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_name_summary_connected (3888672084861445362) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_password_title (1955592302902091281) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_ap_band_title (1165801173359290681) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_footer_info_regular (1203489406068036455) -->
+    <skip />
+    <!-- no translation found for wifi_hotspot_footer_info_local_only (857988412470694109) -->
+    <skip />
+    <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>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Greška kod prijenosne Wi-Fi pristupne tačke"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Postavljanje Wi-Fi pristupne tačke"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Postavke Wi-Fi hotspot"</string>
+    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK pristupna tačka"</string>
+    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> pristupna tačka"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android pristupna tačka"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi pozivanje"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Uključite Wi-Fi pozive"</string>
@@ -900,20 +991,22 @@
     <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>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Jačine zvuka"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muzički efekti"</string>
-    <string name="ring_volume_title" msgid="5592466070832128777">"Jačina zvuka zvona"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"Jačina zvona"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibriraj u nečujnom načinu rada"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Zadani zvuk obavještenja"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Melodija zvona"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obavještenje"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Koristi jačinu zvuka dolaznih poziva za obavještenja"</string>
-    <string name="home_work_profile_not_supported" msgid="7457951997970419085">"Ne podržava radne profile"</string>
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Podrazumijevani zvuk obavještenja"</string>
+    <!-- no translation found for home_work_profile_not_supported (1357721012342357037) -->
+    <skip />
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Zadani zvuk obavještenja"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Mediji"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Postavi jačinu zvuka za muziku i video zapise"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -965,61 +1058,103 @@
     <string name="brightness_title" msgid="5746272622112982836">"Osvjetljenje"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Prilagodite osvjetljenje ekrana"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva osvijetljenost"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziraj nivo osvjetljenja za dostupno svjetlo"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje nivoa osvjetljenja u odnosu na osvijetljenost okoline"</string>
+    <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Isključeno"</string>
+    <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferirani nivo osvjetljenja je veoma nizak"</string>
+    <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferirani nivo osvjetljenja je nizak"</string>
+    <string name="auto_brightness_summary_default" msgid="7225666614394726845">"Preferirani nivo osvjetljenja je zadani"</string>
+    <string name="auto_brightness_summary_high" msgid="7172304165631136027">"Preferirani nivo osvjetljenja je visok"</string>
+    <string name="auto_brightness_summary_very_high" msgid="979277812582279078">"Preferirani nivo osvjetljenja je veoma visok"</string>
+    <string name="auto_brightness_off_title" msgid="2996864829946190795">"Isključeno"</string>
+    <string name="auto_brightness_very_low_title" msgid="8252988638614126320">"Veoma nizak"</string>
+    <string name="auto_brightness_low_title" msgid="1632186441514863377">"Nizak"</string>
+    <string name="auto_brightness_default_title" msgid="936771997353506620">"Zadano"</string>
+    <string name="auto_brightness_high_title" msgid="2527853305981497345">"Visok"</string>
+    <string name="auto_brightness_very_high_title" msgid="8867164854439331022">"Veoma visok"</string>
+    <string name="auto_brightness_subtitle" msgid="6454652530864093466">"Vaš preferirani nivo osvjetljenja"</string>
+    <string name="auto_brightness_off_summary" msgid="7629228736838155268">"Ne podešavaj prema dostupnom svjetlu"</string>
+    <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Povećano korištenje baterije"</string>
+    <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>
+    <!-- no translation found for night_display_auto_mode_title (6574111412154833409) -->
+    <skip />
+    <!-- no translation found for night_display_auto_mode_never (2483761922928753400) -->
+    <skip />
+    <!-- no translation found for night_display_auto_mode_custom (2379394568898721765) -->
+    <skip />
+    <!-- no translation found for night_display_auto_mode_twilight (589042813708244059) -->
+    <skip />
     <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>
-    <!-- no translation found for night_display_temperature_title (1435292789272017136) -->
-    <skip />
-    <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ć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="screen_timeout" msgid="4351334843529712571">"Stanje mirovanja"</string>
+    <!-- no translation found for night_display_status_title (1784041143360286267) -->
+    <skip />
+    <string name="night_display_temperature_title" msgid="1435292789272017136">"Intenzitet"</string>
+    <string name="night_display_summary_off" msgid="1792750041697946539">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for night_display_summary_off_auto_mode_never (3583590137322963513) -->
+    <skip />
+    <!-- no translation found for night_display_summary_off_auto_mode_custom (6365668239253173208) -->
+    <skip />
+    <!-- no translation found for night_display_summary_off_auto_mode_twilight (3596291693781757392) -->
+    <skip />
+    <string name="night_display_summary_on" msgid="1355713529996456744">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <!-- no translation found for night_display_summary_on_auto_mode_never (9117830821363119835) -->
+    <skip />
+    <!-- no translation found for night_display_summary_on_auto_mode_custom (5510753572245577263) -->
+    <skip />
+    <!-- no translation found for night_display_summary_on_auto_mode_twilight (852270120144683507) -->
+    <skip />
+    <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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
+    <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Zadano"</string>
+    <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Prilagođeno"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Promijenite pozadinsku sliku"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Prilagodite svoj ekran"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odabir pozadinske slike iz"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Čuvar ekrana"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Kad je u priključnoj stanici ili u stanju mirovanja i puni se"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Dok se puni ili je na priključnoj stanici"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Bilo koje"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Tokom punjenja"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dok je u priključnoj stanici"</string>
+    <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Nikada"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Za kontrolisanje dešavanja kada je telefon priključen i/ili dok miruje, uključi čuvara ekrana."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8644479926302707286">"Kada pokrenuti čuvara ekrana"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kada početi"</string>
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Trenutni čuvar ekrana"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pokreni odmah"</string>
     <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>
+    <!-- no translation found for ambient_display_screen_title (4252755516328775766) -->
+    <skip />
+    <!-- no translation found for ambient_display_screen_summary_always_on (7974004969481877214) -->
+    <skip />
+    <!-- no translation found for ambient_display_screen_summary_notifications (1449570742600868654) -->
+    <skip />
+    <!-- no translation found for ambient_display_category_triggers (4359289754456268573) -->
+    <skip />
+    <!-- no translation found for doze_title (2375510714460456687) -->
+    <skip />
     <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>
-    <string name="sim_lock_settings_category" msgid="5136244267576697004">"Postavi zaključavanje SIM kartice"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"Zaključavanje SIM kartice"</string>
+    <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Isključeno"</string>
+    <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Zaključano"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zaključavanje SIM kartice"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Zaključaj SIM karticu"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Zahtijevaj PIN za korištenje tableta"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Zahtijevaj PIN za korištenje telefona"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Potreban je PIN za korištenje telefona"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Zahtijevaj PIN za korištenje tableta"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Zahtijevaj PIN za korištenje telefona"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Promijeni PIN za SIM"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Potreban je PIN za korištenje telefona"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Promjena PIN-a SIM kartice"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN za SIM"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zaključaj SIM karticu"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zaključavanje SIM kartice"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Otključaj SIM karticu"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Stari PIN za SIM"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Novi PIN za SIM"</string>
@@ -1049,8 +1184,8 @@
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Status telefona"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Ažuriranja sistema"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Verzija sistema Android"</string>
-    <string name="security_patch" msgid="8438384045870296634">"Nivo Android sigurnosne zakrpe"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Verzija Androida"</string>
+    <string name="security_patch" msgid="8438384045870296634">"Nivo sigurnosne zakrpe Androida"</string>
     <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="hardware_info" msgid="2605080746512527805">"Model i hardver"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"Verzija hardvera"</string>
@@ -1187,9 +1322,8 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Istraži korisnika <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Ostalo uključuje podijeljene fajlove koji su sačuvani pomoću aplikacija, fajlove preuzete s Interneta ili Bluetootha, fajlove za Android uređaje i tako dalje. \n\nDa vidite vidljivi sadržaj ove <xliff:g id="NAME">^1</xliff:g>, dodirnite Istraži."</string>
-    <string name="storage_detail_dialog_system" msgid="3417679651116003900">"Sistem uključuje fajlove koje Android ne može pojedinačno prikazati."</string>
-    <!-- no translation found for storage_detail_dialog_user (3267254783294197804) -->
-    <skip />
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem obuhvata fajlove koji se koriste za pokretanje verzije Androida <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"Moguće je da je <xliff:g id="USER_0">^1</xliff:g> sačuvao/la fotografije, muziku, aplikacije ili druge podatke koristeći <xliff:g id="SIZE">^2</xliff:g> prostora za pohranu. \n\nDa vidite detalje, prebacite se na korisnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Podesite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Koristiti kao prijenosnu memoriju"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"Za premještanje fotografija i drugih medija s jednog uređaja na drugi."</string>
@@ -1222,7 +1356,7 @@
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Čini se da je <xliff:g id="NAME_0">^1</xliff:g> spora. \n\n Možete nastaviti, ali aplikacije koje su premještene na ovu lokaciju mogu zastajkivati te prijenos podataka može dugo trajati. \n\n Razmislite o korištenju brže<xliff:g id="NAME_1">^1</xliff:g> za bolje performanse."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivo napunjenosti baterije"</string>
-    <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"Nazivi pristupnih tačaka"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Uredi pristupnu tačku"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Nije postavljeno"</string>
     <string name="apn_name" msgid="4115580098369824123">"Ime"</string>
@@ -1238,7 +1372,7 @@
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
     <string name="apn_auth_type" msgid="6167205395676037015">"Vrsta provjere vjerodostojnosti"</string>
-    <string name="apn_auth_type_none" msgid="5069592676845549926">"Nema"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Ništa"</string>
     <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ili CHAP"</string>
@@ -1260,31 +1394,42 @@
     <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>
-    <string name="reset_network_title" msgid="4557113742173895074">"Resetuj postavke za mrežu"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Ovim će se ponovo postaviti sve postavke mreže, uključujući:\n\n"<li>"Wi‑Fi mrežu"</li>\n<li>"Prijenos mobilnih podataka"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_dashboard_title" msgid="4412694650600342973">"Vraćanje na zadano"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Vraćanje postavki mreže na zadano"</string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Sve postavke mreže vratit će se na zadano, uključujući:\n\n"<li>"Wi‑Fi mrežu"</li>\n<li>"Prijenos mobilnih podataka"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Resetuj postavke"</string>
-    <string name="reset_network_final_desc" msgid="6388371121099245116">"Ponovo postaviti sve mrežne postavke? Ovu radnju ne možete poništiti!"</string>
+    <string name="reset_network_final_desc" msgid="6388371121099245116">"Vratiti sve postavke mreže na zadano? Ovu radnju ne možete poništiti!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Resetuj postavke"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Ponovo postaviti?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Ponovno postavljanje mreže nije dostupno za ovog korisnika"</string>
-    <string name="reset_network_complete_toast" msgid="787829973559541880">"Mrežne postavke su ponovo postavljene"</string>
+    <string name="reset_network_complete_toast" msgid="787829973559541880">"Postavke mreže vraćene su na zadano"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Vraćanje na fabričke postavke"</string>
+    <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
+      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> račun će se vratiti na zadano</item>
+      <item quantity="few"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računa će se vratiti na zadano</item>
+      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> računa će se vratiti na zadano</item>
+    </plurals>
+    <string name="master_clear_summary" msgid="6902443944660426951">"Unutrašnji prostor i svi podaci će se vratiti na početne postavke"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ovo će izbrisati sve podatke iz "<b>"interne memorije"</b>" vašeg tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ovo će izbrisati sve podatke iz "<b>"interne memorije"</b>" vašeg telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni u sljedeće račune:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši USB pohranu"</string>
     <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">"Ponovo pokreni telefon"</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>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši sve"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"Resetovanje nije izvršeno jer usluga Brisanje sistema nije dostupna."</string>
@@ -1298,54 +1443,35 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prijenosna pristupna tačka"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
-    <!-- no translation found for tether_settings_title_all (3058586928118801157) -->
-    <skip />
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Pristupna tačka i povezivanje putem mobitela"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Pristupna tačka je uključena, veza se dijeli"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Pristupna tačka je uključena"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Dijeljenje veze"</string>
     <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 dijeljenje veze"</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="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dijeljenje Bluetooth veze"</string>
-    <!-- no translation found for bluetooth_tethering_available_subtext (2092766774943506688) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_available_subtext (313873759999970236) -->
+    <!-- no translation found for usb_tethering_subtext (5991482890033484794) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_device_connected_subtext (6388191062495199481) -->
+    <!-- no translation found for usb_tethering_subtext (5988796139573211318) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_device_connected_subtext (5970460338828861091) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (3253150865825199632) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_devices_connected_subtext (8268867745495039177) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext_config (6326877798974938021) -->
-    <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1889565070769307732) -->
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Dijeljenje Bluetooth veze"</string>
+    <!-- no translation found for bluetooth_tethering_subtext (4558227863463153412) -->
     <skip />
-    <!-- no translation found for bluetooth_tethering_off_subtext (1838503633450298902) -->
+    <!-- no translation found for bluetooth_tethering_subtext (1055197887836203595) -->
     <skip />
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Veza se ne dijeli"</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_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>
-    <!-- no translation found for tethering_footer_info (7287131664937054043) -->
+    <!-- no translation found for tethering_footer_info (1308462275952345985) -->
     <skip />
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
-    <!-- no translation found for network_settings_title (2876509814832830757) -->
-    <skip />
+    <string name="network_settings_title" msgid="2876509814832830757">"Mobilna mreža"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Paket mobilne usluge"</string>
-    <string name="sms_application_title" msgid="4903928270533250448">"SMS aplikacija"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Promijeniti SMS aplikaciju?"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikacija za SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Promijeniti aplikaciju za SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Želite li koristiti aplikaciju <xliff:g id="NEW_APP">%1$s</xliff:g> umjesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> kao aplikaciju za SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Koristiti <xliff:g id="NEW_APP">%s</xliff:g> kao vašu SMS aplikaciju?"</string>
-    <!-- no translation found for network_scorer_picker_title (7226219386351714766) -->
-    <skip />
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Ocjenjivač mreže"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Ništa"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Promijeniti Wi-Fi asistenta?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Želite li koristiti aplikaciju <xliff:g id="NEW_APP">%1$s</xliff:g> umjesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> za upravljanje mrežnim vezama?"</string>
@@ -1356,26 +1482,25 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Povežite se na Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokacija za profil za Work"</string>
-    <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
+    <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka preciznost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ušteda baterije"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Samo uređaj"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Utvrđivanje lokacije isključeno"</string>
-    <string name="location_app_level_permissions" msgid="1825588230817081339">"Dopuštenja na nivou aplikacija"</string>
+    <string name="location_app_level_permissions" msgid="1825588230817081339">"Odobrenja na nivou aplikacija"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Nedavni zahtjevi za utvrđivanje lokacije"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Nijedna aplikacija nije zahtijevala utvrđivanje lokacije u posljednje vrijeme"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Usluge lokacije"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Visoka potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Niska potrošnja baterije"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim lokacije"</string>
+    <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_menu_scanning" msgid="8536245838478802959">"Skeniranje"</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_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>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth skeniranje"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Skeniranje Bluetootha"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Poboljšajte utvrđivanje lokacije tako da dozvolite sistemskim aplikacijama i uslugama da detektiraju Bluetooth uređaje u bilo kom trenutku."</string>
     <!-- no translation found for location_network_based (9134175479520582215) -->
     <skip />
@@ -1405,7 +1530,7 @@
     <string name="license_title" msgid="1990487604356037871">"Licenca"</string>
     <string name="terms_title" msgid="7697580845616764642">"Odredbe i uslovi"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"Sistemske WebView licence"</string>
-    <string name="wallpaper_attributions" msgid="3645880512943433928">"Pozadine"</string>
+    <string name="wallpaper_attributions" msgid="3645880512943433928">"Pozadinske slike"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Pružaoci satelitskih slika:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Ručno"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Došlo je do problema sa učitavanjem priručnika."</string>
@@ -1475,7 +1600,7 @@
     <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Koristi jedno zaključavanje"</string>
     <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Koristi jedno zaključavanje za radni profil i ekran uređaja"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Želite li koristiti jedno zaključavanje?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="1787427605545808829">"Vaš radni profil i ekran uređaja koristit će isto zaključavanje. Sve postavke zaključavanja radnog profila važit će i za zaključavanje ekrana uređaja."</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"Uređaj će koristiti zaključavanje ekrana vašeg radnog profila. Pravila za rad će se primjenjivati za oba tipa zaključavanja."</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"Zaključavanje vašeg radnog profila ne ispunjava sigurnosne zahtjeve vaše organizacije. Možete koristiti isto zaključavanje za ekran uređaja i radnog profila, ali važit će sve postavke zaključavanja radnog profila."</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"Koristi jedno zaključavanje"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"Koristi jedno zaključavanje"</string>
@@ -1487,10 +1612,14 @@
     <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>
-    <!-- no translation found for install_all_warning (8310489909586138165) -->
+    <!-- no translation found for recent_app_category_title (6673071268966003928) -->
+    <skip />
+    <!-- no translation found for see_all_apps_title (1459400183763114135) -->
     <skip />
-    <!-- no translation found for install_all_warning (1952257127370115988) -->
+    <!-- no translation found for recent_app_summary (3366446669844932300) -->
     <skip />
+    <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Omogućite više opcija postavki"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informacije o aplikaciji"</string>
@@ -1511,9 +1640,9 @@
     <string name="controls_label" msgid="7611113077086853799">"Kontrole"</string>
     <string name="force_stop" msgid="7435006169872876756">"Prisilno zaustavi"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Ukupno"</string>
-    <string name="application_size_label" msgid="8494609207373874267">"Aplikacija"</string>
+    <string name="application_size_label" msgid="7376689739076506885">"Veličina aplikacije"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Aplikacija USB pohrane"</string>
-    <string name="data_size_label" msgid="8679376373625710107">"Podaci"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"Korisnički podaci"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Podaci USB pohrane"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD kartica"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Deinstaliraj"</string>
@@ -1534,11 +1663,11 @@
     <string name="sort_order_alpha" msgid="1410278099123670628">"Poredaj po nazivu"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Poredaj po veličini"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Prikaži pokrenute usluge"</string>
-    <string name="show_background_processes" msgid="2009840211972293429">"Prikaži keširane procese"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Prikaži procese iz keš memorije"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija za hitne situacije"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Vrati željene postavke aplikacije na početne vrijednosti"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Postaviti željene postavke aplikacije na početne vrijednosti?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ovim će se resetovati sve postavke za:\n\n "<li>"Onemogućene aplikacije"</li>\n" "<li>"Obavještenja za onemogućene aplikacije"</li>\n" "<li>"Zadane aplikacije za radnje"</li>\n" "<li>"Ograničenja pozadinskih podataka za aplikacije"</li>\n" "<li>"Sva ograničenja za dozvole"</li>\n\n" Nećete izgubiti nikakve podatke iz aplikacija."</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Vraćanje postavki aplikacije na zadano"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Vratiti postavke aplikacije na zadano?"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ovim će se vratiti sve postavke na zadano za:\n\n "<li>"Onemogućene aplikacije"</li>\n" "<li>"Obavještenja za onemogućene aplikacije"</li>\n" "<li>"Zadane aplikacije za radnje"</li>\n" "<li>"Ograničenja pozadinskih podataka za aplikacije"</li>\n" "<li>"Sva ograničenja za dozvole"</li>\n\n" Nećete izgubiti nikakve podatke iz aplikacija."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Vrati aplikacije na početne vrijednosti"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Upravljaj prostorom"</string>
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
@@ -1569,8 +1698,8 @@
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"Nije bilo moguće izbrisati podatke aplikacije."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ova aplikacija može pristupiti sljedećim stavkama na tabletu:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ova aplikacija može pristupiti sljedećim stavkama na telefonu:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ova aplikacija može pristupiti sljedećim stavkama na tabletu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neke od tih dozvola su dostupne aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ova aplikacija može pristupiti sljedećim stavkama na telefonu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neke od tih dozvola su dostupne aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ova aplikacija može pristupiti sljedećim stavkama na tabletu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neka od tih odobrenja su dostupna aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ova aplikacija može pristupiti sljedećim stavkama na telefonu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neka od tih odobrenja su dostupna aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> i <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> i <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
@@ -1594,7 +1723,7 @@
     <string name="app_forward_locked" msgid="6331564656683790866">"Aplikacija je zaštićena od kopiranja."</string>
     <string name="invalid_location" msgid="4354595459063675191">"Lokacija instaliranja nije važeća."</string>
     <string name="system_package" msgid="1352722848400644991">"Ažuriranja sistema se ne mogu instalirati na vanjske medijume."</string>
-    <string name="move_error_device_admin" msgid="8148342933314166497">"Administrator uređaja se ne može instalirati na vanjski medij."</string>
+    <string name="move_error_device_admin" msgid="8673026002690505763">"Aplikaciju administratora uređaja nije moguće instalirati na vanjski medij"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Prisilno zaustaviti?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"Ako prisilno zaustavite aplikaciju, moguće je da će se ponašati nepredviđeno."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
@@ -1611,6 +1740,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Trgovina"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalji o aplikaciji"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija je instalirana preko trgovine <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Više informacija na <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Djelovanje aplikacije"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Pokrenuto"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikad korišteno)"</string>
@@ -1658,10 +1788,14 @@
     <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>
+    <!-- no translation found for language_input_gesture_title (8749227808244881255) -->
+    <skip />
+    <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>
-    <!-- no translation found for input_assistance (7577795275222555487) -->
-    <skip />
+    <string name="input_assistance" msgid="7577795275222555487">"Pomoć pri unosu"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatura i načini unosa"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jezici"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1674,25 +1808,20 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pritisnite tipku za razmak dva puta kako biste umetnuli \".\""</string>
     <string name="show_password" msgid="4837897357002495384">"Prikaži lozinke"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"Kratko prikaži znakove dok se upisuju"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Ovaj način unosa može prikupiti sav tekst koji otkucate, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Način omogućava aplikacija <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Da li želite koristiti ovaj način unosa?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ovaj alat za provjeru pravopisa u mogućnosti je da prikuplja sav tekst koji otkucate, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Alat je omogućila aplikacija <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Da li želite koristiti ovaj alat za provjeru pravopisa?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Postavke"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Jezik"</string>
-    <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Nije uspjelo otvaranje postavki za <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
-    <!-- no translation found for keyboard_and_input_methods_category (6035224122054465137) -->
-    <skip />
-    <!-- no translation found for virtual_keyboard_category (9084929359894695824) -->
-    <skip />
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Tastature i načini unosa"</string>
+    <string name="virtual_keyboard_category" msgid="1012830752318677119">"Virtuelna tastatura"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Dostupna virtualna tastatura"</string>
-    <string name="add_virtual_keyboard" msgid="3302152381456516928">"Upravljanje tastaturom"</string>
+    <string name="add_virtual_keyboard" msgid="3302152381456516928">"Upravljanje tastaturama"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Pomoć za tastaturu"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Fizička tastatura"</string>
-    <string name="show_ime" msgid="2658582193437188227">"Pokaži virtealnu tastaturu"</string>
+    <string name="show_ime" msgid="2658582193437188227">"Prikaz virtuelne tastature"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Zadržava se na ekranu dok je fizička tastatura aktivna"</string>
-    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomoć za skraćenice na tastaturi"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Prikaži dostupne prečice"</string>
+    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomoć za prečice na tastaturi"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Prikaz dostupnih prečica"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Zadano"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Miš/dodirna podloga"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kontroler za igre"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Koristi vibraciju"</string>
@@ -1744,12 +1873,12 @@
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Kreirati vidžet i omogućiti pristup?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Nakon što kreirate vidžet, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> može pristupiti svim podacima koje prikazuje."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Uvijek dopusti da aplikacija <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> kreira vidžete i koristi njihove podatke"</string>
-    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
-    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>h <xliff:g id="MINUTES">%2$d</xliff:g>m <xliff:g id="SECONDS">%3$d</xliff:g>s"</string>
-    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>m <xliff:g id="SECONDS">%2$d</xliff:g>s"</string>
-    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g>s"</string>
-    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m"</string>
-    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> s <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
+    <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> d, <xliff:g id="HOURS">%2$d</xliff:g> h, <xliff:g id="MINUTES">%3$d</xliff:g> min, <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
+    <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h, <xliff:g id="MINUTES">%2$d</xliff:g> min, <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
+    <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g> min, <xliff:g id="SECONDS">%2$d</xliff:g> s"</string>
+    <string name="battery_history_seconds" msgid="4283492130945761685">"<xliff:g id="SECONDS">%1$d</xliff:g> s"</string>
+    <string name="battery_history_days_no_seconds" msgid="703063770554334710">"<xliff:g id="DAYS">%1$d</xliff:g> d, <xliff:g id="HOURS">%2$d</xliff:g> h, <xliff:g id="MINUTES">%3$d</xliff:g> min"</string>
+    <string name="battery_history_hours_no_seconds" msgid="663342892615646712">"<xliff:g id="HOURS">%1$d</xliff:g> h, <xliff:g id="MINUTES">%2$d</xliff:g> min"</string>
     <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g> min"</string>
     <string name="usage_stats_label" msgid="5890846333487083609">"Statistika korištenja"</string>
     <string name="testing_usage_stats" msgid="7823048598893937339">"Statistika korištenja"</string>
@@ -1759,41 +1888,48 @@
     <string name="usage_time_label" msgid="295954901452833058">"Vrijeme korištenja"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Pristupačnost"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Postavke pristupačnosti"</string>
-    <!-- no translation found for accessibility_settings_summary (981260486011624939) -->
-    <skip />
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Čitači ekrana, ekran, kontrole za interakciju"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Postavke za vid"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"Ovaj uređaj možete prilagoditi svojim potrebama. Ove osobine pristupačnosti se mogu kasnije promijeniti u Postavkama."</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"Ovaj uređaj možete prilagoditi svojim potrebama. Funkcije pristupačnosti se mogu kasnije promijeniti u Postavkama."</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čitači ekrana"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk i tekst na ekranu"</string>
     <string name="display_category_title" msgid="685461049938269166">"Prikaz"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"Kontrole za interakciju"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Preuzeti servisi"</string>
-    <!-- no translation found for experimental_category_title (5272318666666893547) -->
-    <skip />
+    <string name="experimental_category_title" msgid="5272318666666893547">"Eksperimentalno"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Čitač ekrana prvenstveno za slijepe i slabovidne osobe"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Dodirnite stavke na ekranu da se naglas pročitaju"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titlovi"</string>
-    <!-- no translation found for accessibility_screen_magnification_title (6001128808776506021) -->
-    <skip />
-    <!-- no translation found for accessibility_preference_magnification_summary (5867883657521404509) -->
-    <skip />
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite tri puta da biste uvećali"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="7798920976388197258"><b>" Za uvećavanje "</b>" Brzo dodirnite ekran 3 puta jednim prstom. \n"<ul><li>" Prevucite 2 ili više prstiju za listanje "</li>\n<li>" Sastavite 2 ili više prstiju ili ih rastavite za podešavanje uvećavanja "</li></ul>\n\n<b>" Da privremeno uvećate objekat,"</b>" brzo dodirnite ekran 3 puta i zadržite prst na trećem dodiru. \n"<ul><li>" Pomjerajte prst kako biste pregledali ekran "</li>\n<li>" Podignite prst da kako biste prekinuli uvećavanje objekta "</li></ul>\n\n" Ne možete uvećavati na tastaturi i navigacionoj traci."</string>
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Uvećanje"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Uvećavanje trostrukim dodirom"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Uvećavanje pomoću dugmeta"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Uvećavanje pomoću dugmeta i trostrukog dodira"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Uvećajte prikaz na ekranu"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite tri puta da zumirate"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Dodirnite dugme da zumirate"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Da zumirate "</b>", brzo dodirnite ekran 3 puta.\n"<ul><li>"Povlačite s 2 ili više prstiju da pomjerate prikaz"</li>\n<li>"Sastavite 2 ili više prstiju da podesite zumiranje"</li></ul>\n\n<b>"Da privremeno zumirate prikaz"</b>", brzo dodirnite ekran 3 puta i zadržite prst na trećem dodiru.\n"<ul><li>"Povlačite prstom da pregledate ekran"</li>\n<li>"Podignite prst da umanjite prikaz"</li></ul>\n\n"Ne možete uvećati prikaz na tastaturi i navigacionoj traci."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Kada je uključena funkcija uvećavanja, koristite dugme Pristupačnost na dnu ekrana da brzo uvećate.\n\n"<b>"Da zumirate"</b>", dodirnite dugme Pristupačnost, zatim dodirnite bilo gdje na ekranu.\n"<ul><li>"Povlačite s 2 ili više prstiju da pomjerate prikaz."</li>\n<li>"Sastavite 2 ili više prstiju da podesite zumiranje. "</li></ul>\n\n<b>"Da privremeno zumirate"</b>", dodirnite dugme Pristupačnost, zatim dodirnite i držite bilo gdje na ekranu.\n"<ul><li>"Povlačite prstom da pregledate ekran"</li>\n<li>"Podignite prst da umanjite prikaz"</li></ul>\n\n"Ne možete uvećati prikaz na tastaturi i navigacionoj traci."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Dugme Pirstupačnost podešeno je za aktiviranje usluge <xliff:g id="SERVICE">%1$s</xliff:g>. Da koristite uvećanje dodirnite i držite dugme Pristupačnost, zatim odaberite uvećanje."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Prečica za pristupačnost"</string>
+    <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Usluga prečice"</string>
+    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Dopusti iz zaključanog ekrana"</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"Kada je uključena prečica, možete pritisnuti i držati 3 sekunde oba dugmeta za podešavanje jačine zvuka da pokrenete funkciju za pristupačnost."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst visokog kontrasta"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatsko ažuriranje uvećanja ekrana"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažurira uvećanje ekrana kod prelaza aplikacija"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Poziv se završava dugmetom za napajanje"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Dugme uklj./isklj. prekida poziv"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Veliki pokazivač miša"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombiniraj kanale prilikom reproduciranja zvuka"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Odgoda za dodirivanje i držanje"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inverzija boja"</string>
-    <!-- no translation found for accessibility_display_inversion_preference_subtitle (7052959202195368109) -->
-    <skip />
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikni kada se pokazivač zaustavi"</string>
-    <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Sačekaj prije klika"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može uticati na performanse"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klik kada se pokazivač zaustavi"</string>
+    <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Odgoda prije klika"</string>
+    <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
+    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"Prikaži u Brzim postavkama"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Način rada za korekciju"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -1862,18 +1998,25 @@
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite svoj obrazac."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite svoj PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite lozinku."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Pratite svoje aktivnosti"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Primajte obavještenja za vrijeme interakcije s aplikacijom."</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Prati vaše aktivnosti"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Dobija obavještenja kada ostvarujete interakciju s aplikacijom."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Želite li zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Uslugu <xliff:g id="SERVICE">%1$s</xliff:g> možete zaustaviti dodirom na OK."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nema instaliranih usluga"</string>
+    <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Nije odabrana usluga"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije naveden opis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Postavke"</string>
     <string name="print_settings" msgid="4742428530112487843">"Štampanje"</string>
-    <plurals name="print_settings_title" formatted="false" msgid="6994238166067938432">
-      <item quantity="one">%d zadatak za štampanje</item>
-      <item quantity="few">%d zadatka za štampanje</item>
-      <item quantity="other">%d zadataka za štampanje</item>
+    <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Isključeno"</string>
+    <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
+      <item quantity="one">Uključena je <xliff:g id="COUNT">%1$d</xliff:g> usluga štampanja</item>
+      <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>
@@ -1907,20 +2050,26 @@
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> do pune baterije"</string>
     <string name="background_activity_title" msgid="8618384801540759730">"Aktivnosti u pozadini"</string>
     <string name="background_activity_summary" msgid="8140094430510517362">"Dopustite aplikaciji da radi u pozadini"</string>
-    <string name="device_screen_usage" msgid="224482533839040430">"Korištenje ekrana"</string>
+    <string name="background_activity_summary_on" msgid="649282072540085599">"Aplikacija može raditi u pozadini kada se ne koristi"</string>
+    <string name="background_activity_summary_off" msgid="7666330699090632040">"Aktivnost aplikacije u pozadini je ograničena kada se ne koristi"</string>
+    <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikaciji nije dopušteno da radi u pozadini"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Korištenje ekrana od potpune napunjenosti"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja ekrana"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilne mreže"</string>
-    <string name="power_usage_list_summary" msgid="792703666229965848">"Korištenje aplikacija od posljednjeg potpunog punjenja"</string>
-    <string name="device_usage_list_summary" msgid="1545514224536252111">"Korištenje uređaja od posljednjeg potpunog punjenja"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Prije <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Korištenje aplikacije od potpune punjenosti (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Korištenje uređaja od potpune napunjenosti (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
+    <string name="screen_usage_summary" msgid="6687403051423153550">"Vrijeme koliko je ekran uključen od potpune napunjenosti"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"Korištenje uređaja od potpune napunjenosti"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Potrošnja baterije od isključivanja s napajanja"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Potrošnja baterije od posljednjeg pokretanja"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> rada na bateriji"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> od isključivanja s napajanja"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Puni se"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Punjenje"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekran uključen"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS uključen"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"Kamera je uključena"</string>
-    <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"Lampa je uključena"</string>
+    <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"Svjetiljka je uključena"</string>
     <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktivan"</string>
     <!-- no translation found for battery_stats_phone_signal_label (4137799310329041341) -->
@@ -1932,16 +2081,56 @@
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi na vrijeme"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"Napredno korištenje baterije"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalji historije"</string>
-    <string name="details_title" msgid="3792801565213935385">"Detalji o upotrebi"</string>
+    <string name="battery_details_title" msgid="6101394441569858580">"Korištenje baterije"</string>
     <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>
+    <!-- no translation found for battery_abnormal_details_title (5469019021857291216) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_wakelock_summary (4326186999058828831) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_wakeup_alarm_summary (644657277875785240) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_location_summary (6552797246798806002) -->
+    <skip />
+    <!-- no translation found for battery_abnormal_apps_summary (792553273248686972) -->
+    <skip />
+    <!-- no translation found for dialog_stop_title (6395127715596746479) -->
+    <skip />
+    <!-- no translation found for dialog_stop_message (9149534230295983971) -->
+    <skip />
+    <!-- no translation found for dialog_stop_message (5702924180465982412) -->
+    <skip />
+    <!-- no translation found for dialog_stop_message (9201053069493107713) -->
+    <skip />
+    <!-- no translation found for dialog_stop_ok (2319777211264004900) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_title (1525936543485084879) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_message (5539009263025812279) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_message (4001747292234087612) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_message (585341224642457664) -->
+    <skip />
+    <!-- no translation found for dialog_background_check_ok (412876934682899659) -->
+    <skip />
+    <!-- no translation found for dialog_location_title (5888917530725874727) -->
+    <skip />
+    <!-- no translation found for dialog_location_message (7684240588903005427) -->
+    <skip />
+    <!-- no translation found for dialog_location_message (7439311770795993356) -->
+    <skip />
+    <!-- no translation found for dialog_location_message (6285773079775018012) -->
+    <skip />
+    <!-- no translation found for dialog_location_ok (4572391197601313986) -->
+    <skip />
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
-    <string name="power_flashlight" msgid="7794409781003567614">"Lampa"</string>
+    <string name="power_flashlight" msgid="7794409781003567614">"Svjetiljka"</string>
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Stanje mirovanja mobitela"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobilna mreža u stanju mirovanja"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet u stanju mirovanja"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u stanju mirovanja"</string>
@@ -1950,7 +2139,8 @@
     <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>
+    <!-- no translation found for power_user (3706143225319881667) -->
+    <skip />
     <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>
@@ -1966,7 +2156,7 @@
     <string name="usage_type_audio" msgid="6957269406840886290">"Zvuk"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_camera" msgid="8299433109956769757">"Kamera"</string>
-    <string name="usage_type_flashlight" msgid="1516392356962208230">"Lampa"</string>
+    <string name="usage_type_flashlight" msgid="1516392356962208230">"Svjetiljka"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Vrijeme rada"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Vrijeme bez signala"</string>
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Ukupni kapacitet baterije"</string>
@@ -1983,7 +2173,7 @@
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Potrošnja baterije kada je telefon u stanju pripravnosti"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Potrošnja baterije za mobilni radio"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Prebacite se na način rada u avionu kako biste štedili napajanje na područjima u kojima nema pokrivenosti mobilnom mrežom"</string>
-    <string name="battery_desc_flashlight" msgid="2908579430841025494">"Potrošnja baterije upotrebom baterijske lampe"</string>
+    <string name="battery_desc_flashlight" msgid="2908579430841025494">"Potrošnja baterije upotrebom svjetiljke"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"Potrošnja baterije upotrebom kamere"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Potrošnja baterije na prikaz i pozadinsko osvjetljenje"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Smanjite osvjetljenje ekrana i/ili trajanje perioda do isključivanja ekrana"</string>
@@ -2001,12 +2191,24 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Potrošnja baterije je približna vrijednost potrošnje energije te ne uključuje svaki izvor potrošnje baterije. Nedefinisana potrošnja je razlika između izračunate približne potrošnje energije i stvarne potrošnje koja se uočava na bateriji."</string>
     <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="4383512863007718804">"Vrijeme korištenja: %1$s"</string>
-    <string name="battery_overall_usage" msgid="5541736421708733643">"%1$s ukupnog korištenja baterije"</string>
-    <string name="battery_detail_since_full_charge" msgid="4329720759041042322">"Detaljan pregled korištenja od posljednjeg punjenja"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Korišteno <xliff:g id="TIME">^1</xliff:g>"</string>
+    <!-- no translation found for battery_active_for (2964359540508103032) -->
+    <skip />
+    <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>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pregled od posljednje potpune napunjenosti"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Posljednja potpuna napunjenost"</string>
+    <string name="battery_footer_summary" msgid="4701358808575132647">"Preostalo vrijeme baterije je približno i može se mijenjati u zavisnosti od korištenja"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"Dok se aktivno koristi"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"Dok je u pozadini"</string>
+    <string name="battery_detail_power_usage" msgid="6485766868610469101">"Korištenje baterije"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupnog korištenja svih aplikacija (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
+    <string name="battery_detail_info_title" msgid="8227822131405620369">"Od potpune napunjenosti"</string>
+    <string name="battery_detail_manage_title" msgid="9094314252105828014">"Upravljanje korištenjem baterije"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Procjena preostalog vremena"</string>
-    <string name="estimated_charging_time_left" msgid="5877141166478224765">"Vrijeme do potpune napunjenosti"</string>
-    <string name="estimated_time_description" msgid="6722669204902760489">"Procjena se može mijenjati u zavisnosti od upotrebe"</string>
+    <string name="estimated_charging_time_left" msgid="5614442409326164691">"Do potpune napunjenosti"</string>
+    <string name="estimated_time_description" msgid="8760210909000037089">"Procjena se može mijenjati u zavisnosti od korištenja"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> od isključivanja s napajanja"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"Tokom posljednjeg isključivanja s napajanja <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Ukupno korištenje"</string>
@@ -2019,7 +2221,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikad"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"na <xliff:g id="PERCENT">%1$s</xliff:g> baterije"</string>
     <string name="battery_percentage" msgid="723291197508049369">"Postotak napunjenosti baterije"</string>
-    <string name="battery_percentage_description" msgid="8511658577507384014">"Prikaži postotak napunjenosti baterije na statusnoj traci"</string>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Prikaz postotka napunjenosti baterije na statusnoj traci"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statistika procesa"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Geeky statistike o pokrenutim procesima"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Iskorištena memorija"</string>
@@ -2052,7 +2254,7 @@
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 sati"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 sati"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dan"</string>
-    <string name="menu_show_system" msgid="8864603400415567635">"Prikaži sistem"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"Prikaz sistemskih procesa"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"Sakrij sistemske procese"</string>
     <string name="menu_show_percentage" msgid="4717204046118199806">"Prikaži postotke"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Koristi Uss"</string>
@@ -2064,20 +2266,24 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Postavke glasovnog unosa i izlaza"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno pretraživanje"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android tastatura"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Govor"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Podešavanja govornog unosa"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Govorni unos"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Usluge govornog unosa"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Cela aktuelna reč i interakcija"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Jednostavno pretvaranje govora u tekst"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ova usluga za glasovni unos će biti u mogućnosti da obavlja uvijek uključeno praćenje glasa i da u vaše ime kontrolira aplikacije omogućene glasom. Ona dolazi iz <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> aplikacija. Omogućiti korištenje ove usluge?"</string>
-    <string name="tts_engine_preference_title" msgid="1578826947311494239">"Željeni program"</string>
+    <string name="tts_engine_preference_title" msgid="1578826947311494239">"Željeni alat"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"Postavke programa"</string>
     <string name="tts_sliders_title" msgid="992059150784095263">"Brzina govora i visina glasa"</string>
     <string name="tts_engine_section_title" msgid="6289240207677024034">"Program"</string>
     <string name="tts_install_voice_title" msgid="6275828614052514320">"Glasovi"</string>
-    <string name="tts_reset_speech_rate_title" msgid="3993885027390495498">"Postavite brzinu govora"</string>
-    <string name="tts_reset_speech_rate_summary" msgid="8561618897094097540">"Brzinu kojom se tekst izgovara postavite na normalnu."</string>
+    <string name="tts_spoken_language" msgid="5542499183472504027">"Jezik govora"</string>
+    <string name="tts_install_voices_title" msgid="8808823756936022641">"Instalirajte Glasove"</string>
+    <string name="tts_install_voices_text" msgid="5292606786380069134">"Nastavite na aplikaciju <xliff:g id="TTS_APP_NAME">%s</xliff:g> da instalirate glasove"</string>
+    <string name="tts_install_voices_open" msgid="667467793360277465">"Otvori aplikaciju"</string>
+    <string name="tts_install_voices_cancel" msgid="4711492804851107459">"Otkaži"</string>
+    <string name="tts_reset" msgid="2661752909256313270">"Vrati na zadano"</string>
+    <string name="tts_play" msgid="2628469503798633884">"Pokreni"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Upravljanje napajanjem"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ažuriranje Wi-Fi postavke"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ažuriranje postavki za Bluetooth"</string>
@@ -2097,21 +2303,21 @@
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"isključeno"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Pohrana akreditiva"</string>
-    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instaliraj iz pohrane"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instaliranje iz pohrane"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instaliraj sa SD kartice"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instaliraj certifikate iz pohrane"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instaliranje certifikata iz pohrane"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instaliraj certifikate sa SD kartice"</string>
-    <string name="credentials_reset" msgid="3239382277144980418">"Obriši akreditive"</string>
-    <string name="credentials_reset_summary" msgid="3369361230171260282">"Ukloni sve certifikate"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Brisanje akreditiva"</string>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Uklanjanje svih certifikata"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pouzdani akreditivi"</string>
-    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaži pouzdane CA certifikate"</string>
-    <string name="user_credentials" msgid="3719013347787187083">"Korisnički akreditiv"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"Pogledaj i promijeni sačuvane akreditive"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaz pouzdanih CA certifikata"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"Korisnički akreditivi"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"Prikaz i izmjena sačuvanih akreditiva"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"Napredno"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Vrsta pohrane"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Sa hardverskom podlogom"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Samo softverski"</string>
-    <string name="credentials_settings_not_available" msgid="7968275634486624215">"Vjerodajnice nisu dostupne ovom korisniku"</string>
+    <string name="credentials_settings_not_available" msgid="7968275634486624215">"Akreditivi nisu dostupni za ovog korisnika"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"Instalirani za VPN i aplikacije"</string>
     <string name="credential_for_wifi" msgid="6228425986551591864">"Instalirani za Wi-Fi mrežu"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -2125,46 +2331,46 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Pohrana akreditiva je izbrisana."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Nije uspjelo bris. memorije vjerodaj."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohrana akreditiva je omogućena."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebate postaviti PIN za zaključavanje ekrana ili lozinku da biste mogli koristiti pohranu akreditiva."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Aplikacije s pristupom upotrebi"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebate postaviti PIN za zaključavanje ekrana ili lozinku da možete koristiti pohranu akreditiva."</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Apl. s pristupom pod. o korišt."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton za hitne situacije"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavi ponašanje prilikom upućivanja poziva za hitne situacije"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"Sigurnosna kopija"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"Rezervna kopija i obnavljanje"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"Sigurnosno kopiranje"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Lični podaci"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Pravi rezervnu kopiju mojih podataka"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"Izrada sigurnosnih kopija podataka"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Pravite sigurnosne kopije podataka aplikacija, lozinki za Wi-Fi te drugih postavki na Google serverima"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Račun za rezervnu kopiju"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Uvrstite podatke aplikacije"</string>
-    <string name="auto_restore_title" msgid="5397528966329126506">"Automatsko obnavljanje"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Prilikom ponovnog instaliranja aplikacije obnovi postavke i podatke iz rezervne kopije"</string>
-    <string name="backup_inactive_title" msgid="5355557151569037197">"Usluga pravljenja sigurnosnih kopija je neaktivna."</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Rezervna kopija podataka trenutno nije pohranjena ni na jednom računu"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"Automatsko vraćanje"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Prilikom ponovnog instaliranja aplikacije, vraća sigurnosne kopije postavki i podataka"</string>
+    <string name="backup_inactive_title" msgid="685838037986644604">"Usluga za izradu sigurnosne kopije nije aktivna"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Nijedan račun trenutno ne pravi sigurnosne kopije podataka"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Želite li prestati sa pravljenjem sigurnosnih kopija lozinki za Wi-Fi, obeleživača, drugih postavki te podataka aplikacija i izbrisati sve kopije sa Google servera?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Prestani da praviš sigurnosne kopije podataka (npr. lozinke za Wi-Fi i istorija poziva) i podataka aplikacije (npr. postavke i fajlovi koje pohranjuju aplikacije), i izbriši sve kopije na udaljenim serverima?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatski napravi rezervnu kopiju podataka na uređaju (npr. Wi-Fi lozinki i istorije poziva) i aplikacijskih podataka (npr. postavki i datoteka spremljenih od strane aplikacija) na udaljenoj lokaciji.\n\nKada uključite automatsku izradu rezervne kopije, podaci na uređaju i u aplikacijama se periodično čuvaju na udaljenoj lokaciji. Aplikacijski podaci mogu biti bilo koji podaci koje je aplikacija sačuvala (u skladu sa postavkama programera), uključujući potencijalno osjetljive podatke kao što su kontakti, poruke i fotografije."</string>
-    <string name="device_admin_settings_title" msgid="1335557832906433309">"Postavke administracije uređaja"</string>
-    <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator uređaja"</string>
-    <string name="remove_device_admin" msgid="7736174723276745230">"Deaktiviraj administratora ovog uređaja"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"Daljinski pokrenite automatsku izradu sigurnosnih kopija podataka na uređaju (npr. Wi-Fi lozinki i historije poziva) i podataka iz aplikacija (npr. postavki i fajlova koje pohranjuju aplikacije).\n\nKada uključite automatsku izradu sigurnosnih kopija, podaci iz uređaja i aplikacija se periodično pohranjuju daljinski. Podaci iz aplikacije mogu biti bilo koji podaci koje je aplikacija sačuvala (na osnovu programerskih postavki), uključujući i potencijalno osjetljive podatke, kao što su kontakti, poruke i fotografije."</string>
+    <string name="device_admin_settings_title" msgid="4960761799560705902">"Postavke administratora uređaja"</string>
+    <string name="active_device_admin_msg" msgid="578748451637360192">"Aplikacija administratora uređaja"</string>
+    <string name="remove_device_admin" msgid="9207368982033308173">"Deaktiviraj ovu aplikaciju administratora uređaja"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Deinstaliraj aplikaciju"</string>
-    <string name="remove_and_uninstall_device_admin" msgid="6983421266937728520">"Deaktiviraj i deinstaliraj"</string>
-    <string name="select_device_admin_msg" msgid="2645509057946368094">"Administratori uređaja"</string>
-    <string name="no_device_admins" msgid="702695100241728775">"Nema dostupnih administratora uređaja"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Deaktiviraj i deinstaliraj"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacije administratora uređaja"</string>
+    <string name="no_device_admins" msgid="4846602835339095768">"Nema dostupnih aplikacija administratora uređaja"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Lični"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Work"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Nema dostupnih pouzdanih agenata"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Aktivirati administratora uređaja?"</string>
-    <string name="add_device_admin" msgid="1349673618141610506">"Aktiviraj administratora ovog uređaja"</string>
-    <string name="device_admin_add_title" msgid="7705551449705676363">"Administrator uređaja"</string>
-    <string name="device_admin_warning" msgid="2026747446313628233">"Aktiviranjem ove opcije administrator će omogućiti aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da izvršava sljedeće operacije:"</string>
-    <string name="device_admin_status" msgid="4252975713178851910">"Ovaj administrator je aktivan i omogućava aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da izvršava sljedeće operacije:"</string>
+    <string name="add_device_admin_msg" msgid="1501847129819382149">"Želite li aktivirati aplikaciju administratora uređaja?"</string>
+    <string name="add_device_admin" msgid="4192055385312215731">"Aktiviraj aplikaciju administratora uređaja"</string>
+    <string name="device_admin_add_title" msgid="3140663753671809044">"Administrator uređaja"</string>
+    <string name="device_admin_warning" msgid="7482834776510188134">"Ako aktivirate ovu aplikaciju administratora, omogućit ćete aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da izvršava sljedeće operacije:"</string>
+    <string name="device_admin_status" msgid="7234814785374977990">"Ova aplikacija administratora je aktivna i omogućava aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da izvršava sljedeće operacije:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"Aktivirati Upravitelj profila?"</string>
-    <string name="adding_profile_owner_warning" msgid="8081841501073689534">"Prelaskom na naredni korak, vaš Korisnik prelazi pod kontrolu Administratora koji osim ličnih, može spremati i povezane podatke.\n\nAdministrator ima mogućnost nadzora i upravljanja postavkama, pristupom, aplikacijama i podacima vezanim za ovog Korisnika, uključujući aktivnosti na mreži i lokacijske informacije uređaja."</string>
-    <string name="admin_disabled_other_options" msgid="4564776259414246934">"Ostale opcije je isključio administrator."</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"Ako nastavite, vašim korisnikom će upravljati vaš administrator koji će, osim vaših ličnih podataka, moći pohranjivati i povezane podatke.\n\nVaš administrator može pratiti i upravljati postavkama, pristupom, aplikacijama i podacima koji su povezani s ovim korisnikom, uključujući aktivnost na mreži i informacije o lokaciji vašeg uređaja."</string>
+    <string name="admin_disabled_other_options" msgid="7712694507069054530">"Administrator je onemogućio ostale opcije"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"Više detalja"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Bez naslova"</string>
-    <string name="sound_category_sound_title" msgid="1488759370067953996">"Opće"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"Opće postavke"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"Dnevnik obavještenja"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Melodija zvona telefona i vibracija"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistem"</string>
@@ -2234,12 +2440,12 @@
     <string name="preference_change_password_title" msgid="8955581790270130056">"Promijenite lozinku"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Postavke računa"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Ukloni račun"</string>
-    <string name="header_add_an_account" msgid="756108499532023798">"Dodajte račun"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Dodavanje računa"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Završi"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Ukloniti račun?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Uklanjanjem ovog računa će se izbrisati sve njegove poruke, kontakti i ostali podaci s tableta!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Uklanjanjem ovog računa će se izbrisati sve njegove poruke, kontakti i ostali podaci s telefona!"</string>
-    <string name="remove_account_failed" msgid="6980737964448187854">"Administrator ne dozvoljava ovu izmjenu"</string>
+    <string name="remove_account_failed" msgid="3901397272647112455">"Vaš administrator ne dopušta ovu promjenu"</string>
     <string name="provider_label" msgid="7724593781904508866">"Push pretplate"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
@@ -2266,7 +2472,7 @@
     <string name="data_usage_app" msgid="4970478397515423303">"Korištenje aplikacija"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIJE O APLIKACIJI"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilni podaci"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"Postavi ograničenje za podatke"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"Postavljanje ograničenja za podatke"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciklus prijenosa podataka"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Korištenje aplikacije"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roming podataka"</string>
@@ -2277,7 +2483,7 @@
     <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Sakrij Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Prikaži korištenje Etherneta"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Sakrij korištenje podataka putem Etherneta"</string>
-    <string name="data_usage_menu_metered" msgid="6235119991372755026">"Ograničenja za mrežu"</string>
+    <string name="data_usage_menu_metered" msgid="6235119991372755026">"Mrežna ograničenja"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatsko sinhroniziranje podataka"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM kartice"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"Mobilne mreže"</string>
@@ -2314,8 +2520,7 @@
     <string name="data_usage_background_label" msgid="2722008379947694926">"Pozadina:"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"Aplikacijske postavke"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Pozadinski podaci"</string>
-    <!-- no translation found for data_usage_app_restrict_background_summary (5853552187570622572) -->
-    <skip />
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Omogući prijenos mobilnih podataka u pozadini"</string>
     <!-- no translation found for data_usage_app_restrict_background_summary_disabled (7401927377070755054) -->
     <skip />
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograničiti podatke u pozadini?"</string>
@@ -2327,11 +2532,11 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Sve promjene koje napravite na svom web računu automatski se kopiraju na vaš telefon. \n\nNeki računi također mogu automatski kopirati na web promjene napravljene na telefonu. Google račun funkcioniše na ovaj način."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Isključiti automatsko sinhroniziranje podataka?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Ovim će se uštedeti na podacima i potrošnji baterije, ali ćete morati ručno sinhronizirati svaki račun da prikupite najnovije informacije. Također, nećete primati obavještenja kada se izvrše ažuriranja."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Poništi datum ciklusa korištenja"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum poništavanja ciklusa korištenja"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum svakog mjeseca:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Postavi"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavi upozorenje za prijenos podataka"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavite ograničenje za prijenos podataka"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavljanje upozorenja o prijenosu podataka"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavljanje ograničenja za prijenos podataka"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje prijenosa podataka"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Vaš tablet će isključiti prijenos mobilnih podataka nakon što dostigne ograničenje koje ste postavili.\n\nS obzirom na to da vaš telefon mjeri prijenos podataka te da obračun vašeg operatera može biti drugačiji, uzmite u obzir postavljanje umjerenog ograničenja."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Vaš telefon će isključiti prijenos mobilnih podataka nakon što dostigne ograničenje koje ste postavili.\n\nS obzirom na to da vaš telefon mjeri prijenos podataka te da obračun vašeg operatera može biti drugačiji, uzmite u obzir postavljanje umjerenog ograničenja."</string>
@@ -2347,7 +2552,7 @@
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: iskorišteno otprilike <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: iskoristili ste oko <xliff:g id="TOTAL">%1$s</xliff:g> prema mjerenju tableta. Obračun operatera može biti drugačiji."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: iskoristili ste oko <xliff:g id="TOTAL">%1$s</xliff:g> prema mjerenju telefona. Obračun operatera može biti drugačiji."</string>
-    <string name="data_usage_metered_title" msgid="7383175371006596441">"Ograničenja za mreže"</string>
+    <string name="data_usage_metered_title" msgid="7383175371006596441">"Mrežna ograničenja"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Mjerene mreže tretiraju se kao mobilne kada je ograničeno korištenje pozadinskih podataka. Aplikacije mogu dati upozorenje prije korištenja takvih mreža za velika preuzimanja."</string>
     <!-- no translation found for data_usage_metered_mobile (5423305619126978393) -->
     <skip />
@@ -2376,6 +2581,11 @@
     <string name="vpn_not_used" msgid="9094191054524660891">"(ne koristi se)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(ne verifikuj server)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(primljeno od servera)"</string>
+    <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"Ovaj tip VPN-a ne može biti stalno povezan"</string>
+    <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"Uvijek aktivni VPN podržava samo numeričke adrese servera"</string>
+    <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"DNS server mora biti naveden za uvijek aktivni VPN"</string>
+    <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"Adrese DNS servera moraju biti numeričke za uvijek aktivni VPN"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"Unesena informacija ne podržava uvijek aktivni VPN"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"Otkaži"</string>
     <string name="vpn_done" msgid="8678655203910995914">"Odbaci"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Sačuvaj"</string>
@@ -2384,7 +2594,7 @@
     <string name="vpn_edit" msgid="8647191407179996943">"Uredi VPN profil"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Zaboravi"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Poveži se na <xliff:g id="PROFILE">%s</xliff:g>"</string>
-    <string name="vpn_disconnect_confirm" msgid="2555877026824771115">"Prekinite vezu sa ovim VPN-om."</string>
+    <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Želite li prekinuti vezu s ovim VPN-om?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Prekini vezu"</string>
     <string name="vpn_version" msgid="1939804054179766249">"Verzija <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"Zaboravi VPN"</string>
@@ -2396,28 +2606,25 @@
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"Već ste povezani na VPN. Ako se povežete na drugu, postojeći VPN će biti zamijenjen."</string>
     <string name="vpn_turn_on" msgid="2363136869284273872">"Uključi"</string>
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> se ne može povezati"</string>
-    <string name="vpn_cant_connect_message" msgid="2593197919352621279">"Ova aplikacija ne podržava uvijek aktivni VPN."</string>
+    <string name="vpn_cant_connect_message" msgid="1352832123114214283">"Ova aplikacija ne podržava uvijek aktivni VPN"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Dodaj VPN profil"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Uredi profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Izbriši profil"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Uvijek aktivni VPN"</string>
-    <string name="vpn_no_vpns_added" msgid="4308317205962153438">"Nema dodatih VPN-ova."</string>
-    <string name="vpn_always_on_active" msgid="2789423425184556882">"Funkcija Uvijek uključeno je aktivna"</string>
-    <string name="vpn_always_on_inactive" msgid="3488804214062121892">"Opcija Uvijek uključeno je neaktivna"</string>
-    <string name="vpn_not_supported_by_this_app" msgid="5002053874215892179">"Ova aplikacija ne podržava ovu funkciju"</string>
-    <string name="vpn_require_connection" msgid="4564777707170757146">"Dopusti povezivanje samo putem VPN mreže."</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Nema dodanih VPN-ova"</string>
+    <string name="vpn_always_on_summary" msgid="2821344524094363617">"Ostanite stalno povezani na VPN"</string>
+    <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Ova aplikacija ne podržava ovu funkciju"</string>
+    <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Funkcija Uvijek uključeno je aktivna"</string>
+    <string name="vpn_require_connection" msgid="8388183166574269666">"Blokiraj veze bez VPN-a"</string>
     <string name="vpn_require_connection_title" msgid="159053539340576331">"Treba li zahtijevati VPN vezu?"</string>
-    <string name="vpn_lockdown_active" msgid="4687243926584886862">"Aktivirano je zaključavanje"</string>
-    <string name="vpn_lockdown_inactive" msgid="3366835171623444107">"Zaključavanje nije aktivirano"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Odaberite VPN profil s kojim će uvijek biti uspostavljena veza. Mrežni promet će biti dopušten samo kad je uspostavljena veza s tim VPN-om."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Nema"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Uvijek aktivni VPN zahtijeva IP adresu i za server i za DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nema mrežne veze. Pokušajte ponovo kasnije."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"Isključeni ste iz VPN-a"</string>
-    <!-- no translation found for vpn_disconnected_summary (3082851661207900606) -->
-    <skip />
-    <string name="vpn_missing_cert" msgid="7972907102570411501">"Nedostaje certifikat. Uredite profil."</string>
+    <string name="vpn_disconnected_summary" msgid="3082851661207900606">"Ništa"</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"Nedostaje certifikat. Pokušajte urediti profil."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Korisnik"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Onemogući"</string>
@@ -2432,13 +2639,14 @@
     <string name="one_usercrt" msgid="2150319011101639509">"jedan korisnički certifikat"</string>
     <string name="one_cacrt" msgid="6844397037970164809">"jedan CA certifikat"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA certifikati"</string>
-    <string name="user_credential_title" msgid="1329449215749665378">"Detalji o akreditivu"</string>
+    <string name="user_credential_title" msgid="1954061209643070652">"Detalji o akreditivima"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"Uklonjeni akreditiv: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"Nisu instalirani korisnički akreditivi"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Provjera pravopisa"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ovdje unesite trenutnu lozinku za punu rezervnu kopiju"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ovdje unesite novu lozinku za potpune rezervne kopije"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ovdje ponovo otkucajte novu lozinku za punu rezervnu kopiju"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Postavi lozinku za rezervnu kopiju"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ovdje unesite trenutnu lozinku za sigurnosnu kopiju čitavog sistema"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ovdje unesite novu lozinku za sigurnosne kopije čitavog sistema"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ovdje ponovo unesite novu lozinku za sigurnosnu kopiju čitavog sistema"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Postavi lozinku za sigurnosnu kopiju"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Otkaži"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatna ažuriranja sistema"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Onemogućeno"</string>
@@ -2499,7 +2707,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ograničeni profili ne mogu dodati račune"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Izbrišite <xliff:g id="USER_NAME">%1$s</xliff:g> sa uređaja"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Postavke zaključavanja ekrana"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Dodajte korisnike sa zaključanog ekrana"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Dodavanje korisnika sa zaključanog ekrana"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novi korisnik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novi profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Želite li izbrisati sebe?"</string>
@@ -2519,8 +2727,8 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Ukloniti gosta?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Sve aplikacije i podaci iz ove sesije će biti izbrisani."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Ukloniti"</string>
-    <string name="user_enable_calling" msgid="5128605672081602348">"Uključite telefonske pozive"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Uključi telefonske pozive i SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Uključivanje telefonskih poziva"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Uključivanje telefonskih poziva i SMS-ova"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Ukloni korisnika"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Uključiti telefonske pozive?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Historija poziva će se dijeliti s ovim korisnikom."</string>
@@ -2535,7 +2743,7 @@
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ova postavka utiče na sve korisnike ovog telefona."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Promijenite jezik"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Dodirni i plati"</string>
-    <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Kako ovo radi"</string>
+    <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Način funkcioniranja"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Plaćajte telefonom u prodavnicama"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"Zadana aplikacija za plaćanje"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Nije postavljeno"</string>
@@ -2543,7 +2751,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Koristiti zadanu aplikaciju"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Uvijek"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Osim kada je otvorena druga aplikacija za plaćanje"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Na terminalu koji podržava uslugu Dodirni i plati plaćajte pomoću:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Na terminalu \"Dodirni i plati\" plaćajte pomoću:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Plaćanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Postavite aplikaciju za plaćanje, zatim jednostavno prislonite poleđinu svog telefona uz bilo koji terminal označen simbolom beskontaktne komunikacije."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Razumijem"</string>
@@ -2571,7 +2779,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Upravitelj za pozive"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Emisije za hitne slučajeve"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Hitna emitiranja"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Mrežni operateri"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nazivi pristupnih tačaka"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Unaprijeđeni 4G LTE način rada"</string>
@@ -2592,7 +2800,7 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Dozvoli razmjenu podataka kada <xliff:g id="DEVICE_NAME">%1$s</xliff:g> dodiruje drugi NFC uređaj"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Dopušta razmjenu podataka kada tablet dodirne drugi uređaj"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Dozvoli razmjenu podataka pri dodiru telefona sa drugim uređajem"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Omogućavanje razmjene podataka kada telefon dodirne drugi uređaj"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Lokacija"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Omogućava da aplikacije koriste informacije o lokaciji"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Nazad"</string>
@@ -2647,17 +2855,17 @@
       <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>
-    <!-- no translation found for connected_devices_dashboard_summary (2390582103384791904) -->
-    <skip />
+    <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">"Dopuštenja, zadane aplikacije"</string>
-    <!-- no translation found for account_dashboard_title (4936890821712178853) -->
-    <skip />
+    <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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"Zadane aplikacije"</string>
-    <string name="system_dashboard_summary" product="default" msgid="3093393529569103150">"Jezici, sigurnosna kopija, ažuriranja, o telefonu"</string>
-    <string name="system_dashboard_summary" product="tablet" msgid="4126847688457251215">"Jezici, sigurnosna kopija, ažuriranja, o telefonu"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"Jezici, vrijeme, sigurnosna kopija, ažuriranja"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Postavke"</string>
     <string name="search_menu" msgid="6283419262313758339">"Postavke pretraživanja"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Postavke pretraživanja"</string>
@@ -2672,7 +2880,7 @@
     <string name="keywords_display_night_display" msgid="7630169927425425754">"zatamnjen ekran, noć, boja"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"pozadina, personalizirati, prilagoditi ekran"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"veličina teksta"</string>
-    <string name="keywords_display_cast_screen" msgid="7684618996741933067">"projektovati, prebaciti"</string>
+    <string name="keywords_display_cast_screen" msgid="7684618996741933067">"projekt, emitiranje"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"prostor, disk, čvrsti disk, upotreba uređaja"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"potrošnja energije, punjenje"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"pravopis, rječnik, provjera pravopisa, automatsko ispravljanje"</string>
@@ -2705,6 +2913,12 @@
     <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>
+    <!-- no translation found for keywords_squeeze_to_launch_gesture (4459283333825902485) -->
+    <skip />
+    <!-- no translation found for keywords_wake_squeeze_gesture (6923058534235267845) -->
+    <skip />
+    <!-- no translation found for keywords_alarm_silence_gesture (8507935972184597252) -->
+    <skip />
     <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>
@@ -2714,24 +2928,26 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag ne podržava zapisivanje. Koristite drugi tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Podrazumijevani zvuk"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Jačina zvona je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="2507943820408985874">"Jačina zvuka, vibracija, Ne ometaj"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Jačina zvuka, vibracija, Ne ometaj"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zvono je postavljeno da vibrira"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zvono je utišano"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Jačina zvona je na 80%"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Jačina zvuka medijskog sadržaja"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Jačina zvuka medija"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Jačina zvuka alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Jačina zvona"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Jačina zvuka za obavještenja"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"Podrazumijevani zvuk obavještenja"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Zadani zvuk obavještenja"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Zvuk iz aplikacije"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Zadani zvuk obavještenja"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Zadani zvuk alarma"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibracija i za pozive"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Dodatna vibracija za pozive"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Drugi zvukovi"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonovi tastature telefona"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvuk zaključavanja ekrana"</string>
-    <string name="charging_sounds_title" msgid="1132272552057504251">"Zvuk punjenja"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvukovi zaključavanja ekrana"</string>
+    <string name="charging_sounds_title" msgid="1132272552057504251">"Zvukovi punjenja"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Zvukovi priključne stanice"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Zvuci dodira"</string>
+    <string name="touch_sounds_title" msgid="5326587106892390176">"Zvukovi pri dodiru"</string>
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Vibracija na dodir"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Zvučnik priključne stanice reprodukuje zvuk"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Svi zvukovi"</string>
@@ -2740,58 +2956,70 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozorenje"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibracija"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Uključivanje zvukova"</string>
-    <string name="zen_mode_settings_title" msgid="9019451272935850774">"Postavke funkcije Ne ometaj"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dopustiti samo prioritete"</string>
+    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Nisu uključena automatska pravila"</string>
+    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
+      <item quantity="one">Uključeno je <xliff:g id="ON_COUNT">%d</xliff:g> automatsko pravilo</item>
+      <item quantity="few">Uključena su <xliff:g id="ON_COUNT">%d</xliff:g> automatska pravila</item>
+      <item quantity="other">Uključeno je <xliff:g id="ON_COUNT">%d</xliff:g> automatskih pravila</item>
+    </plurals>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Postavke funkcije Ne ometaj"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dozvoljeni su samo prioriteti"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="3373871113435938830">"Podesi funkciju Ne uznemiravajj"</string>
-    <string name="zen_mode_automation_suggestion_summary" msgid="8554080399360506596">"Utišajte uređaj u dato vrijeme"</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Postavite pravila za funkciju Ne ometaj"</string>
+    <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ograničite zvuk i vibracije u određenim vremenskim periodima"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Samo prioritetni prekidi"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Potpuna tišina"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiranje vizualnih prekida"</string>
-    <string name="sound_work_settings" msgid="6774324553228566442">"Zvuci radnog profila"</string>
-    <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Koristite zvuke ličnog profila"</string>
-    <string name="work_use_personal_sounds_summary" msgid="2940241783139859361">"Zvuci radnog profila su isti kao i kod ličnog"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiranje vizuelnih ometanja"</string>
+    <string name="sound_work_settings" msgid="6774324553228566442">"Zvukovi radnog profila"</string>
+    <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Koristite zvukove ličnog profila"</string>
+    <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvukovi su isti za radni i lični profil"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"Melodija zvona radnog telefona"</string>
-    <string name="work_notification_ringtone_title" msgid="2108983018726925833">"Zadani ton radnih obavještenja"</string>
-    <string name="work_alarm_ringtone_title" msgid="3670497923540424871">"Zadana melodija radnog alarma"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"Zadani zvuk radnih obavještenja"</string>
+    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"Zadani zvuk radnog alarma"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Isto kao kod ličnog profila"</string>
-    <string name="work_sync_dialog_title" msgid="3351285490304048243">"Želite li koristiti zvuke ličnog profila?"</string>
+    <string name="work_sync_dialog_title" msgid="7123973297187354813">"Zamijeniti zvukove?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Zamijeni"</string>
-    <string name="work_sync_dialog_message" msgid="9066322310245055242">"Zvuci ličnog profila će se koristiti umjesto trenutnih zvukova radnog profila"</string>
+    <string name="work_sync_dialog_message" msgid="7841728953710863208">"Zvukovi vašeg ličnog profila će se koristi za vaš radni profil"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"Želite li dodati prilagođeni zvuk?"</string>
+    <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"Ovaj fajl će se kopirati u folder <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Melodije zvona"</string>
-    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Ostali zvuci i vibracije"</string>
-    <string name="configure_notification_settings" msgid="7447797716856573587">"Pref. postavke obavještenja"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Ostali zvukovi i vibracije"</string>
+    <string name="configure_notification_settings" msgid="7616737397127242615">"Obavještenja"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obavještenja za posao"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsirajuće svjetlo obavještenja"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"Dozvoli tačke za obavještenja"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Trepćuće svjetlo"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaključanom ekranu"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obavještenja"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikazuj sav sadržaj obavještenja"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sakrij osjetljiv sadržaj obavještenja"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Uopće ne prikazuj obavještenja"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kada je uređaj zaključan, na koji način želite prikazivati obavještenja?"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kada je uređaj zaključan, na koji način želite da se prikazuju obavještenja?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Obavještenja"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Prikaži sadržaj svih poslovnih obavještenja"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Prikazuj sav sadržaj obavještenja radnog profila"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Sakrij sadržaj osjetljivih poslovnih obavještenja"</string>
     <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">"Kako želite da se prikazuju obavještenja profila kada vam je uređaj zaključan?"</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>
-    <!-- no translation found for app_notifications_summary (3421524441126902552) -->
+    <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_none" msgid="3173515479356106227">"Nije postavljeno"</string>
     <string name="notification_importance_unspecified" msgid="2196023702875112081">"Neka aplikacija odluči"</string>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikad ne prikazuj obavještenja"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Bez ometanja zvukom ili prikazivanjem"</string>
-    <string name="notification_importance_low" msgid="2445139943005315690">"Prikaži bez zvuka"</string>
+    <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuka"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Pusti zvuk"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Pusti zvuk i prikaži na ekranu"</string>
-    <string name="importance_reset" msgid="7458420788555607007">"Ponovno pokretanje"</string>
-    <string name="show_silently" msgid="2222875799232222056">"Pokaži bez zvuka"</string>
+    <string name="notification_importance_min_title" msgid="6974673091137544803">"Niska"</string>
+    <string name="notification_importance_low_title" msgid="8131254047772814309">"Srednja"</string>
+    <string name="notification_importance_default_title" msgid="9120383978536089489">"Visoka"</string>
+    <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="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obavještenja"</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>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne mogu čitati obavještenja"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d aplikacija može čitati obavještenja</item>
@@ -2804,8 +3032,8 @@
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Ako korisniku <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> isključite pristup obavještenjima, može se isključiti i pristup opciji Ne ometaj."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Isključi"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Otkaži"</string>
-    <string name="vr_listeners_title" msgid="1318901577754715777">"VR pomoćne usluge"</string>
-    <string name="no_vr_listeners" msgid="2689382881717507390">"Nijedna instalirana aplikacija nije zatražila da bude pokrenuta kao VR pomoćna usluga."</string>
+    <string name="vr_listeners_title" msgid="1318901577754715777">"Usluge pomagača za VR"</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"Nijedna instalirana aplikacija nije zatražila da bude pokrenuta kao usluga pomagača za VR."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Želite li dozvoliti pristup VR-a za uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> će moći raditi kada aplikacije budete koristili u načinu rada virtuelne realnosti."</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Kada je uređaj u VR načinu rada"</string>
@@ -2815,29 +3043,36 @@
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Nijedna instalirana aplikacija ne podržava način rada Slika u slici"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"sus slika u"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Slika u slici"</string>
-    <!-- no translation found for picture_in_picture_app_detail_switch (1131910667023738296) -->
-    <skip />
-    <!-- no translation found for picture_in_picture_app_detail_summary (7942592478427522244) -->
-    <skip />
-    <!-- no translation found for picture_in_picture_on (6103704909710176555) -->
-    <skip />
-    <!-- no translation found for picture_in_picture_off (5654388666434625247) -->
-    <skip />
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup Ne smetaj"</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="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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokira prikaz obavještenja ove aplikacije na uređaju"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokira prikaz ove kategorije obavještenja na uređaju"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Ostalo"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije objavila nikakva obavještenja"</string>
-    <!-- no translation found for app_settings_link (8894946007543660906) -->
-    <skip />
-    <!-- no translation found for deleted_channels (3757203969719476510) -->
+    <string name="app_settings_link" msgid="8894946007543660906">"Dodatne postavke u aplikaciji"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Uključeno za sve aplikacije"</string>
+    <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
+      <item quantity="one">Isključeno za <xliff:g id="COUNT_1">%d</xliff:g> aplikaciju</item>
+      <item quantity="few">Isključeno za <xliff:g id="COUNT_1">%d</xliff:g> aplikacije</item>
+      <item quantity="other">Isključeno za <xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
+    </plurals>
+    <plurals name="deleted_channels" formatted="false" msgid="8028574302599397935">
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> kategorija je izbrisana</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> kategorije su izbrisane</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kategorija je izbrisano</item>
+    </plurals>
+    <string name="notification_toggle_on" msgid="650145396718191048">"Uključeno"</string>
+    <string name="notification_toggle_off" msgid="2142010737190671762">"Isključeno"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blokiraj sve"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Nikada ne prikazuj ova obavještenja"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Prikaži obavještenja"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Nikad ne prikazuj obavještenja u nijansi ili na perifernim uređajima"</string>
-    <string name="notification_badge_title" msgid="5404669445214920178">"Prikži značku"</string>
-    <string name="notification_badge_summary" msgid="3944771498030335669">"Prikaži obavještenja kao značke na aplikaciji Home, ukoliko je podržano."</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"Dozvoli tačku za obavještenja"</string>
+    <string name="notification_channel_badge_title" msgid="2240827899882847087">"Prikaži tačku za obavještenja"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Premosti podešenja usluge Ne ometaj"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Dozvolite da se ova obavještenja i dalje čuju kada je opcija Ne ometaj podešena na Samo prioritetna obavještenja"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Na zaključanom ekranu"</string>
@@ -2846,14 +3081,17 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Osjetljivo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotovo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Značaj"</string>
-    <string name="notification_show_lights_title" msgid="7301956309661349031">"Uvijek koristi pulsirajuće svjetlo obavještenja"</string>
-    <string name="notification_vibrate_title" msgid="4942317478973441720">"Uvijek vibriraj"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Trepćuće svjetlo"</string>
+    <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibracija"</string>
+    <string name="notification_channel_sound_title" msgid="3899212238513507941">"Zvuk"</string>
+    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Izbriši"</string>
+    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Preimenuj"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Naziv pravila"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Unesite naziv pravila"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ime pravila se već koristi"</string>
-    <string name="zen_mode_add_rule" msgid="9100929184624317193">"Dodaj pravilo"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Dodajte još"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Obrisati pravilo"</string>
-    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Odaberite tip pravila"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Odabir tipa pravila"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Želite li izbrisati pravilo “<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Izbriši"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Vrsta pravila"</string>
@@ -2888,16 +3126,16 @@
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Sve poruke"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Izabrane poruke"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Od bilo koga"</string>
-    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo iz kontakata"</string>
+    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo od kontakata"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata označenih zvjezdicom"</string>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"Nijedno"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsjetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivi"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Odabrani pozivaoci"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovljeni pozivaoci"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ako ista osoba zove drugi put u roku od <xliff:g id="MINUTES">%d</xliff:g> minutnog perioda, dopustite poziv"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovni pozivaoci"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dopuštanje poziva ako ista osoba zove drugi put u roku od <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski upaliti"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikad"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Svaku noć"</string>
@@ -2921,19 +3159,19 @@
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokiranje kada je ekran uključen"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Sprječavanje da obavještenja koja su utišana opcijom Ne ometaj iskaču na ekran"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokiranje kada je ekran isključen"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Sprječavanje da obavještenja koja su utišana opcijom Ne ometaj uključuju ekran ili trepereće svjetlo za obavještenja"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Sprječavanje da obavještenja koja su utišana opcijom Ne ometaj uključuju ekran ili izazovu pulsiranje svjetla za obavještenja"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Spriječite da obavještenja utišana načinom rada Ne ometaj uključuju ekran"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Isključeno"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Kada je ekran uključen"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Kada je ekran isključen"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Kada je ekran isključen ili uključen"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke za obavještenja"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Pošaljite pov. inf. o ovom uređaju"</string>
-    <string name="restr_pin_enter_admin_pin" msgid="2451187374960131018">"Unesite PIN administratora"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Slanje informacija o uređaju"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Upišite PIN kôd administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Isključi"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"Isključeno"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Kačenje ekrana"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Kada je ova postavka uključena, možete koristiti kačenje na ekran da zadržite trenutni ekran u prikazu sve dok ga ne otkačite.\n\nKorištenje kačenja ekrana:\n\n1. Provjerite da li je kačenje ekrana uključeno.\n\n2. Otvorite željeni ekran.\n\n3. Dodirnite Pregled.\n\n4. Prevucite prema gore, a zatim dodirnite ikonu za kačenje."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Kada je ova postavka uključena, možete koristiti kačenje ekrana da zadržite trenutni ekran u prikazu sve dok ga ne otkačite.\n\nKorištenje kačenja ekrana:\n\n1. Provjerite da li je kačenje ekrana uključeno.\n\n2. Otvorite željeni ekran.\n\n3. Dodirnite Pregled.\n\n4. Prevucite prema gore, a zatim dodirnite ikonu za kačenje."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Traži unos obrasca prije poništavanja pribadanja"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Traži PIN prije poništavanja pribadanja"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Traži lozinku prije poništavanja pribadanja"</string>
@@ -2941,25 +3179,16 @@
     <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">"Ostani u portretnom 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 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="7164072567822375682">"Uređaj možete dodatno zaštiti tako da zahtijevate unošenje PIN-a prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke ili obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Uređaj možete dodatno zaštititi ako zahtijevate unošenje obrasca prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Uređaj možete dodatno zaštiti tako da zahtijevate unošenje lozinke prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke ili obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštititi ako zahtijevate unošenje PIN-a prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma.\n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštititi ako zahtijevate unošenje obrasca prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma.\n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštititi ako zahtijevate unošenje lozinke prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma.\n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Zahtijevaj unos PIN-a prilikom pokretanja uređaja"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Zahtijevaj unos obrasca prilikom pokretanja uređaja"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Zahtijevaj unos lozinke prilikom pokretanja uređaja"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ne, hvala"</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>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"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" 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="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>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Zahtijevati unos obrasca?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Zahtijevati lozinku?"</string>
@@ -2967,8 +3196,8 @@
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Prilikom unosa obrasca za pokretanje uređaja, usluge za pristupačnost kao što je <xliff:g id="SERVICE">%1$s</xliff:g> još uvijek neće biti dostupne."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Prilikom unosa lozinke za pokretanje uređaja, usluge za pristupačnost kao što je <xliff:g id="SERVICE">%1$s</xliff:g> još uvijek neće biti dostupne."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Napomena: Nakon ponovnog pokretanja, ova aplikacija se neće moći pokrenuti dok ne otključate telefon"</string>
-    <string name="imei_information_title" msgid="8499085421609752290">"IMEI informacije"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Informacije vezane za IMEI"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Informacije za IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Relativne informacije za IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. slot)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Zadano otvoriti"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Otvaranje linkova"</string>
@@ -2984,19 +3213,22 @@
     <string name="storage_used" msgid="7128074132917008743">"Iskorištena memorija"</string>
     <string name="change" msgid="6657848623929839991">"Izmijeni"</string>
     <string name="change_storage" msgid="600475265207060436">"Promijeni pohranu"</string>
-    <string name="notifications_label" msgid="2872668710589600731">"Obavještenja"</string>
-    <string name="notifications_enabled" msgid="4386196629684749507">"Normalna"</string>
-    <string name="notifications_disabled" msgid="3200751656741989335">"Blokirano"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"Obavještenja o aplikaciji"</string>
+    <!-- no translation found for notifications_enabled (6983396130566021385) -->
+    <skip />
+    <string name="notifications_disabled" msgid="334416731283131597">"Sve je isključeno"</string>
+    <string name="notifications_partly_blocked" msgid="592071133950126656">"Isključene kategorije: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"Bez zvuka"</string>
     <string name="notifications_redacted" msgid="4493588975742803160">"Osjetljivi sadržaj nije na zaključanom ekranu."</string>
     <string name="notifications_hidden" msgid="3619610536038757468">"Ne na zaključanom ekranu"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"Način rada Ne ometaj je poništen."</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
     <string name="notification_summary_level" msgid="2726571692704140826">"Nivo %d"</string>
+    <string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljena dozvola</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljene dozvole</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljenih dozvola</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljeno odobrenje</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljena odobrenja</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodijeljenih odobrenja</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="1564663886246010959">
       <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> odobrenja je dato</item>
@@ -3004,31 +3236,40 @@
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> od <xliff:g id="COUNT_3">%d</xliff:g> odobrenja je dato</item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="931276038884210752">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodatna dozvola</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodatne dozvole</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodatnih dozvola</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> dodatno odobrenje</item>
+      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> dodatna odobrenje</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> dodatnih odobrenja</item>
     </plurals>
-    <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nema dodijeljenih dozvola"</string>
-    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nema zatraženih dozvola"</string>
+    <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Nema dodijeljenih odobrenja"</string>
+    <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nema zatraženih odobrenja"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Sve aplikacije"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"Instalirane aplikacije"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"Instant-aplikacije"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Lične"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
-    <string name="filter_notif_blocked_apps" msgid="3446926933792244485">"Blokirano"</string>
+    <string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: Sve"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: Isključene"</string>
+    <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: hitno"</string>
+    <string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: niska važnost"</string>
+    <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: Isključene"</string>
+    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Kategorije: Zanemaruje postavku Ne ometaj"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguriraj aplikacije"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"Odobrenja aplikacije"</string>
-    <!-- no translation found for app_permissions_summary (5163974162150406324) -->
-    <skip />
+    <string name="app_permissions" msgid="4148222031991883874">"Odobrenja za aplikacije"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikacije koje koriste <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Dodirnite za buđenje"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Dva puta dodirnite bilo gdje na zaslonu da probudite uređaj"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Otvaranje linkova"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Ne otvara podržane linkove"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Otvori <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Otvori<xliff:g id="DOMAIN">%s</xliff:g> i druge URL-ove"</string>
-    <!-- no translation found for domain_urls_apps_summary (6999347849855021374) -->
+    <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Nema aplikacija koje mogu otvoriti podržane linkove"</string>
+    <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija koja otvara podržane linkove</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije koje otvaraju podržane linkove</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacija koje otvaraju podržane linkove</item>
+    </plurals>
     <string name="app_link_open_always" msgid="2474058700623948148">"Otvori u ovoj aplikaciji"</string>
     <string name="app_link_open_ask" msgid="7800878430190575991">"Pitaj svaki put"</string>
     <string name="app_link_open_never" msgid="3407647600352398543">"Nemoj otvarati u ovoj aplikaciji"</string>
@@ -3037,19 +3278,19 @@
     <string name="default_for_work" msgid="9152194239366247932">"Uobičajeno za rad"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Pomoć i glasovni unos"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikacija za pomoć"</string>
-    <string name="assistant_security_warning_title" msgid="8673079231955467177">"Želite li da <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> bude vaš pomoćnik?"</string>
-    <string name="assistant_security_warning" msgid="8498726261327239136">"Pomoćnik dobija mogućnost čitanja informacija o aplikacijama koje se koriste na vašem sistemu, uključujući informacije vidljive na ekranu ili dostupne unutar aplikacija."</string>
+    <string name="assistant_security_warning_title" msgid="8673079231955467177">"Želite li da <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> bude vaš asistent?"</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"Asistent dobija mogućnost čitanja informacija o aplikacijama koje se koriste na vašem sistemu, uključujući informacije vidljive na ekranu ili dostupne unutar aplikacija."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Pristajem"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Ne slažem se"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Izaberite glasovni unos"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Aplikacija preglednika"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Nema zadanog pretraživača"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Aplikacija za telefoniju"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Aplikacija za pozive"</string>
     <string name="default_app" msgid="6864503001385843060">"(Zadano)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistem)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Sistemski zadano)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Memorija aplikacija"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Pristup upotrebi"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Pohrana aplikacija"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Pristup korištenju"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Dopusti pristup korištenju"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Postavke upotrebe aplikacija"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Pristup korištenju omogućava praćenje drugih aplikacija koje koristite i učestalosti korištenja, kao i praćenje vašeg operatera, postavke jezika i drugo."</string>
@@ -3065,18 +3306,25 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g>/<xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Upozorenja za korištenje"</string>
-    <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
-    <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
+    <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>
+    <!-- no translation found for power_high_usage_title (3826660033363082922) -->
     <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>
     <string name="high_power_system" msgid="7362862974428225301">"Optimizacija baterije je nedostupna"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Ne primjenjuje se optimizacija baterije. Tako se baterija može brže isprazniti."</string>
-    <string name="high_power_prompt_title" msgid="4257734526819699048">"Zanemariti optimizaciju baterije?"</string>
-    <string name="high_power_prompt_body" msgid="4072587909486730876">"Dozvoliti aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> da ostane povezana u pozadini? Ovo bi moglo povećati potrošnju baterije."</string>
-    <string name="battery_summary" msgid="101415762036784289">"<xliff:g id="PERCENTAGE">%1$d</xliff:g>%% potrošnje od posljednjeg potpunog punjenja"</string>
-    <string name="battery_power_management" msgid="5571519699679107523">"Upravljanje napajanjem baterije"</string>
+    <string name="high_power_prompt_title" msgid="6358673688590282655">"Želite li dopustiti aplikaciji da uvijek radi u pozadini?"</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"Ako aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> dopustite da uvijek radi u pozadini, može se skratiti vijek trajanja baterije. \n\nTo možete promijeniti kasnije ako odete u Postavke &gt; Aplikacije i obavještenja."</string>
+    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> iskorištenosti od posljednje potpune napunjenosti"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"Upravljanje napajanjem"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Nema potrošnje baterije od prošlog potpunog punjenja"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Postavke aplikacije"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"Prikaži podešivač za SystemUI"</string>
@@ -3091,24 +3339,26 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Puni bateriju ovog uređaja"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Samo puni ovaj uređaj"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Napajanje"</string>
-    <string name="usb_use_power_only_desc" msgid="4912352581010190141">"Napajanje drugog povezanog uređaja"</string>
-    <!-- no translation found for usb_use_file_transfers (338076823500744605) -->
-    <skip />
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Punjenje povezanog uređaja. Radi samo na uređajima koji podržavaju punjenje putem USB priključka."</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Prenosi fajlove"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Prebacite fajlove na drugi uređaj"</string>
-    <!-- no translation found for usb_use_photo_transfers (6743967116266105718) -->
-    <skip />
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Prenesi fotografije (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prebacuje slike ili datoteke ukoliko MTP nije podržan (PTP)"</string>
-    <!-- no translation found for usb_use_MIDI (8405244560919283714) -->
-    <skip />
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Koristi uređaj za MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Uređaj se koristi za rad u MIDI modu"</string>
     <string name="usb_use" msgid="3256040963685055320">"Koristi USB za"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Punjenje ovog uređaja"</string>
+    <string name="usb_summary_power_only" msgid="3629517713817003738">"Napajanje"</string>
+    <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Prijenos fajlova"</string>
+    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Prijenos fotografija (PTP)"</string>
+    <string name="usb_summary_MIDI" msgid="5687906612187885908">"Korištenje uređaja kao MIDI"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Provjera u pozadini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pun pristup pozadini"</string>
-    <string name="assist_access_context_title" msgid="2269032346698890257">"Koristi tekst sa ekrana"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"Dozvolite da aplikacija za pomoć pristupa sadržaju na ekranu kao tekstu"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Koristi snimku ekrana"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Dozvoli aplikaciji za pomoć da pristupi slici ekrana"</string>
+    <string name="assist_access_context_title" msgid="2269032346698890257">"Korištenje teksta sa ekrana"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"Omogućavanje aplikaciji za pomoć da pristupa sadržaju na ekranu kao tekstu"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Korištenje snimke ekrana"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Omogućavanje aplikaciji za pomoć da pristupa slici ekrana"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Bljeskanje ekrana"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"Ivice ekrana bljeskaju kada aplikacija za pomoć pristupi tekstu s ekrana ili snimku ekrana"</string>
     <string name="assist_footer" msgid="1982791172085896864">"Aplikacije za pomoć vam mogu pomoći na osnovu informacija sa ekrana koji pregledate. Kako bi vam pružile sveukupnu pomoć, neke aplikacije podržavaju i usluge pokretača i glasovnog unosa."</string>
@@ -3125,7 +3375,7 @@
     <string name="total_memory" msgid="2017287600738630165">"Ukupno memorije"</string>
     <string name="average_used" msgid="5338339266517245782">"Prosječna iskorištenost (%)"</string>
     <string name="free_memory" msgid="4003936141603549746">"Slobodno"</string>
-    <string name="memory_usage_apps" msgid="5650192998273294098">"Korištenje memorije za aplikacije"</string>
+    <string name="memory_usage_apps" msgid="5650192998273294098">"Memorija koju koriste aplikacije"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija je koristila memoriju u prethodnom periodu od <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije su koristile memoriju u prethodnom periodu od <xliff:g id="DURATION_1">%2$s</xliff:g></item>
@@ -3144,41 +3394,28 @@
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Baterija se može brže isprazniti"</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Preporučuje se za duže trajanje baterije"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Želite da dozvolite aplikaciji <xliff:g id="APP">%s</xliff:g> da ignoriše optimizacije baterije?"</string>
-    <string name="app_list_preference_none" msgid="108006867520327904">"Nijedno"</string>
-    <string name="work_profile_usage_access_warning" msgid="8870622842216566692">"Isključivanje pristupa upotrebi za ovu aplikaciju ne sprečava da vaš administrator prati prijenos podataka za aplikacije u vašem poslovnom profilu."</string>
+    <string name="app_list_preference_none" msgid="108006867520327904">"Ništa"</string>
+    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Isključivanjem pristupa korištenju za ovu aplikaciju nećete spriječiti administratora da prati podatke o korištenju u aplikacija u vašem radnom profilu."</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"Iskorištenih znakova: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <!-- no translation found for draw_overlay_title (7524215631960029502) -->
-    <skip />
-    <!-- no translation found for draw_overlay (6564116025404257047) -->
-    <skip />
-    <!-- no translation found for system_alert_window_settings (8466613169103527868) -->
-    <skip />
+    <string name="draw_overlay" msgid="6564116025404257047">"Prikaz preko drugih aplikacija"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"Prikaz preko drugih aplikacija"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Aplikacije"</string>
-    <!-- no translation found for system_alert_window_access_title (6297115362542361241) -->
-    <skip />
-    <!-- no translation found for permit_draw_overlay (7456536798718633432) -->
-    <skip />
-    <!-- no translation found for app_overlay_permission_preference (9039432222453006038) -->
-    <skip />
-    <!-- no translation found for allow_overlay_description (3879905262954599959) -->
-    <skip />
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Prikaz preko drugih aplikacija"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"Dozvoli prikaz preko drugih aplikacija"</string>
+    <string name="app_overlay_permission_preference" msgid="9039432222453006038">"Dozvola za prikaz aplikacije iznad svih"</string>
+    <string name="allow_overlay_description" msgid="8961670023925421358">"Dozvolite ovoj aplikaciji da prekrije ostale aplikacije koje koristite. Može vas ometati u korištenju tih aplikacija ili promijeniti način na koji se one prikazuju ili ponašaju."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr slušalac virtuelne realnosti stereo pomoćna usluga"</string>
-    <!-- no translation found for keywords_system_alert_window (5049498015597864850) -->
-    <skip />
-    <!-- no translation found for overlay_settings (6930854109449524280) -->
-    <skip />
-    <!-- no translation found for system_alert_window_summary (602892301318324492) -->
-    <skip />
-    <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s dozvolom"</string>
-    <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
-    <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
-    <!-- no translation found for install_other_apps (6986686991775883017) -->
-    <skip />
-    <!-- no translation found for keywords_install_other_apps (761078076051006558) -->
-    <skip />
-    <string name="write_settings" msgid="4797457275727195681">"Promjeni postavke sistema"</string>
+    <string name="keywords_system_alert_window" msgid="5049498015597864850">"sistem upozorenje prozor dijaloški okvir prikazivanje preko drugih aplikacija"</string>
+    <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="app_permission_summary_allowed" msgid="1505409933012886711">"Dozvoljeno"</string>
+    <string name="app_permission_summary_not_allowed" msgid="2592617058101882802">"Nije dozvoljeno"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Instaliranje nepoznatih aplikacija"</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>
-    <string name="write_settings_summary" msgid="4302268998611412696">"Aplikacije sa dozvolom za mijenjanje postavki sistema: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
+    <string name="write_settings_summary" msgid="4302268998611412696">"Aplikacije sa odobrenjem za mijenjanje postavki sistema: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"Mogu instalirati druge aplikacije"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"Mogu mijenjati postavke sistema"</string>
     <string name="write_settings_title" msgid="4232152481902542284">"Mogu mijenjati postavke sistema"</string>
@@ -3186,21 +3423,16 @@
     <string name="write_settings_preference" msgid="3407383041273067448">"Dozvola za izmjenu postavki sistema aplikacije"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Dozvoli izmijenu postavki sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Ovo odobrenje omogućava aplikaciji da izmijeni postavke sistema."</string>
-    <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
-    <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Da"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ne"</string>
-    <!-- no translation found for external_source_switch_title (5581865736984836418) -->
-    <skip />
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Dozvoli iz ovog izvora"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dvostruko uvrtanje za otvaranje kamere"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Da biste otvorili aplikaciju za kameru, dva puta uvrnite zglob"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Dva pritiska na napajanje za kameru"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Brzo otvaranje fotoaparata bez otključavanja ekrana"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"Veličina ekrana"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Veličina prikaza"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Povećavanje ili umanjivanje objekata na ekranu"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"gustoća prikaza, uvećanje ekrana, promijeni veličinu, mijenjanje veličine"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"Smanjite ili povećajte objekte na ekranu. Neke aplikacije sa vašeg ekrana mogu promijeniti svoj položaj."</string>
-    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Pregledaj"</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Pregled"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Smanji"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Povećaj"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
@@ -3213,50 +3445,49 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Uto 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Uto 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Uto 18:03"</string>
-    <!-- no translation found for disconnected (4836600637485526329) -->
-    <skip />
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> podataka u upotrebi"</string>
-    <plurals name="notification_summary" formatted="false" msgid="4019451362120557382">
-      <item quantity="one">Slanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacije je blokirano.</item>
-      <item quantity="few">Slanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacije je blokirano.</item>
-      <item quantity="other">Slanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacija je blokirano.</item>
+    <string name="disconnected" msgid="4836600637485526329">"Nije povezano"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Iskorišteno <xliff:g id="AMOUNT">%1$s</xliff:g> podataka"</string>
+    <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
+      <item quantity="one">Isključeno za <xliff:g id="COUNT">%d</xliff:g> aplikaciju</item>
+      <item quantity="few">Isključeno za <xliff:g id="COUNT">%d</xliff:g> aplikacije</item>
+      <item quantity="other">Isključeno za <xliff:g id="COUNT">%d</xliff:g> aplikacija</item>
     </plurals>
-    <string name="notification_summary_none" msgid="3440195312233351409">"Slanje je dozvoljeno svim aplikacijama"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"Uključeno za sve aplikacije"</string>
     <string name="apps_summary" msgid="193158055537070092">"Broj instaliranih aplikacija: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 aplikacije instalirane"</string>
     <string name="storage_summary" msgid="3801281635351732202">"Iskorišteno <xliff:g id="PERCENTAGE">%1$s</xliff:g> - Slobodno <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
+    <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Unutrašnja pohrana: iskorišteno <xliff:g id="PERCENTAGE">%1$s</xliff:g> - slobodno <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
     <string name="display_summary" msgid="6737806235882127328">"Pokreni stanje mirovanja nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"Pozadinska slika, mirovanje, veličina fonta"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"Pokreni stanje mirovanja nakon 10 minuta neaktivnosti"</string>
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="USED_MEMORY">%1$s</xliff:g> prosječno od ukupno <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> iskorištene memorije"</string>
-    <!-- no translation found for user_summary (2175367953972182552) -->
-    <skip />
-    <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikacija je standardna"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"UKLJUČEN / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ISKLJUČEN"</string>
+    <string name="users_and_accounts_summary" msgid="245282689646897882">"Trenutni korisnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao korisnik <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> je zadana aplikacija"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"UKLJUČENO/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_off_summary" msgid="6474350053215707957">"ISKLJUČENO"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Pravljenje sigurnosnih kopija je onemogućeno"</string>
-    <!-- no translation found for about_summary (924181828102801010) -->
-    <skip />
+    <string name="about_summary" msgid="924181828102801010">"Ažurirano na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Radnja nije dozvoljena"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Nije moguće promijeniti jačinu zvuka"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Pozivanje nije dozvoljeno"</string>
     <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS poruka nije dozvoljena"</string>
     <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kamera nije dozvoljena"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Snimak ekrana nije dozvoljen"</string>
-    <string name="default_admin_support_msg" msgid="239311515653633217">"Ova radnja je onemogućena. Kontaktirajte administratora svoje organizacije kako biste saznali više."</string>
+    <string name="default_admin_support_msg" msgid="2853684309779513863">"Ova radnja je onemogućena. Da saznate više, obratite se administratoru organizacije."</string>
     <string name="admin_support_more_info" msgid="8901377038510512654">"Više detalja"</string>
-    <string name="admin_profile_owner_message" msgid="5834937282929663252">"Vaš administrator može pratiti i upravljati aplikacijama i podacima povezanim s vašim radnim profilom, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži te informacije o lokaciji uređaja."</string>
-    <string name="admin_profile_owner_user_message" msgid="7153676784012255048">"Vaš administrator može pratiti i upravljati aplikacijama i podacima povezanim s ovim korisnikom, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži te informacije o lokaciji uređaja."</string>
-    <string name="admin_device_owner_message" msgid="8734500370023898028">"Vaš administrator može pratiti i upravljati aplikacijama i podacima povezanim s ovim uređajem, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži te informacije o lokaciji uređaja."</string>
+    <string name="admin_profile_owner_message" msgid="5860816886981109626">"Vaš administrator može pratiti i upravljati aplikacijama i podacima povezanim s vašim radnim profilom, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži i informacije o lokaciji uređaja."</string>
+    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"Vaš administrator može pratiti i upravljati aplikacijama i podacima koji su povezani s ovim korisnikom, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži i informacije o lokaciji uređaja."</string>
+    <string name="admin_device_owner_message" msgid="6232893638259790789">"Vaš administrator može pratiti i upravljati aplikacijama i podacima koji su povezani s ovim uređajem, uključujući postavke, odobrenja, korporativni pristup, aktivnost na mreži i informacije o lokaciji uređaja."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"Isključi"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"Uključi"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"Prikaži"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"Sakrij"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot je na"</string>
-    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prijenosni Wi-Fi hotspot <xliff:g id="ID_1">%1$s</xliff:g> je aktivan, Wi-Fi za ovaj uređaj je isključen."</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prijenosna Wi-Fi pristupna tačka <xliff:g id="ID_1">%1$s</xliff:g> je aktivna. Wi-Fi je isključen za ovaj uređaj."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Airplane način rada je uključen"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth i mobilna mreža su isključeni. Ne možete telefonirati niti se povezati na internet."</string>
-    <string name="condition_zen_title" msgid="2679168532600816392">"Usluga Ne ometaj je podešena na (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"Opcija Ne ometaj je uključena (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Čuvar baterije je uključen"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Performanse su smanjenje. Usluge određivanja lokacije i pozadinski podaci su isključeni."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Mobilni podaci su isključeni"</string>
@@ -3275,10 +3506,9 @@
     <string name="color_temperature_toast" msgid="4974218172133854827">"Isključite ekran kako biste primijenili promjenu boje"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Da primijenite promjenu na nadzoru telefonije, ponovo pokrenite uređaj"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatsko ažuriranje sistema"</string>
-    <string name="enable_hal_binderization" msgid="8933984983735990337">"Binderized HALs (potrebno je ponovo pokrenuti)"</string>
-    <string name="usage" msgid="2977875522080448986">"Upotreba"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Prijenos mobilnih podataka"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Prijenos podataka putem Wi-Fi-ja"</string>
+    <string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobilnih podataka"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Potrošnja Wi-Fi podataka"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Prijenos podataka putem Etherneta"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
@@ -3288,32 +3518,35 @@
     <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 na <xliff:g id="ID_1">%1$s</xliff:g> svakog mjeseca"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mjesečno od <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="network_restrictions" msgid="8234695294536675380">"Ograničenje mreže"</string>
-    <!-- no translation found for network_restrictions_summary (4301618027244595839) -->
+    <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>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
+    </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Obračun podataka koji vrši operater se može razlikovati od obračuna koji vrši uređaj."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Postavite upozorenje o podacima"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Postavi upozorenje o podacima"</string>
     <string name="data_warning" msgid="209133958008062117">"Upozorenje o podacima"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje za podatke"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje za podatke"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno u razdoblju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno u razdoblju: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguracija"</string>
-    <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostale aplikacije uključene u upotrebu"</string>
+    <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostale aplikacije uključene u korištenje"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije smiju upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
       <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>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Neograničeni prijenos podataka"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Dopusti neograničen pristup podacima kada je Ušteda podataka uključena"</string>
-    <string name="home_app" msgid="4066188520886810030">"Početna aplikacija"</string>
+    <string name="home_app" msgid="4066188520886810030">"Aplikacija na početnom ekranu"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Nema zadane početne aplikacije"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Sigurno pokretanje"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Zahtijeva uzorak za pokretanje vašeg uređaja. Dok je isključen, ovaj uređaj ne može primati pozive, poruke, obavijesti ili alarme."</string>
@@ -3323,14 +3556,14 @@
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Otključajte nekim drugim prstom"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Zabrana automatskog uključivanja"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Nikad ne uključuj automatski"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Uključiti automatski kada je baterija na %1$s"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Aplikacija ne koristiti optimizaciju baterije"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Ako je uređaj zaključan, spriječiti kucanje odgovora ili drugog teksta u obavijestima"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Zadani kontrolor pravopisa"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Odaberite kontrolora pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Nije odabrano"</string>
-    <string name="notification_log_no_title" msgid="5678029849672024215">"(nijedan)"</string>
+    <string name="notification_log_no_title" msgid="5678029849672024215">"(ništa)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">": "</string>
     <string name="notification_log_details_package" msgid="2596495677039100284">"pkg"</string>
     <string name="notification_log_details_key" msgid="2995791937075862968">"ključ"</string>
@@ -3354,12 +3587,17 @@
     <string name="notification_log_details_parcel" msgid="243148037601903212">"veličina paketa"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
     <string name="notification_log_details_sound" msgid="5506232879598808099">"zvuk"</string>
-    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibriraj"</string>
+    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibracija"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"standardno/default"</string>
-    <string name="notification_log_details_none" msgid="184131801230614059">"nijedan"</string>
+    <string name="notification_log_details_none" msgid="184131801230614059">"ništa"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangirani objekt nedostaje."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangirani objekt ne sadrži ovu tipku."</string>
-    <string name="special_access" msgid="8275242424094109976">"Poseban pristup"</string>
+    <string name="special_access" msgid="3458780842491881155">"Poseban pristup aplikacijama"</string>
+    <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može koristiti neograničen prijenos podataka</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije mogu koristiti neograničen prijenos podataka</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacija može koristiti neograničen prijenos podataka</item>
+    </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Zaista želite izbrisati korisničke podatke i pretvoriti u šifrirani fajl?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Obriši i pretvori"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"Poništi ograničenje norme Upravitelja prečicama"</string>
@@ -3368,32 +3606,32 @@
     <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="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zatražila Premium SMS pristup"</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>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS pristup"</string>
-    <!-- no translation found for bluetooth_disabled (2456198532288640046) -->
-    <skip />
+    <string name="premium_sms_access" msgid="4660047004791638305">"Pristup premijum SMS-ovima"</string>
+    <string name="bluetooth_disabled" msgid="2456198532288640046">"Nije vidljivo drugim uređajima"</string>
+    <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan s uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan s više uređaja"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Način demonstracije Sistemskog UI-a"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice programera za brze postavke"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Mi smo tu da pomognemo"</string>
-    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Mi smo tu za vas 24/7"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Stojimo vam na raspolaganju 24 sata tokom cijele sedmice"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Tu smo za vas 24 sata dnevno"</string>
+    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Tu smo za vas 24 sata dnevno"</string>
     <string name="support_escalation_summary" msgid="8473084168776014405">"Naš tim za podršku je tu da se pobrine za sve probleme"</string>
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Naš tim za podršku na raspolaganju je cijelog dana, svakog dana."</string>
     <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Potražite pomoć ili se vratite u radno vrijeme podrške (po lokalnom vremenu):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Radno vrijeme za pružanje telefonske podrške (lokalno vrijeme)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Potraži pomoć ili istraži savjete i trikove"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Potražite pomoć ili istražite savjete i trikove"</string>
     <string name="support_country_list_title" msgid="823853371280534111">"Podrška za:"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
     <string name="support_international_phone_title" msgid="1308334014138718455">"Putujete u inostranstvo?"</string>
     <string name="support_international_phone_summary" msgid="208231793637026927">"Mogući su troškovi za međunarodne pozive"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Pozovi"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Pokreni razgovor"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Istražite savjete i trikove"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Pretražite pomoć i pošaljite povratne informacije"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Istraživanje savjeta i trikova"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Pomoć i slanje povratnih informacija"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kontaktirajte podršku korisnicima"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Prijavite se"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"Ne možete se prijaviti?"</string>
@@ -3435,29 +3673,55 @@
     <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">"Idi na Kameru"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Za brzo otvaranje kamere, dvaput dodirnite dugme za uključivanje. Funkcionira na svakom ekranu."</string>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Prebaci kameru"</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>
+    <!-- no translation found for double_tap_power_for_camera_suggestion_title (6500405261202883589) -->
+    <skip />
+    <!-- no translation found for double_tap_power_for_camera_suggestion_summary (7010153544554016996) -->
+    <skip />
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje kamere"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
+    <!-- no translation found for double_twist_for_camera_suggestion_title (4689410222517954869) -->
+    <skip />
+    <!-- no translation found for double_twist_for_camera_suggestion_summary (447403641027147153) -->
+    <skip />
+    <!-- no translation found for double_twist_for_camera_suggestion_summary (1724660290703318739) -->
+    <skip />
+    <!-- no translation found for double_twist_for_camera_suggestion_summary (5980398380988039489) -->
+    <skip />
     <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">"Da nabrzinu provjerite obavještenja, dvaput dodirnite ekran."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite za provjeru telefona"</string>
+    <!-- no translation found for ambient_display_summary (525662960806416373) -->
+    <skip />
+    <!-- no translation found for ambient_display_suggestion_summary (5987443721392571847) -->
+    <skip />
+    <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">"Da nabrzinu provjerite obavještenja, podignite telefon."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Da nabrzinu provjerite obavještenja, podignite tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Da nabrzinu provjerite obavještenja, podignite uređaj."</string>
-    <!-- no translation found for fingerprint_swipe_for_notifications_title (5816346492253270243) -->
-    <skip />
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da provjerite obavještenja, prevucite prema dolje na senzoru otiska prsta na poleđini telefona."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da provjerite obavještenja, prevucite prema dolje na senzoru otiska prsta na poleđini tableta."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da provjerite obavještenja, prevucite prema dolje na senzoru otiska prsta na poleđini uređaja."</string>
+    <!-- no translation found for ambient_display_pickup_summary (4567020486787561873) -->
+    <skip />
+    <!-- no translation found for ambient_display_pickup_summary (5435283849947236648) -->
+    <skip />
+    <!-- no translation found for ambient_display_pickup_summary (8256669101643381568) -->
+    <skip />
+    <!-- no translation found for ambient_display_pickup_suggestion_summary (7014700589991761035) -->
+    <skip />
+    <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>
+    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_title (1677291167470357802) -->
+    <skip />
+    <!-- no translation found for fingerprint_swipe_for_notifications_suggestion_summary (127592803294414082) -->
+    <skip />
+    <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>
@@ -3468,19 +3732,20 @@
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Povežite se na internet ili kontaktirajte svog operatera"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Nedostupno na uređajima koje je zaključao operater"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"<xliff:g id="SIZE">%1$s</xliff:g> je ukupno na raspolaganju\n\nPosljednji put je pokrenuto <xliff:g id="DATE">%2$s</xliff:g>"</string>
-    <string name="web_action_enable_title" msgid="8502552575492048305">"Otvorite veze u aplikacijama"</string>
-    <string name="web_action_enable_summary" msgid="4679844581193646863">"Otvorite veze u podržanim aplikacijama, čak i ako aplikacije nisu instalirane na vašem uređaju"</string>
-    <string name="web_action_section_title" msgid="806405168097593614">"Neinstalirane aplikacije"</string>
+    <string name="web_action_enable_title" msgid="4051513950976670853">"Instant-aplikacije"</string>
+    <string name="web_action_enable_summary" msgid="3108127559723396382">"Otvaranje linkova u aplikacijama, čak iako nisu instalirane"</string>
+    <string name="web_action_section_title" msgid="7364647086538399136">"Instant-aplikacije"</string>
+    <string name="instant_apps_account" msgid="1433620209791992528">"Račun za instant-aplikacije"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"Instalirane aplikacije"</string>
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Vašom pohranom sada upravlja upravitelj pohrane"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"Računi za korisnika <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"Konfiguriraj"</string>
-    <string name="auto_sync_account_title" msgid="7647106425106072285">"Auto. sinhr. podataka o računu"</string>
-    <string name="auto_sync_personal_account_title" msgid="999536545686286287">"Auto. sinhr. lič. podat. rač."</string>
-    <string name="auto_sync_work_account_title" msgid="3073278154593727844">"Auto. sinhr. podat. posl. rač."</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"Automatsko sinhroniziranje podataka"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Automatsko sinhroniziranje ličnih podataka"</string>
+    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatsko sinhroniziranje radnih podataka"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"Omogućava aplikacijama automatsko osvježavanje podataka"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sinhronizacija računa"</string>
-    <!-- no translation found for enterprise_privacy_settings (1177106810374146496) -->
-    <skip />
+    <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Podaci o upravljanom uređaju"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Promjene i postavke kojima upravlja vaša organizacija"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Promjene i postavke kojima upravlja organizacija <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
     <string name="enterprise_privacy_header" msgid="7402406406883832509">"Za davanje pristupa vašim radnim podacima, vaša organizacija može na vašem uređaju promijeniti postavke i instalirati softver.\n\nZa više informacija, obratite se administratoru vaše organizacije."</string>
@@ -3489,40 +3754,39 @@
     <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"Vaš pristup ovom uređaju"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Podaci koji su povezani s vašim računom, kao što su e-pošta ili kalendar"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Spisak aplikacija na vašem uređaju"</string>
+    <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"Utrošeno vrijeme i podaci za svaku aplikaciju"</string>
+    <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Najskoriji zapis mrežnog prometa"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Najnoviji izvještaj o greškama"</string>
+    <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Najnoviji zapisnik o aktivnostima"</string>
+    <string name="enterprise_privacy_none" msgid="7706621148858381189">"Nema"</string>
+    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Aplikacije su instalirane"</string>
+    <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"Broj aplikacija je samo procjena. Možda nisu obuhvaćene aplikacije koje su instalirane izvan Play trgovine."</string>
+    <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
+      <item quantity="one">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
+      <item quantity="few">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacije</item>
+      <item quantity="other">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
+    </plurals>
+    <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"Odobrenja za lokacije"</string>
+    <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Odobrenja za mikrofon"</string>
+    <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Odobrenja za kameru"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Zadane aplikacije"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> aplikacije</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija</item>
     </plurals>
-    <plurals name="enterprise_privacy_number_packages_actionable" formatted="false" msgid="3351021029919034993">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija. Dodirnite za prikaz.</item>
-      <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> aplikacije. Dodirnite za prikaz.</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplikacija. Dodirnite za prikaz.</item>
-    </plurals>
-    <string name="enterprise_privacy_usage_stats" msgid="6257434796480671245">"Provedeno vrijeme i preneseni podaci za svaku aplikaciju na vašem uređaju"</string>
-    <string name="enterprise_privacy_network_logs" msgid="6594098950963377666">"Zapisi o saobraćaju na vašem uređaju"</string>
-    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Najnoviji izvještaj o greškama"</string>
-    <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Najnoviji zapisnik o aktivnostima"</string>
-    <string name="enterprise_privacy_none" msgid="7706621148858381189">"Nijedno"</string>
-    <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Aplikacije su instalirane"</string>
-    <!-- no translation found for enterprise_privacy_location_access (4158197200885270634) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_microphone_access (5717375623568864441) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_camera_access (4858146118537519375) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_enterprise_set_default_apps (3288495615791128724) -->
-    <skip />
     <string name="enterprise_privacy_input_method" msgid="6531350246850814920">"Zadana tastatura"</string>
     <string name="enterprise_privacy_input_method_name" msgid="4941106433683067953">"Postavljeno kao <xliff:g id="APP_LABEL">%s</xliff:g>"</string>
     <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"Uključen je uvijek aktivni VPN"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Uvijek aktivni VPN je uključen u vašem ličnom profilu"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Uvijek aktivni VPN je uključen u vašem radnom profilu"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globalno postavljanje za HTTP proksi"</string>
-    <!-- no translation found for enterprise_privacy_ca_certs (5885892204903688909) -->
-    <skip />
-    <!-- no translation found for enterprise_privacy_number_ca_certs (9073641163359459048) -->
-    <!-- no translation found for enterprise_privacy_number_ca_certs_actionable (5823294380629654635) -->
+    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Pouzdani akreditivi"</string>
+    <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
+      <item quantity="one">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> CA certifikat</item>
+      <item quantity="few">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> CA certifikata</item>
+      <item quantity="other">Najmanje <xliff:g id="COUNT_1">%d</xliff:g> CA certifikata</item>
+    </plurals>
     <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"Administrator može zaključati uređaj i postaviti novu lozinku"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"Administrator može izbrisati sve podatke iz uređaja"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"Neuspjeli pokušaji upisivanja lozinke prije brisanja svih podataka na uređaju"</string>
@@ -3536,32 +3800,56 @@
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"Saznajte više"</string>
+    <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
+      <item quantity="one">Aplikacija za kameru</item>
+      <item quantity="few">Aplikacije za kameru</item>
+      <item quantity="other">Aplikacija za kameru</item>
+    </plurals>
+    <string name="default_calendar_app_title" msgid="3545972964391065220">"Aplikacija za kalendar"</string>
+    <string name="default_contacts_app_title" msgid="3497370557378660098">"Aplikacija za kontakte"</string>
+    <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
+      <item quantity="one">Aplikacija klijenta za e-poštu</item>
+      <item quantity="few">Aplikacije klijenta za e-poštu</item>
+      <item quantity="other">Aplikacija klijenta za e-poštu</item>
+    </plurals>
+    <string name="default_map_app_title" msgid="7560143381633608567">"Aplikacija za mape"</string>
+    <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
+      <item quantity="one">Aplikacija za telefon</item>
+      <item quantity="few">Aplikacije za telefon</item>
+      <item quantity="other">Aplikacija za telefon</item>
+    </plurals>
+    <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
+    <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"Fotografije i videozapisi"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"Muzika i zvuk"</string>
     <string name="storage_games" msgid="7703159201697117621">"Igre"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fajlovi"</string>
-    <!-- no translation found for storage_settings_2 (1939009096334525216) -->
-    <skip />
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pohrana telefona"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <!-- no translation found for storage_volume_total (3499221850532701342) -->
-    <skip />
-    <string name="storage_percent_used" msgid="6741397129281819921">"<xliff:g id="PERCENT">%1$s</xliff:g>%%"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"Iskorišteno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"iskor."</string>
+    <string name="clear_instant_app_data" msgid="2004222610585890909">"Obriši aplikaciju"</string>
+    <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>
-    <!-- no translation found for autofill_app (7338387238377914374) -->
-    <skip />
+    <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Želite li aplikaciju <xliff:g id="APP_NAME_0">%1$s</xliff:g> postaviti kao svoju aplikaciju za popunjavanje? Aplikacija <xliff:g id="APP_NAME_1">%1$s</xliff:g> će moći čitati sadržaj s vašeg ekrana i popunjavati polja u drugim aplikacijama."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Vodite računa da je to pouzdana aplikacija&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; koristi sadržaj na vašem ekranu da odredi šta se može automatski popuniti."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
     <string name="default_theme" msgid="7085644992078579076">"Zadano"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj pohranom: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"Isključeno"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Uključeno"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Instant-aplikacija"</string>
-    <!-- no translation found for automatic_storage_manager_deactivation_warning (5605210730828410482) -->
+    <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="carrier_provisioning" msgid="4398683675591893169">"Operater koji pruža informacije"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktiviranje dodjele resursa operatera"</string>
+    <!-- no translation found for new_device_suggestion_title (8346563796032837800) -->
+    <skip />
+    <!-- no translation found for new_device_suggestion_summary (7172709269203435870) -->
     <skip />
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 2775ab880cee9640268aed4fc641e65308bf8c3a..7ce5a9e3324c4c3eee71eac0fc0f9913aca3270e 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -145,23 +145,13 @@
     <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">"30 darrers dies"</item>
     <item msgid="6600989128423965319">"Defineix el cicle d\'ús..."</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Temps d\'ús"</item>
-    <item msgid="4796160515314745154">"Darrera vegada que es va fer servir"</item>
+    <item msgid="4796160515314745154">"Darrer ús"</item>
     <item msgid="2502754479975776899">"Nom de l\'aplicació"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -328,15 +318,15 @@
     <item msgid="2154671955760380322">"Notificació de la publicació"</item>
     <item msgid="4282477730595931828">"Ubicació"</item>
     <item msgid="4891423912898525905">"Trucada"</item>
-    <item msgid="2623604824935968113">"Llegeix l\'SMS/MMS"</item>
-    <item msgid="4420177125221176306">"Escriu un SMS/MMS"</item>
+    <item msgid="2623604824935968113">"Llegeix SMS/MMS"</item>
+    <item msgid="4420177125221176306">"Escriu SMS/MMS"</item>
     <item msgid="3986142739951490025">"Rep SMS/MMS"</item>
     <item msgid="3984213795861739778">"Rep SMS/MMS"</item>
     <item msgid="3656243523752472788">"Rep SMS/MMS"</item>
     <item msgid="8105802370238551510">"Rep SMS/MMS"</item>
     <item msgid="1407766984645388488">"Envia SMS/MMS"</item>
-    <item msgid="3527273606643794973">"Llegeix l\'SMS/MMS"</item>
-    <item msgid="4370895547001583812">"Escriu un SMS/MMS"</item>
+    <item msgid="3527273606643794973">"Llegeix SMS/MMS"</item>
+    <item msgid="4370895547001583812">"Escriu SMS/MMS"</item>
     <item msgid="4218544235221631789">"Modifica la configuració"</item>
     <item msgid="736541391767350377">"Dibuixa a sobre"</item>
     <item msgid="5530815681721654194">"Accedeix a les notificacions"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a4832ba7f4fbf30a96a2ea582b8b91df19b08479..ebc938182ba6e789d4dc71298023e70121dcf890 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">"Vols 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,44 +366,43 @@
     <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. Ves 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ó. Ves 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. Ves 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 torna a tocar el sensor"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Continua aixecant el dit per 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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Fes-ho més tard"</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_error_dialog_title" msgid="3618021988442639280">"No s\'ha completat la inscripció"</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 el registre"</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>
-    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Afegeix-ne un altre"</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"El registre de l\'empremta digital no ha funcionat. Torna-ho a provar o fes servir un altre dit."</string>
+    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Afegeix-ne una altra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Següent"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"A més de fer servir l\'empremta digital per desbloquejar el telèfon, també la pots fer servir per autoritzar compres i permetre l\'accés a determinades aplicacions. "<annotation id="url">"Més informació"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" L\'opció de bloqueig de pantalla està desactivada. Per obtenir més informació, contacta amb l\'administrador de l\'organització. "<annotation id="admin_details">"Més informació"</annotation>\n\n"Pots continuar utilitzant l\'empremta digital per autoritzar compres i accedir a l\'aplicació. "<annotation id="url">"Més informació"</annotation></string>
@@ -449,6 +460,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 +532,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="1688030823464420974">"Si tornes a introduir un patró incorrecte, se suprimiran les dades del dispositiu"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Si tornes a introduir un PIN incorrecte, se suprimiran les dades del dispositiu"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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="5047439819181833824">"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>
@@ -575,7 +596,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicació activa</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agents de confiança"</string>
-    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Per utilitzar-ho, has de configurar un bloqueig de pantalla"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Per utilitzar aquesta opció, has de configurar un bloqueig de pantalla"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Cap"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agents de confiança actius</item>
@@ -626,6 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activa la Wi‑Fi automàticament"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"La Wi-Fi es tornarà a activar automàticament en detectar xarxes desades d\'alta qualitat, com ara la teva xarxa domèstica"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"No està disponible perquè la cerca de xarxes Wi-Fi està desactivada"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Per utilitzar aquesta funció, selecciona un proveïdor de valoració de xarxes"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Només connexions estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"No utilitzis una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilitza només les xarxes amb una bona connexió a Internet."</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Connecta\'t a xarxes obertes"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Connecta\'t automàticament a xarxes públiques d\'alta qualitat"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Per utilitzar aquesta funció, selecciona un proveïdor de valoració de xarxes"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Per utilitzar aquesta funció, selecciona un proveïdor de valoració de xarxes compatible"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instal·la els certificats"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Per millorar la precisió de la ubicació, les aplicacions i els serveis del sistema poden continuar cercant xarxes Wi‑Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Per millorar la precisió de la ubicació, activa la cerca de xarxes Wi-Fi 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>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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 la connexió a Internet ni 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 del punt d\'accés"</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>
@@ -869,7 +909,7 @@
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferència en itinerància"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"Preferència per la Wi-Fi"</item>
+    <item msgid="2124257075906188844">"Preferència per a la Wi-Fi"</item>
     <item msgid="1335127656328817518">"Preferència per a dades mòbils"</item>
     <item msgid="3132912693346866895">"Només Wi-Fi"</item>
   </string-array>
@@ -884,7 +924,7 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"Preferència per la Wi-Fi"</item>
+    <item msgid="5782108782860004851">"Preferència per a la Wi-Fi"</item>
     <item msgid="5074515506087318555">"Preferència per a dades mòbils"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -896,6 +936,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>
@@ -949,14 +990,15 @@
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte professional: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"Compte personal: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="search_settings" msgid="1910951467596035063">"Cerca"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"Gestiona la configuració i l\'historial de cerca"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Gestiona la configuració i l\'historial de cerques"</string>
     <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_on" product="default" msgid="1133737282813048021">"Canvia l\'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>
-    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Canvia d\'orientació automàticament en girar el telèfon"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Canvia l\'orientació automàticament en girar el telèfon"</string>
     <string name="brightness" msgid="8480105032417444275">"Nivell de brillantor"</string>
     <string name="brightness_title" msgid="5746272622112982836">"Brillantor"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
@@ -980,23 +1022,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">"Programa"</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">"Activat / <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 després de"</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>
@@ -1020,8 +1061,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="7337555569694794132">"Sempre activada / Consumeix més bateria"</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="6978257596231155345">"Mostra l\'hora, les icones de notificació i altres dades. Consumeix més bateria."</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>
@@ -1030,9 +1077,9 @@
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Bloquejada"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueig de targeta SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloqueja la targeta SIM"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Necessites el PIN per utilitzar la tauleta"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Sol·licita el PIN per utilitzar la tauleta"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Sol·licita el PIN per utilitzar el telèfon"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Exigeix el PIN per utilitzar la tauleta"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Sol·licita el PIN per utilitzar la tauleta"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Sol·licita el PIN per utilitzar el telèfon"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Canvia el PIN de la SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN de la SIM"</string>
@@ -1175,8 +1222,8 @@
     <string name="storage_external_title" msgid="3433462910096848696">"Emmagatzematge portàtil"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"S\'han utilitzat <xliff:g id="USED">%1$s</xliff:g> d\'un total de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
-    <string name="storage_volume_used" msgid="1303803057698959872">"Utilitzat de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_volume_used_total" msgid="6113121714019000244">"Total utilitzat de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used" msgid="1303803057698959872">"Utilitzat de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used_total" msgid="6113121714019000244">"Total utilitzat de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"S\'ha activat <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"No s\'ha pogut activar <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"S\'ha expulsat <xliff:g id="NAME">%1$s</xliff:g> de manera segura"</string>
@@ -1189,7 +1236,7 @@
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Aquest dispositiu no admet <xliff:g id="NAME_0">^1</xliff:g>. \n\nPer fer servir <xliff:g id="NAME_1">^1</xliff:g> amb aquest dispositiu, primer l\'has d\'activar."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Un cop l\'hagis formatat, podràs fer servir <xliff:g id="NAME_0">^1</xliff:g> en altres dispositius. \n\nTotes les dades que hi hagi a <xliff:g id="NAME_1">^1</xliff:g> s\'esborraran. Et recomanem que en facis una còpia de seguretat primer.\n\n"<b>"Fer una còpia de seguretat de les fotos i d\'altres fitxers multimèdia"</b>\n"Desplaça els fitxers multimèdia a un emmagatzematge alternatiu del dispositiu o transfereix-los a un ordinador mitjançant un cable USB. \n\n"<b>"Fer una còpia de seguretat de les aplicacions"</b>" \nTotes les aplicacions que hi hagi a <xliff:g id="NAME_6">^1</xliff:g> es desinstal·laran i se n\'esborraran les dades. Per conservar aquestes aplicacions, desplaça-les a un emmagatzematge alternatiu del dispositiu."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Si expulses <xliff:g id="NAME_0">^1</xliff:g>, les aplicacions que hi hagi instal·lades deixaran de funcionar i els fitxers multimèdia que contingui deixaran d\'estar disponibles fins que no es torni a inserir."</b>" \n\n<xliff:g id="NAME_1">^1</xliff:g> està formatat per funcionar només en aquest dispositiu. No funcionarà en altres dispositius."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Torna a inserir el dispositiu d\'emmagatzematge <xliff:g id="NAME">^1</xliff:g> per fer servir les aplicacions, les fotos o les dades que conté. \n\nTambé pots triar que s\'esborri el contingut emmagatzemat si el dispositiu no està disponible. \n\nSi tries aquesta darrera opció, es perdran de manera permanent totes les dades emmagatzemades al dispositiu. \n\nPodràs tornar a instal·lar les aplicacions més endavant, però no podràs recuperar les dades que tenies emmagatzemades al dispositiu."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"Torna a inserir el dispositiu d\'emmagatzematge <xliff:g id="NAME">^1</xliff:g> per fer servir les aplicacions, les fotos o les dades que conté. \n\nTambé pots triar que s\'esborri el contingut emmagatzemat si el dispositiu no està disponible. \n\nSi tries aquesta darrera opció, es perdran permanentment totes les dades emmagatzemades al dispositiu. \n\nPodràs tornar a instal·lar les aplicacions més endavant, però no podràs recuperar les dades que tenies emmagatzemades al dispositiu."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"Vols oblidar <xliff:g id="NAME">^1</xliff:g>?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"Les aplicacions, les fotos i les dades que s\'hagin desat a <xliff:g id="NAME">^1</xliff:g> es perdran per sempre."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"Aplicacions"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualment has iniciat la sessió als comptes següents:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"En aquest dispositiu hi ha altres usuaris.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Altres dades de l\'usuari"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadors de telefonia mòbil de la targeta eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"No es cancel·larà el teu pla de servei mòbil."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per esborrar també música, imatges i altres dades d\'usuari, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Esborra l\'emmagatzematge USB"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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 mòbils per determinar la ubicació"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilitza la Wi‑Fi, el Bluetooth o les xarxes mòbils 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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1559,7 +1607,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Emmag. targeta SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"S\'està tornant a calcular la mida..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Vols eliminar les dades de l\'aplicació?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"S\'eliminaran totes les dades d\'aquesta aplicació de manera permanent. Això inclou tots els fitxers, la configuració, els comptes, les bases de dades, etc."</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"S\'eliminaran totes les dades d\'aquesta aplicació permanentment. Això inclou tots els fitxers, la configuració, els comptes, les bases de dades, etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"D\'acord"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Cancel·la"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1639,7 +1687,7 @@
     <string name="running_processes_header_footer" msgid="723908176275428442">"RAM utilitzada per aplicacions"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Sistema"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Aplicacions"</string>
-    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Disponible"</string>
+    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Lliure"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"En ús"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"A la memòria cau"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> de RAM"</string>
@@ -1659,6 +1707,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>
@@ -1684,8 +1736,8 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Assistència per al teclat"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Teclat físic"</string>
     <string name="show_ime" msgid="2658582193437188227">"Mostra el teclat virtual"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"El deixa a la pantalla mentre el teclat físic està actiu"</string>
-    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Auxiliar per a les tecles de drecera"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Mantén-lo a la pantalla mentre el teclat físic està actiu"</string>
+    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ajuda per a les tecles de drecera"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostra les dreceres disponibles"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predeterminat"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocitat del punter"</string>
@@ -1750,13 +1802,14 @@
     <string name="testing_usage_stats" msgid="7823048598893937339">"Estadístiques d\'ús"</string>
     <string name="display_order_text" msgid="8592776965827565271">"Ordena per:"</string>
     <string name="app_name_label" msgid="5440362857006046193">"Aplicació"</string>
-    <string name="last_time_used_label" msgid="8459441968795479307">"Darrera vegada que es va fer servir"</string>
+    <string name="last_time_used_label" msgid="8459441968795479307">"Darrer ús"</string>
     <string name="usage_time_label" msgid="295954901452833058">"Temps d\'ús"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilitat"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuració d\'accessibilitat"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectors de pantalla, pantalla, controls d\'interacció"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuració de visió"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Pots personalitzar el dispositiu perquè s\'adapti a les teves necessitats. Aquestes funcions d\'accessibilitat es poden canviar més endavant des de Configuració."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Augmenta la mida de la lletra"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectors de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Àudio i text en pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1796,7 +1849,7 @@
     <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ACTIVAT"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"DESACTIVADA"</string>
-    <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a Configuració ràpida"</string>
+    <string name="enable_quick_setting" msgid="2366999897816894536">"Mostra a configuració ràpida"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Mode de correcció"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
       <item quantity="other">Retard molt breu (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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">"El dispositiu es manté actiu"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"S\'activa el dispositiu en segon pla"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Se sol·licita la ubicació massa sovint"</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="4006631636646776488">"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, pots aturar 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="2369957934555162428">"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, pots aturar 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="6195430620406365292">"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, pots aturar 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_wakeup_alarm" product="default" msgid="1638726742782558262">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="tablet" msgid="8771690983566539742">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="device" msgid="2854944538238649520">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Vols desactivar l\'ús en segon pla i aturar l\'aplicació?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que s\'executi en segon pla."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP_0">%1$s</xliff:g> l\'activa contínuament.\n\nPer solucionar el problema, pots aturar <xliff:g id="APP_1">%1$s</xliff:g> per evitar que 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="7774807745601479888">"El telèfon no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva 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="118745801732181618">"La tauleta no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva 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="6783678153382298295">"El dispositiu no pot gestionar l\'ús de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> continua sol·licitant la teva 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglossament des de l\'última càrrega completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última càrrega completa"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"El temps de bateria restant és aproximat i pot variar en funció de l\'ús"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Les dades d\'ús de la bateria són aproximades i poden variar en funció de l\'ús del dispositiu"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Durant l\'ús actiu"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"En segon pla"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Ús de la bateria"</string>
@@ -2043,7 +2124,7 @@
     <string name="process_stats_type_cached" msgid="6314925846944806511">"Memòria"</string>
     <string name="process_stats_os_label" msgid="4813434110442733392">"SO Android"</string>
     <string name="process_stats_os_native" msgid="5322428494231768472">"Nadiu"</string>
-    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Nucli"</string>
+    <string name="process_stats_os_kernel" msgid="1938523592369780924">"Kernel"</string>
     <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
     <string name="process_stats_os_cache" msgid="6432533624875078233">"Memòries cau"</string>
     <string name="process_stats_ram_use" msgid="976912589127397307">"Ús de memòria RAM"</string>
@@ -2055,11 +2136,11 @@
     <string name="mem_details_title" msgid="6548392825497290498">"Detalls de la memòria"</string>
     <string name="mem_state_subtitle" msgid="2407238869781011933">"Estats de la memòria"</string>
     <string name="mem_use_subtitle" msgid="7319468770222422412">"Ús de la memòria"</string>
-    <string name="mem_use_kernel_type" msgid="8698327165935012484">"Nucli"</string>
+    <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
     <string name="mem_use_native_type" msgid="5976704902328347400">"Nadiu"</string>
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Memòries cau del nucli"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"Espai compartit ZRam"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Disponible"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Lliure"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 hores"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 hores"</string>
@@ -2299,7 +2380,7 @@
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Targetes SIM"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"Xarxes mòbils"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"En pausa al límit"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronitza dades automàt."</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincronització automàtica de dades"</string>
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Sincr. dades personals autom."</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Sincron. dades feina automàt."</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Canvia el cicle..."</string>
@@ -2437,7 +2518,7 @@
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Confia-hi"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Vols activar el certificat de CA del sistema?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Vols desactivar el certificat de CA del sistema?"</string>
-    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vols suprimir el certificat de CA d\'usuari de manera permanent?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"Vols suprimir el certificat de CA d\'usuari permanentment?"</string>
     <string name="credential_contains" msgid="3984922924723974084">"Aquesta entrada conté:"</string>
     <string name="one_userkey" msgid="6034020579534914349">"una clau d\'usuari"</string>
     <string name="one_usercrt" msgid="2150319011101639509">"un certificat d\'usuari"</string>
@@ -2564,7 +2645,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>
@@ -2646,7 +2727,7 @@
     <string name="sim_notification_title" msgid="6272913297433198340">"S\'han canviat les targetes SIM"</string>
     <string name="sim_notification_summary" msgid="8858043655706669772">"Toca per configurar"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferida per a"</string>
-    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Demana-m\'ho cada vegada"</string>
+    <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Pregunta sempre"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Has de seleccionar una preferència."</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuració"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
@@ -2654,9 +2735,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, dades mòbils, ús de dades, punt d\'accés"</string>
+    <string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"xarxa 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, Cast, 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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"fer lliscar el dit per desbloquejar, contrasenya, patró, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafiament per accedir a contingut de feina, feina, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil professional, perfil gestionat, unificar, unificació, feina, perfil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestos"</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_assist_gesture_launch" msgid="813968759791342591">"gest"</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>
@@ -2776,14 +2861,14 @@
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Sons de trucada"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Vibracions i altres sons"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacions"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"Avançada"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"Configuració avançada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacions de la feina"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"Permet els punts de notificació"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Llum intermitent"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"A la pantalla de bloqueig"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut de les notificacions"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Amaga contingut sensible de les notificacions"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"No mostris cap notificació"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"No mostris les notificacions"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Com vols que es mostrin les notificacions quan el dispositiu estigui bloquejat?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificacions"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Mostra tot el contingut de notific. professionals"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantalla en pantalla"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permet el mode de pantalla en pantalla"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permet que aquesta aplicació creï una finestra de pantalla en pantalla 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>
@@ -2918,12 +3006,13 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Només dels contactes destacats"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Cap"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Les alarmes sempre tenen prioritat i sonen"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatoris"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Esdeveniments"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Totes les trucades"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Contactes seleccionats"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Trucades repetides"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si una mateixa persona truca dues vegades en un període de <xliff:g id="MINUTES">%d</xliff:g> minuts, permet la segona trucada"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Si una mateixa persona truca dues vegades en menys de <xliff:g id="MINUTES">%d</xliff:g> minuts, permet la segona trucada"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activa automàticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Mai"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Cada nit"</string>
@@ -2965,19 +3054,14 @@
     <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>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Per augmentar la protecció del dispositiu, pots configurar-lo perquè demani un patró 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 patró per iniciar-se?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Per augmentar la protecció del dispositiu, pots configurar-lo perquè demani un patró 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 se\'t demani un patró en iniciar el dispositiu?"</string>
     <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_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 se\'t demani un patró en iniciar el dispositiu?"</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>
@@ -3057,7 +3141,7 @@
       <item quantity="one">1 aplicació que permet obrir enllaços compatibles</item>
     </plurals>
     <string name="app_link_open_always" msgid="2474058700623948148">"Obre en aquesta aplicació"</string>
-    <string name="app_link_open_ask" msgid="7800878430190575991">"Demana-m\'ho cada vegada"</string>
+    <string name="app_link_open_ask" msgid="7800878430190575991">"Pregunta sempre"</string>
     <string name="app_link_open_never" msgid="3407647600352398543">"No obris en aquesta aplicació"</string>
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No s\'ha reconegut"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Predeterminada"</string>
@@ -3075,7 +3159,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Predeterminat)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Opció predetermina del sistema)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Emmagatzematge d\'aplicacions"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Emmagatzematge d\'apps"</string>
     <string name="usage_access" msgid="5479504953931038165">"Accés a dades d\'ús"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Permet l\'accés a dades d\'ús"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferències d\'ús de les aplicacions"</string>
@@ -3095,6 +3179,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">"Sense optimitzar"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimitza l\'ús de la bateria"</string>
@@ -3115,19 +3208,19 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Aquest informe d\'errors s\'està compartint amb l\'administrador de TI. Contacta-hi per obtenir-ne més informació."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Comparteix"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Rebutja"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"carregar aquest dispositiu"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Carregar aquest dispositiu"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Carrega només aquest dispositiu"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"subministrar corrent"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Subministrar corrent"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carrega el dispositiu connectat. Només funciona amb dispositius que són compatibles amb la càrrega per USB."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"transferir fitxers"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferir fitxers"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transfereix fitxers a un altre dispositiu"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transfereix fotos o fitxers si no s\'admet MTP (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"fer servir el dispositiu com a MIDI"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Utilitzar el dispositiu com a MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"fer servir aquest dispositiu com a MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilitza l\'USB per"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Carrega aquest dispositiu"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Càrrega del dispositiu"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Subministra energia"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfereix fitxers"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transfereix fotos (PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3267,7 +3360,7 @@
     <string name="condition_airplane_summary" msgid="5561586417832393666">"La Wi-Fi, el Bluetooth i la xarxa mòbil estan desactivats. No pots fer trucades telefòniques ni connectar-te a Internet."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"No molestis activat (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Estalvi de bateria activat"</string>
-    <string name="condition_battery_summary" msgid="4418839236027977450">"El rendiment ha disminuït. Els Serveis d\'ubicació i les dades en segon pla s\'han desactivat."</string>
+    <string name="condition_battery_summary" msgid="4418839236027977450">"El rendiment ha disminuït. Els serveis d\'ubicació i les dades en segon pla s\'han desactivat."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Dades mòbils desactivades"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet només està disponible per Wi-Fi"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"Economitzador de dades activat"</string>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3337,7 +3438,7 @@
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Activa automàticament quan quedi un %1$s de bateria"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"No s\'està fent servir l\'optimització de la bateria"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Si el dispositiu està bloquejat, impedeix que s\'escriguin respostes o altres textos a les notificacions"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"Corrector ortogr. predeterminat"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"Corrector predeterminat"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Tria el corrector ortogràfic"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"No s\'ha seleccionat"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(cap)"</string>
@@ -3381,8 +3482,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>
@@ -3391,7 +3491,7 @@
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connectat a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connectat a diversos dispositius"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Mode de demostració de la IU del sistema"</string>
-    <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Camps de configuració ràpida per a desenvolupadors"</string>
+    <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaics de configuració ràpida per a desenvolupadors"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Som aquí per ajudar-te"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Estem a la teva disposició les 24 hores del dia"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Estem a la teva disposició les 24 hores del dia"</string>
@@ -3453,25 +3553,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Activat"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Desactivat"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El bootloader ja està desbloquejat"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronitza les dades professionals automàticament"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Permet que les aplicacions actualitzin les dades automàticament"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronització del compte"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"La sincronització està activada per a <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g> elements"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"La sincronització està activada per a tots els elements"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"La sincronització està desactivada per a tots els elements"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informació del dispositiu gestionat"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"La teva organització gestiona els canvis i la configuració"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> gestiona els canvis i la configuració"</string>
@@ -3572,6 +3682,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 Emplenament automàtic"</string>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"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>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Estat del registre d\'IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrat"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Sense registrar"</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 76620c8ae64da4f4753f1d04e213e20471e6148c..8ead7f669beadc6ae8950417d3224328a1474d0a 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 26cac3ae26d30a7da89a6ccd217dad17cdf15486..e2376d274947b633f52eb9f0af34d8ad102ee00b 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Později"</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 +466,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 +538,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +669,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>
@@ -713,11 +742,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Zapínat Wi-Fi automaticky"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"V dosahu kvalitních uložených sítí, jako je například vaše domácí síť, se Wi-Fi znovu zapne"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nedostupné, protože je vypnuto vyhledávání Wi-Fi"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Chcete-li se automaticky připojovat, je třeba vybrat poskytovatele hodnocení sítí"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Ignorovat slabá připojení"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nepoužívat síť Wi-Fi, pokud nemá dostatečně kvalitní internetové připojení"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Použít jen sítě s dobrým připojením k internetu"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Připojovat se k otevřeným sítím"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automaticky se připojovat ke kvalitním veřejným sítím"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Chcete-li se automaticky připojovat, je třeba vybrat poskytovatele hodnocení sítí"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Chcete-li se automaticky připojovat, je třeba vybrat kompatibilního poskytovatele hodnocení sítí"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalace certifikátů"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Za účelem zlepšení přesnosti určování polohy mohou systémové aplikace a služby neustále vyhledávat sítě Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Chcete-li zpřesnit určování polohy, zapněte vyhledávání Wi-Fi 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>
@@ -801,6 +833,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>
@@ -834,7 +867,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>
@@ -871,9 +903,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>
@@ -920,6 +960,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>
@@ -977,6 +1018,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>
@@ -1004,23 +1046,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>
@@ -1044,8 +1085,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="7337555569694794132">"Vždy zapnuto (zvýšené využití baterie)"</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="6978257596231155345">"Zobrazovat čas, ikony oznámení a další informace. Zvýšené využití baterie."</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>
@@ -1299,6 +1346,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>
@@ -1324,12 +1372,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"V tomto zařízení jsou přítomni další uživatelé.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"hudba"</li>\n<li>"fotky"</li>\n<li>"další uživatelské údaje"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operátoři na eSIM kartě"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tímto krokem nebude zrušen mobilní tarif."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Smazat úložiště USB"</string>
     <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>
@@ -1352,26 +1405,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>
@@ -1404,7 +1446,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>
@@ -1449,8 +1491,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>
@@ -1478,7 +1523,7 @@
     <string name="lock_settings_title" msgid="4213839087748988686">"Zabezpečení zařízení"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Změna bezpečnostního gesta"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Změna bezpečnostního kódu PIN"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Proveďte gesto odemknutí"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Proveďte odemykací gesto"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Nápovědu zobrazíte stisknutím klávesy Menu."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Na závěr zvedněte prst z obrazovky"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Spojte alespoň <xliff:g id="NUMBER">%d</xliff:g> tečky. Zkuste to znovu."</string>
@@ -1514,16 +1559,19 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Stejný jako zámek obrazovky zařízení"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovat aplikace"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Umožňuje spravovat a odebírat instalované aplikace"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Informace o aplikaci"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"O aplikaci"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Správa aplikací a klávesových zkratek rychlého spuštění"</string>
     <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Povolit další možnosti nastavení"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Informace o aplikaci"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"O aplikaci"</string>
     <string name="storage_label" msgid="8700867073480107253">"Úložiště"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Otevírat ve výchozím nastavení"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Výchozí aplikace"</string>
@@ -1689,6 +1737,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>
@@ -1787,6 +1839,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čtečky obrazovky, zobrazení, ovládací prvky interakce"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nastavení pro slabozraké"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Toto zařízení můžete přizpůsobit svým potřebám. Funkce přístupnosti lze později změnit v Nastavení."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Zvětšete písmo"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čtečky obrazovky"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk a text na obrazovce"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zobrazení"</string>
@@ -1915,6 +1968,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>
@@ -1981,6 +2040,29 @@
     <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="4006631636646776488">"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 aplikaci ukončíte.\n\nPokud se to bude dít neustále, kvůli prodloužení výdrže baterie bude aplikaci možná nutné odinstalovat."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"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 aplikaci ukončíte.\n\nPokud se to bude dít neustále, kvůli prodloužení výdrže baterie bude aplikaci možná nutné odinstalovat."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"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 aplikaci ukončíte.\n\nPokud se to bude dít neustále, kvůli prodloužení výdrže baterie bude aplikaci možná nutné odinstalovat."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefon nemůže normálně šetřit baterii, protože jej aplikace <xliff:g id="APP_0">%1$s</xliff:g> neustále budí.\n\nTento problém můžete vyřešit tím, že aplikaci <xliff:g id="APP_1">%1$s</xliff:g> ukončíte.\n\nPokud se to bude dít neustále, kvůli prodloužení výdrže baterie bude aplikaci možná nutné odinstalovat."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tablet nemůže normálně šetřit baterii, protože jej aplikace <xliff:g id="APP_0">%1$s</xliff:g> neustále budí.\n\nTento problém můžete vyřešit tím, že aplikaci <xliff:g id="APP_1">%1$s</xliff:g> ukončíte.\n\nPokud se to bude dít neustále, kvůli prodloužení výdrže baterie bude aplikaci možná nutné odinstalovat."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Zařízení nemůže normálně šetřit baterii, protože jej aplikace <xliff:g id="APP_0">%1$s</xliff:g> neustále budí.\n\nTento problém můžete vyřešit tím, že aplikaci <xliff:g id="APP_1">%1$s</xliff:g> ukončíte.\n\nPokud se to bude dít neustále, kvůli prodloužení výdrže baterie bude aplikaci možná nutné odinstalovat."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zastavit aplikaci"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Vypnout aplikaci včetně používání na pozadí?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefon nemůže normálně šetřit baterii, protože jej aplikace <xliff:g id="APP_0">%1$s</xliff:g> neustále budí.\n\nChcete-li problém odstranit, vypněte aplikaci <xliff:g id="APP_1">%1$s</xliff:g> a zabraňte jejímu spuštění na pozadí."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tablet nemůže normálně šetřit baterii, protože jej aplikace <xliff:g id="APP_0">%1$s</xliff:g> neustále budí.\n\nChcete-li problém odstranit, vypněte aplikaci <xliff:g id="APP_1">%1$s</xliff:g> a zabraňte jejímu spuštění na pozadí."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Zařízení nemůže normálně šetřit baterii, protože jej aplikace <xliff:g id="APP_0">%1$s</xliff:g> neustále budí.\n\nChcete-li problém odstranit, vypněte aplikaci <xliff:g id="APP_1">%1$s</xliff:g> a zabraňte jejímu spuštění 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1995,7 +2077,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>
@@ -2018,7 +2100,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Vypočtená spotřeba energie"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Skutečná spotřeba energie"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Vynutit ukončení"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Informace o aplikaci"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"O aplikaci"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavení aplikace"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Nastavení obrazovky"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Nastavení Wi-Fi"</string>
@@ -2047,12 +2129,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Přehled od posledního úplného nabití"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Poslední úplné nabití"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Zbývající doba výdrže baterie je přibližná a může se změnit podle způsobu používání"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Údaje o využití baterie jsou přibližné a mohou se změnit podle způsobu používání"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Při aktivním používání"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Na pozadí"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Využití baterie"</string>
@@ -2133,7 +2216,7 @@
     <string name="tts_spoken_language" msgid="5542499183472504027">"Mluvený jazyk"</string>
     <string name="tts_install_voices_title" msgid="8808823756936022641">"Instalace hlasů"</string>
     <string name="tts_install_voices_text" msgid="5292606786380069134">"Pokračujte do aplikace <xliff:g id="TTS_APP_NAME">%s</xliff:g> a nainstalujte hlasy"</string>
-    <string name="tts_install_voices_open" msgid="667467793360277465">"Otevřít aplikaci"</string>
+    <string name="tts_install_voices_open" msgid="667467793360277465">"Do aplikace"</string>
     <string name="tts_install_voices_cancel" msgid="4711492804851107459">"Zrušit"</string>
     <string name="tts_reset" msgid="2661752909256313270">"Obnovit"</string>
     <string name="tts_play" msgid="2628469503798633884">"Přehrát"</string>
@@ -2323,7 +2406,7 @@
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Využití dat apl."</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Účtování dat operátora se může lišit od údajů zařízení."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Využití aplikací"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACE O APLIKACI"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"O APLIKACI"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilní data"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Zadejte limit dat"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítání dat"</string>
@@ -2614,7 +2697,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>
@@ -2706,9 +2789,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>
@@ -2758,9 +2844,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"odemknutí přejetím prstem, heslo, gesto, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"pracovní výzva, práce, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"pracovní profil, spravovaný profil, sjednotit, sjednocení, práce, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gesta"</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_assist_gesture_launch" msgid="813968759791342591">"gesto"</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>
@@ -2845,7 +2932,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>
@@ -2860,6 +2948,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>
@@ -2889,8 +2981,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 v režimu obraz v obraze, 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>
@@ -2978,6 +3068,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Pouze od oblíbených kontaktů"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Žádné"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Budíky jsou vždy prioritní a budou slyšet"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Připomenutí"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Události"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Všichni volající"</string>
@@ -3029,11 +3120,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>
@@ -3041,7 +3127,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>
@@ -3167,6 +3253,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á spotřeba"</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>
@@ -3261,8 +3360,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>
@@ -3354,6 +3453,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>
@@ -3372,8 +3484,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>
@@ -3397,7 +3508,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>
@@ -3463,8 +3574,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>
@@ -3541,25 +3651,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Zapnuto"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Vypnuto"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Zavaděč je již odemknut"</string>
@@ -3580,6 +3697,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automaticky synchronizovat pracovní data"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Nechat aplikace automaticky aktualizovat data"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Synchronizace účtů"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Synchronizace je zapnuta u <xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$d</xliff:g> položek"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Synchronizace je zapnuta u všech položek"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Synchronizace je vypnuta u všech položek"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informace o spravovaném zařízení"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Změny a nastavení spravuje organizace"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Změny a nastavení spravuje organizace <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3674,6 +3794,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>
@@ -3687,5 +3808,11 @@
     <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="698847081680980774">"Co je nové a zajímavé?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Vyzkoušejte 5 nejpopulárnějších funkcí"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Stav registrace IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrováno"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neregistrováno"</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index e939775473a8678296abde5796f6f8706fa50360..284232a3dd0882978912e1a693bb1a38b5b5dc7c 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>
@@ -423,7 +413,7 @@
     <item msgid="758587126802411846">"Sort på hvidt"</item>
     <item msgid="1495307195241623402">"Gult på sort"</item>
     <item msgid="6039700130994371612">"Gult på blåt"</item>
-    <item msgid="7169235156349580064">"Brugerdefineret"</item>
+    <item msgid="7169235156349580064">"Tilpasset"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP-VPN"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fbbd31521a8b86bf74ad070a6a5d607623ab4768..ea66cd1c9146892d39f3fb4cdf23c8d985e80b04 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,39 @@
     <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 sidder 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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Gør det senere"</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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktivér Wi-Fi automatisk"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi aktiveres igen, når du er i nærheden af gemte netværk af høj kvalitet, f.eks dit hjemmenetværk"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ikke tilgængelig, fordi Søgning efter Wi-Fi-netværk er slået fra"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Vælg en udbyder af netværksvurdering for at bruge funktionen"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undgå dårlige forbindelser"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Brug kun et Wi-Fi-netværk, hvis det har en god internetforbindelse"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Anvend kun netværk med god internetforbindelse"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Opret forbindelse til åbne netværk"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Opret automatisk forbindelse til offentlige netværk af høj kvalitet"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Vælg en udbyder af netværksvurdering for at bruge funktionen"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Vælg en kompatibel udbyder af netværksvurdering for at bruge funktionen"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer certifikater"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"For at forbedre placeringsnøjagtigheden kan systemapps og -tjenester stadig scanne efter Wi-Fi-netværk. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Hvis du vil forbedre nøjagtigheden af placeringer, skal du slå Wi-Fi-scanning til i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanningsindstillingerne<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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">"Aktiv låseskærm"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Altid aktiveret/øget batteriforbrug"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye underretninger"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Hvornår skal den vises"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Nye underretninger"</string>
     <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="6978257596231155345">"Vis klokkeslæt, underretningsikoner og andre oplysninger. Øget batteriforbrug."</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>
@@ -1073,7 +1120,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Udstyrs-id"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basebandversion"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernesystem"</string>
-    <string name="build_number" msgid="3075795840572241758">"Versionnummer"</string>
+    <string name="build_number" msgid="3075795840572241758">"Buildnummer"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Ikke tilgængelig"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Der er andre brugere til stede på denne enhed.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilselskaber på eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dette vil ikke automatisk opsige dit mobilabonnement."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ryd musik, billeder og andre brugerdata ved at formatere "<b>"USB-lager"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Hvis du vil rydde musik, billeder og andre brugerdata, skal du formatere "<b>"SD-kortet"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Slet USB-lager"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,11 +1536,14 @@
     <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Aktivér flere indstillinger"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Oplysninger om appen"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Appinfo"</string>
     <string name="storage_label" msgid="8700867073480107253">"Lagerplads"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Åbn som standard"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Standard"</string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skærmlæsere, visning, kontrolelementer til interaktion"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Synsindstillinger"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan tilpasse denne enhed, så den passer til dine behov. Disse hjælpefunktioner kan ændres senere under Indstillinger."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Forøg skriftstørrelse"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skærmlæsere"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Lyd og tekst på skærmen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skærm"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Din telefon kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> forhindrer telefonen i at gå i dvale.\n\nDu kan prøve at løse problemet ved at stoppe appen.\n\nHvis problemet fortsætter, er du muligvis nødt til at afinstallere appen for at forbedre batteriets ydeevne."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> forhindrer din tablet i at gå i dvale.\n\nDu kan prøve at løse problemet ved at stoppe appen.\n\nHvis problemet fortsætter, er du muligvis nødt til at afinstallere appen for at forbedre batteriets ydeevne."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Din enhed kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> forhindrer enheden i at gå i dvale.\n\nDu kan prøve at løse problemet ved at stoppe appen.\n\nHvis problemet fortsætter, er du muligvis nødt til at afinstallere appen for at forbedre batteriets ydeevne."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Din telefon kan ikke administrere batteriet normalt, fordi <xliff:g id="APP_0">%1$s</xliff:g> bliver ved med at vække telefonen.\n\nDu kan prøve at løse problemet ved at stoppe <xliff:g id="APP_1">%1$s</xliff:g>.\n\nHvis problemet fortsætter, er du muligvis nødt til at afinstallere appen for at forbedre batteriets ydeevne."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP_0">%1$s</xliff:g> bliver ved med at vække din tablet.\n\nDu kan prøve at løse problemet ved at stoppe <xliff:g id="APP_1">%1$s</xliff:g>.\n\nHvis problemet fortsætter, er du muligvis nødt til at afinstallere appen for at forbedre batteriets ydeevne."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Din enhed kan ikke administrere batteriet normalt, fordi <xliff:g id="APP_0">%1$s</xliff:g> bliver ved med at vække enheden.\n\nDu kan prøve at løse problemet ved at stoppe <xliff:g id="APP_1">%1$s</xliff:g>.\n\nHvis problemet fortsætter, er du muligvis nødt til at 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="6936542136153283692">"Vil du deaktivere brug i baggrunden og stoppe appen?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Din telefon kan ikke administrere batteriet normalt, fordi <xliff:g id="APP_0">%1$s</xliff:g> bliver ved med at vække telefonen.\n\nDu kan prøve at løse problemet ved at stoppe <xliff:g id="APP_1">%1$s</xliff:g> og forhindre appen i at køre i baggrunden."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP_0">%1$s</xliff:g> bliver ved med at vække din tablet.\n\nDu kan prøve at løse problemet ved at stoppe <xliff:g id="APP_1">%1$s</xliff:g> og forhindre appen i at køre i baggrunden."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Din enhed kan ikke administrere batteriet normalt, fordi <xliff:g id="APP_0">%1$s</xliff:g> bliver ved med at vække din enhed.\n\nDu kan prøve at løse problemet ved at stoppe <xliff:g id="APP_1">%1$s</xliff:g> og 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="7774807745601479888">"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\nDu kan prøve at løse problemet ved at deaktivere placering for denne app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"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\nDu kan prøve at løse problemet ved at deaktivere placering for denne app."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"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\nDu kan prøve at løse problemet ved at deaktivere placering 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>
@@ -1953,7 +2033,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>
@@ -1976,7 +2056,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Beregnet strømforbrug"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Registreret strømforbrug"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Tving til at standse"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Oplysninger om appen"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Appinfo"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Indstillinger for app"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Indstillinger for skærm"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Indstillinger for Wi-Fi"</string>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Siden sidste fulde opladning"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Sidste fulde opladning"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Den resterende batteritid er omtrentlig og kan ændre sig afhængigt af forbrug"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Data om batteriforbrug er omtrentlige og kan ændre sig afhængigt af brug"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Under aktiv brug"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Mens den kører i baggrunden"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batteriforbrug"</string>
@@ -2146,8 +2227,8 @@
     <string name="usage_access_title" msgid="332333405495457839">"Apps med adgang til forbrug"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nødtone"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Angiv adfærd ved nødopkald"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"Sikkerhedskopiering"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"Sikkerhedskopiering og gendannelse"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"Backup"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Backup og gendannelse"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige oplysninger"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopiér data"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sikkerhedskopiér appdata, Wi-Fi-adgangskoder og andre indstillinger på Googles servere"</string>
@@ -2155,7 +2236,7 @@
     <string name="include_app_data_title" msgid="2829970132260278394">"Inkluder appdata"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Ved geninstallation af en app gendannes sikkerhedskopierede indstillinger og data"</string>
-    <string name="backup_inactive_title" msgid="685838037986644604">"Tjenesten til sikkerhedskopiering er deaktiveret"</string>
+    <string name="backup_inactive_title" msgid="685838037986644604">"Backuptjenesten er deaktiveret"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Der er ingen konto, der i øjeblikket lagrer sikkerhedskopierede data"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Vil du stoppe sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker, andre indstillinger og appdata samt slette alle kopier på Googles servere?"</string>
@@ -2236,7 +2317,7 @@
     <string name="sync_error" msgid="5060969083117872149">"Synkroniseringsfejl"</string>
     <string name="last_synced" msgid="4242919465367022234">"Sidst synkroniseret <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Synkroniserer nu…"</string>
-    <string name="settings_backup" msgid="2274732978260797031">"Indstillinger for sikkerhedskopiering"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"Indstillinger for backup"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Sikkerhedskopier mine indstillinger"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Synkroniser nu"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Annuller synkronisering"</string>
@@ -2281,7 +2362,7 @@
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataforbrug"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Appforbrug"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"OPLYSNINGER OM APPEN"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"APPINFO"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobildata"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Angiv datagrænse"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus for dataforbrug"</string>
@@ -2447,9 +2528,9 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"Fjernede loginoplysninger: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Der er ikke installeret nogen brugerloginoplysninger"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Stavekontrol"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Angiv din aktuelle adgangskode til fuldstændig sikkerhedskopiering:"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Angiv din nye adgangskode til fuldstændig sikkerhedskopiering:"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Gentag din nye adgangskode til fuldstændig sikkerhedskopiering:"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Angiv din aktuelle adgangskode til fuldstændig backup:"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Angiv din nye adgangskode til fuldstændig backup:"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Gentag din nye adgangskode til fuldstændig backup:"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Angiv adgangskode til sikkerhedskopi"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuller"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Yderligere systemopdateringer"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2684,7 +2768,7 @@
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"hastighed, sprog, standard, tale, indtaling, tts, hjælpefunktion, skærmlæser, blind"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ur, militærtid"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"nulstil, gendan, fabriksdata"</string>
-    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"slet, slet, gendan, ryd, fjern"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"ryd, slet, gendan, rens, fjern"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"printer"</string>
     <string name="keywords_sounds" msgid="7146245090127541167">"højttalerbip"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"forstyr ikke, afbryd, afbrydelse, pause"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"stryg for at låse op, adgangskode, mønster, pinkode"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"arbejdsudfordring, arbejde, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"arbejdsprofil, administreret profil, samle, samling, arbejde, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"bevægelse"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"bevægelser"</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_assist_gesture_launch" msgid="813968759791342591">"bevægelse"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2816,7 +2906,7 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Ingen installerede apps har anmodet om adgang til underretninger."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Tillad adgang til underretninger for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Underretningslytteren kan også afvise underretninger eller udløse handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger."</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Underretningslytteren kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Hvis du slår adgang til underretninger fra for <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, slås adgangen til Forstyr ikke muligvis også fra."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Slå fra"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Annuller"</string>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kun fra stjernemarkerede kontaktpersoner"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmer prioriteres altid og afgiver lyde"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påmindelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Begivenheder"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle opkaldere"</string>
@@ -2965,19 +3054,14 @@
     <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>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Du kan beskytte denne 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 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 et mønster, før enheden kan starte op?"</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, beskeder 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>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Du kan beskytte denne 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, beskeder 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 et mønster, før enheden kan starte op?"</string>
     <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_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, beskeder 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, beskeder 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="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>
@@ -3095,6 +3179,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>
@@ -3115,16 +3208,16 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Denne fejlrapport deles med din it-administrator. Kontakt vedkommende for at få flere oplysninger."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Del"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Afvis"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"Oplad denne enhed"</string>
-    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Oplad denne enhed"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Oplade denne enhed"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Oplade denne enhed"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Strømforsyning"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Oplad den tilsluttede enhed. Virker kun med enheder, der understøtter USB-opladning."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Overfør filer"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Overføre filer"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Overfør filer til en anden enhed"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Til at overføre billeder (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Overføre billeder (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Overfør billeder eller filer, hvis MTP ikke understøttes (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"Brug enheden som MIDI"</string>
-    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Brug denne enhed som MIDI"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Bruge enheden som MIDI"</string>
+    <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bruge denne enhed som MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Brug USB til"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Opladning af denne enhed"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,14 +3398,13 @@
     <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>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> begrænsninger</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"Mobilselskabets dataopgørelse kan variere fra enhedens opgørelse."</string>
+    <string name="operator_warning" msgid="1862988028996859195">"Mobilselskabets dataopgørelse kan afvige fra enhedens opgørelse."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> brugt"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Konfigurer en dataadvarsel"</string>
     <string name="data_warning" msgid="209133958008062117">"Dataadvarsel"</string>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3451,27 +3551,34 @@
     <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_title" msgid="64716226816032800">"Åbn 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 fingeraftrykslæser 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Til"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Fra"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloaderen er allerede låst op"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Synkroniser arbejdsdata automatisk"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Giv apps tilladelse til at opdatere data automatisk"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Kontosynkronisering"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Synkronisering er aktiveret for <xliff:g id="ID_1">%1$d</xliff:g> ud af <xliff:g id="ID_2">%2$d</xliff:g> elementer"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Synkronisering er aktiveret for alle elementer"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Synkronisering er deaktiveret for alle elementer"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Oplysninger om administrerede enheder"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Ændringer og indstillinger, der administreres af din organisation"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Ændringer og indstillinger, der administreres af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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">"Aktivér mobilselskab"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvad er nyt og spændende?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Se de fem mest populære funktioner"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Status for IMS-registrering"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registreret"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ikke registreret"</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index aa90ce546ac145a1a01aa6863ab75cb0c0dde76e..40c80295e24b052517c85082de1902dd76c812b7 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 747b3894d7bac66a6f58a8ec8bbc6a2fdc663955..e91c87980a11d617ac94586ceaa8bc90acdc5041 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">"Empfangene 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Später"</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">"Sensor auf Rückseite mit Zeigefinger berühren."</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 +459,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 +531,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"WLAN automatisch aktivieren"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"WLAN wird in der Nähe von leistungsstarken gespeicherten Netzwerken wie deinem Heimnetzwerk automatisch aktiviert"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nicht verfügbar, weil WLAN-Suche deaktiviert ist"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Für diese Funktion musst du zuerst einen Anbieter von Netzwerkbewertungen auswählen"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Schlechte Internetverbindungen vermeiden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"WLAN nur bei guter Internetverbindung verwenden"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Nur Netzwerke mit stabiler Internetverbindung verwenden"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Verbindung zu offenen Netzwerken herstellen"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatisch mit leistungsstarken öffentlichen Netzwerken verbinden"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Für diese Funktion musst du zuerst einen Anbieter von Netzwerkbewertungen auswählen"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Für diese Funktion musst du zuerst einen kompatiblen Anbieter von Netzwerkbewertungen auswählen"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Zertifikate installieren"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Zur Erhöhung der Standortgenauigkeit können System-Apps und -dienste weiterhin nach WLAN-Netzwerken suchen. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Um die Standortgenauigkeit zu erhöhen, aktiviere die WLAN-Suche in den <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>Sucheinstellungen<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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">"Internetverbindung und Inhalte werden nicht für andere Geräte freigegeben"</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>
@@ -896,6 +936,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 WLANs 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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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">"Keiner"</string>
+    <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Zu benutzerdefinierter Zeit aktiv"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Nachts 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 automatisch bei Sonnenuntergang 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 automatisch bei Sonnenaufgang 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>
@@ -1007,7 +1048,7 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Display personalisieren"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Bildschirmschoner"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Während des Ladevorgangs und bei angedocktem Gerät"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Während des Ladevorgangs oder bei angedocktem Gerät"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"In beiden Fällen"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Während des Ladevorgangs"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Bei angedocktem Gerät"</string>
@@ -1020,8 +1061,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="7337555569694794132">"Immer aktiviert/erhöhter Akkuverbrauch"</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="6978257596231155345">"Uhrzeit, Benachrichtigungssymbole und andere Informationen anzeigen. Erhöhter Akkuverbrauch."</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>
@@ -1234,7 +1281,7 @@
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Verschieben abbrechen"</string>
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Die <xliff:g id="NAME_0">^1</xliff:g> ist offenbar langsam. \n\nDu kannst fortfahren, aber hierher verschobene Apps bleiben eventuell hängen und Datenübertragungen können lange dauern. \n\nFür eine bessere Leistung solltest du eine schnellere <xliff:g id="NAME_1">^1</xliff:g> nutzen."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkustatus"</string>
-    <string name="battery_level_title" msgid="2965679202786873272">"Akkuladung"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Akkustand"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Zugangspunkt bearbeiten"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Nicht definiert"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du bist zurzeit in folgenden Konten angemeldet:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Auf diesem Gerät sind andere Nutzer vorhanden.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilfunkanbieter auf der eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dein Mobilfunkvertrag wird dadurch nicht gekündigt."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-Speicher löschen"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1452,7 +1497,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Entsperrungs-PIN ändern"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zeichne ein Entsperrungsmuster."</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Menütaste drücken, um die Hilfe aufzurufen"</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lasse die Tasten los, wenn du fertig bist."</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lass die Tasten los, wenn du fertig bist."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Verbinde mindestens <xliff:g id="NUMBER">%d</xliff:g> Punkte. Bitte versuche es erneut."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Muster wurde aufgezeichnet."</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Zeichne das Muster zur Bestätigung erneut."</string>
@@ -1476,13 +1521,13 @@
     <string name="activity_not_found" msgid="5551664692991605325">"App ist nicht auf dem Telefon installiert."</string>
     <string name="lock_settings_profile_title" msgid="2121876391814535295">"Sicherheit des Arbeitsprofils"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Displaysperre des Arbeitsprofils"</string>
-    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Eine Sperre verwenden"</string>
-    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Eine Sperre für Arbeitsprofil und Display verwenden"</string>
-    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Eine Sperre verwenden?"</string>
+    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"Einheitliche Sperre verwenden"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"Einheitliche Sperre für Arbeitsprofil und Display verwenden"</string>
+    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"Einheitliche Sperre verwenden?"</string>
     <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"Dein Gerät verwendet die Displaysperre des Arbeitsprofils. Die Arbeitsrichtlinien gelten für beide Sperren."</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"Die Sperre deines Arbeitsprofils entspricht nicht den Sicherheitsanforderungen deines Unternehmens. Du kannst für das Display und dein Arbeitsprofil dieselbe Sperre verwenden. In diesem Fall gelten jedoch sämtliche Richtlinien des Arbeitsprofils auch für die Displaysperre."</string>
-    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"Eine Sperre verwenden"</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"Eine Sperre verwenden"</string>
+    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"Einheitliche Sperre verwenden"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"Einheitliche Sperre verwenden"</string>
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Identisch mit Displaysperre des Geräts"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Apps verwalten"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installierte Apps verwalten und entfernen"</string>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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; Bewegungen"</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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screenreader, Display, Interaktionssteuerung"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Anzeigeeinstellungen"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kannst dieses Gerät an deine Bedürfnisse anpassen. Diese Funktionen der Bedienungshilfen kannst du später in den Einstellungen ändern."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Schriftgröße ändern"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screenreader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audiodienste und Text auf dem Bildschirm"</string>
     <string name="display_category_title" msgid="685461049938269166">"Bildschirm"</string>
@@ -1853,7 +1906,7 @@
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> muss:"</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil eine App die Berechtigungsanfrage verdeckt."</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"Deine Eingabe wird von \"Einstellungen\" nicht erkannt, weil die Berechtigungsanfrage von einer App verdeckt wird."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Wenn du <xliff:g id="SERVICE">%1$s</xliff:g> aktivierst, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Da du eine Bedienungshilfe aktiviert hast, verwendet dein Gerät nicht die Displaysperre, um die Datenverschlüsselung zu verbessern."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Da die Aktivierung von <xliff:g id="SERVICE">%1$s</xliff:g> Auswirkungen auf die Datenverschlüsselung hat, musst du dein Muster bestätigen."</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Eine normale Verwaltung des Akkuverbrauchs deines Smartphones ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Smartphones zu erhöhen."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Eine normale Verwaltung des Akkuverbrauchs deines Tablets ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Tablets zu erhöhen."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Eine normale Verwaltung des Akkuverbrauchs deines Geräts ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Geräts zu erhöhen."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Eine normale Verwaltung des Akkuverbrauchs deines Smartphones ist nicht möglich, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Smartphones zu erhöhen."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Eine normale Verwaltung des Akkuverbrauchs deines Tablets ist nicht möglich, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Tablets zu erhöhen."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Eine normale Verwaltung des Akkuverbrauchs deines Geräts ist nicht möglich, weil es durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Gerät zu erhöhen."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"App beenden"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Hintergrundnutzung deaktivieren und App beenden?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Eine normale Verwaltung des Akkuverbrauchs ist nicht möglich, da das Smartphone durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden, damit die App nicht im Hintergrund aktiv bleibt."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Eine normale Verwaltung des Akkuverbrauchs ist nicht möglich, da das Tablet durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden, damit die App nicht im Hintergrund aktiv bleibt."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Eine normale Verwaltung des Akkuverbrauchs ist nicht möglich, da das Gerät durch <xliff:g id="APP_0">%1$s</xliff:g> immer wieder aktiviert wird.\n\nUm das Problem zu beheben, kannst du <xliff:g id="APP_1">%1$s</xliff:g> beenden, damit die App nicht im Hintergrund aktiv bleibt."</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="7774807745601479888">"Eine normale Verwaltung des Akkuverbrauchs deines Smartphones ist nicht möglich, da <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="118745801732181618">"Eine normale Verwaltung des Akkuverbrauchs deines Tablets ist nicht möglich, da <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="6783678153382298295">"Eine normale Verwaltung des Akkuverbrauchs deines Geräts ist nicht möglich, da <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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Verbrauchsdetails seit letzter vollständiger Ladung"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Letzte vollständige Aufladung"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Die verbleibende Akkulaufzeit ist eine Schätzung und kann sich je nach Nutzung ändern"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Die Daten zum Akkuverbrauch sind eine Schätzung und können sich je nach Nutzung ändern"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Bei aktiver Nutzung"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Im Hintergrund"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Akkunutzung"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kannst dieses Gerät für andere Nutzer freigeben, indem du weitere Nutzer erstellst. Jeder Nutzer erhält einen eigenen Bereich, in dem er Apps, den Hintergrund usw. personalisieren kann. Jeder Nutzer kann zudem Geräteeinstellungen wie WLAN ändern, die sich auf alle Nutzer auswirken.\n\nWenn du einen neuen Nutzer hinzufügst, muss dieser seinen Bereich einrichten.\n\nJeder Nutzer kann Apps für alle anderen Nutzer aktualisieren."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Wenn du einen neuen Nutzer hinzufügst, muss dieser seinen Bereich einrichten.\n\nJeder Nutzer kann Apps für alle anderen Nutzer aktualisieren."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nutzer jetzt einrichten?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Die Person muss Zugang zu dem Gerät haben und deinen Speicherplatz einrichten."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Die Person muss Zugang zum Gerät haben und ihren Bereich einrichten."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profil jetzt einrichten?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Jetzt einrichten"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nicht jetzt"</string>
@@ -2564,7 +2645,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. erste 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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"zum entsperren über das display streichen, zum entsperren wischen, passwort, muster, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"herausforderung bei der arbeit, arbeit, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"arbeitsprofil, verwaltetes profil, gruppieren, gruppierung, arbeit, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"Bewegung"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"Bewegungen"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"Bezahlen, tippen, Zahlungen"</string>
     <string name="keywords_backup" msgid="470070289135403022">"Sicherung, sicherung"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"Bewegung"</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>
@@ -2791,14 +2876,15 @@
     <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>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Niemals Benachrichtigungen anzeigen"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"Kein akustisches Signal und keine visuelle Unterbrechung"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"Kein Ton"</string>
-    <string name="notification_importance_default" msgid="5958338024601957516">"Akustisches Signal"</string>
+    <string name="notification_importance_default" msgid="5958338024601957516">"Akustisches Signal ausgeben"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Akustisches Signal und Bildschirmbenachrichtigung"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"Niedrig"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"Mittel"</string>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Bild im Bild"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Bild im Bild zulassen"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="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>
@@ -2887,7 +2975,7 @@
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Regel konfigurieren"</string>
     <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Zeitregel"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Automatische Regel zur Aktivierung des Status \"Nicht stören\" zu bestimmten Zeiten eingestellt"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Ereignisregel"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Terminregel"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Automatische Regel zur Aktivierung des Status \"Nicht stören\" während bestimmter Ereignisse eingestellt"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Während Terminen für"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Während Terminen für <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Nur von markierten Kontakten"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Keine"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Wecker"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarme haben Priorität und ein Ton wird ausgegeben"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Erinnerungen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Termine"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle Anrufer"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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">"Hoher Verbrauch"</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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3399,7 +3499,7 @@
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Unser Kundenservice steht täglich rund um die Uhr zur Verfügung"</string>
     <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Durchsuche die Hilfe oder versuche es noch einmal während der Geschäftszeiten des Supports (Ortszeit):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Geschäftszeiten des telefonischen Supports (Ortszeit)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"Hilfe durchsuchen oder Tipps &amp; Tricks erkunden"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"In Hilfe suchen oder Tipps &amp; Tricks erkunden"</string>
     <string name="support_country_list_title" msgid="823853371280534111">"Kundenservice für:"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
@@ -3408,7 +3508,7 @@
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Anrufen"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Chatten"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Tipps &amp; Tricks erkunden"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Hilfe durchsuchen &amp; Feedback senden"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"In Hilfe suchen &amp; Feedback senden"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kundenservice kontaktieren"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Anmelden"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"Anmeldung nicht möglich?"</string>
@@ -3452,26 +3552,33 @@
     <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_summary" msgid="242037150983277829">"Ein-/Aus-Taste zweimal drücken, um Kamera direkt zu starten. Funktioniert bei 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">"Auf den Bildschirm Doppeltippen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
+    <string name="ambient_display_suggestion_summary" msgid="5987443721392571847">"Benachrichtigungen bei inaktivem Display ansehen"</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">"Smartphone in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Tablet in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Gerät in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
+    <string name="ambient_display_pickup_suggestion_summary" msgid="7014700589991761035">"Benachrichtigungen bei inaktivem Display ansehen"</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">"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">"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">"Benachrichtigungen lesen, indem du auf der Rückseite deines Geräts über den Fingerabdrucksensor nach unten wischst."</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>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Auf der Rückseite des Smartphones über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Auf der Rückseite des Tablets über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Auf der Rückseite des Geräts über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen."</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Benachrichtigungen schnell ansehen"</string>
+    <string name="fingerprint_swipe_for_notifications_suggestion_summary" msgid="127592803294414082">"Auf dem Fingerabdrucksensor nach unten wischen"</string>
     <string name="gesture_setting_on" msgid="3455094265233870280">"An"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Aus"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader ist bereits entsperrt"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Arbeitsdaten automatisch synchronisieren"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Apps die automatische Aktualisierung von Daten erlauben"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Kontosynchronisierung"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Synchronisierung für <xliff:g id="ID_1">%1$d</xliff:g> von <xliff:g id="ID_2">%2$d</xliff:g> Elementen aktiviert"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Synchronisierung für alle Elemente aktiviert"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Synchronisierung für alle Elemente deaktiviert"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Info zu verwalteten Geräten"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Änderungen und Einstellungen, die von deiner Organisation verwaltet werden"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Änderungen und Einstellungen, die von <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> verwaltet werden"</string>
@@ -3499,8 +3609,8 @@
     <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"Art von Informationen, die deine Organisation sehen kann"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"Änderungen des Administrators deiner Organisation"</string>
     <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"Mein Zugriff auf dieses Gerät"</string>
-    <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Daten zu deinem Arbeitskonto, etwa E-Mail und Kalender"</string>
-    <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Liste der Apps auf deinem Gerät"</string>
+    <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Daten zum Arbeitskonto, etwa E-Mail und Kalender"</string>
+    <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Liste der Apps auf dem Gerät"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"Nutzungsdauer und genutzte Datenmenge für jede App"</string>
     <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Neuestes Protokoll zum Netzwerkverkehr"</string>
     <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Neuester Fehlerbericht"</string>
@@ -3525,7 +3635,7 @@
     <string name="enterprise_privacy_always_on_vpn_device" msgid="4409098287763221215">"Durchgehend aktives VPN wurde aktiviert"</string>
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"Durchgehend aktives VPN wurde für dein persönliches Profil aktiviert"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"Durchgehend aktives VPN wurde für dein Arbeitsprofil aktiviert"</string>
-    <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globaler HTTP-Proxy wurde eingerichet"</string>
+    <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"Globaler HTTP-Proxy wurde eingerichtet"</string>
     <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"Vertrauenswürdige Anmeldedaten"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="other">Mindestens <xliff:g id="COUNT_1">%d</xliff:g> CA-Zertifikate</item>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Was gibt\'s Neues?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Die fünf besten Funktionen"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-Registrierungsstatus"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registriert"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nicht registriert"</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index ab8d05b60fc2d06e807fc6e1ed6cd27fde0396dd..6e1ba8b1b8c71a252f42ee990ab40247c28d75e2 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 acecbe76e1b7ea742f43e2ea7a2016eb8fef0985..0a4ddbb1021f054f96a9098c34fdbf131a9bb710 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Αργότερα"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Παράβλεψη ρύθμ. μοναδ. χαρακτηριστικού;"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Επιλέξατε να χρησιμοποιήσετε το μοναδικό χαρακτηριστικό σας ως έναν τρόπο για να ξεκλειδώσετε το τηλέφωνό σας. Εάν κάνετε παράβλεψη τώρα, θα πρέπει να το ρυθμίσετε αυτό αργότερα. Η εγκατάσταση διαρκεί μόνο ένα λεπτό περίπου."</string>
     <string name="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="1688030823464420974">"Εάν εισαγάγετε εσφαλμένο μοτίβο στην επόμενη προσπάθεια, τα δεδομένα αυτής της συσκευής θα διαγραφούν"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Εάν εισαγάγετε εσφαλμένο αριθμό PIN στην επόμενη προσπάθεια, τα δεδομένα αυτής της συσκευής θα διαγραφούν"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Εάν εισαγάγετε εσφαλμένο κωδικό πρόσβασης στην επόμενη προσπάθεια, τα δεδομένα αυτής της συσκευής θα διαγραφούν"</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="5047439819181833824">"Πάρα πολλές ανεπιτυχείς προσπάθειες. Τα δεδομένα αυτής της συσκευής θα διαγραφούν."</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">"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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Αυτόματη ενεργοποίηση Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Το Wi‑Fi θα ενεργοποιείται ξανά κοντά σε αποθηκευμένα δίκτυα υψηλής ποιότητας, όπως το οικιακό δίκτυό σας"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Η λειτουργία δεν είναι διαθέσιμη επειδή η σάρωση για δίκτυα Wi‑Fi είναι απενεργοποιημένη"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Για να χρησιμοποιήσετε τη λειτουργία, επιλέξτε έναν πάροχο αξιολόγησης δικτύου"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Αποφυγή κακών συνδέσεων"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Να μην γίνεται χρήση δικτύων Wi-Fi, εκτός αν υπάρχει καλή σύνδεση στο Διαδίκτυο"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Να χρησιμοποιούνται μόνο δίκτυα με καλή διαδικτυακή σύνδεση"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Σύνδεση σε ανοικτά δίκτυα"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Αυτόματη σύνδεση σε δημόσια δίκτυα υψηλής ποιότητας"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Για να χρησιμοποιήσετε τη λειτουργία, επιλέξτε έναν πάροχο αξιολόγησης δικτύου"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Για να χρησιμοποιήσετε τη λειτουργία, επιλέξτε έναν συμβατό πάροχο αξιολόγησης δικτύου"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Εγκατάσταση πιστοποιητικών"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Για τη βελτίωση του εντοπισμού τοποθεσίας, οι εφαρμογές και οι υπηρεσίες θα μπορούν ακόμη να εκτελέσουν σάρωση για δίκτυα 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Για τη βελτίωση της ακρίβειας του εντοπισμού τοποθεσίας, ενεργοποιήστε τη σάρωση για δίκτυα Wi-Fi στις <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ρυθμίσεις σάρωσης<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Πάντα ενεργή/Αυξημένη χρήση μπαταρίας"</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="6978257596231155345">"Εμφάνιση ώρας, εικονιδίων ειδοποίησης και άλλων πληροφοριών. Αυξημένη χρήση μπαταρίας."</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>
@@ -1030,23 +1077,23 @@
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Κλειδωμένο"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Κλείδωμα κάρτας SIM"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Κλείδωμα κάρτας SIM"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Απαιτείται αριθμός PIN για τη χρήση του tablet"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Απαιτείται αριθμός PIN για τη χρήση του tablet"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Απαιτείται αριθμός PIN για τη χρήση του τηλεφώνου"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Απαιτείται PIN για τη χρήση του tablet"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Απαιτείται PIN για τη χρήση του τηλεφώνου"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Απαιτείται PIN για τη χρήση του tablet"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Απαιτείται PIN για τη χρήση του τηλεφώνου"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Αλλαγή αριθμού PIN κάρτας SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Αριθμός PIN κάρτας SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Κλείδωμα κάρτας SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Ξεκλείδωμα κάρτας SIM"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"Παλιός αριθμός PIN κάρτας SIM"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"Νέος αριθμός PIN κάρτας SIM"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"Παλιό PIN κάρτας SIM"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"Νέο PIN κάρτας SIM"</string>
     <string name="sim_reenter_new" msgid="6523819386793546888">"Πληκτρολογήστε ξανά το νέο PIN"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"Αριθμός PIN κάρτας SIM"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Εσφαλμένο PIN"</string>
     <string name="sim_pins_dont_match" msgid="1695021563878890574">"Οι αριθμοί PIN δεν ταιριάζουν"</string>
-    <string name="sim_change_failed" msgid="3602072380172511475">"Δεν είναι δυνατή η αλλαγή PIN.\nΠιθανόν ο αριθμός PIN να είναι λάθος."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"Ο αριθμός PIN της κάρτας SIM άλλαξε επιτυχώς"</string>
-    <string name="sim_lock_failed" msgid="2489611099235575984">"Δεν είναι δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM.\nΠιθανόν ο αριθμός PIN να είναι λάθος."</string>
+    <string name="sim_change_failed" msgid="3602072380172511475">"Δεν αλλάζει το PIN.\nΊσως να είναι λάθος."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"Το PIN της κάρτας SIM άλλαξε"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"Δεν είναι δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM.\nΠιθανόν το PIN να είναι λάθος."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Ακύρωση"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Βρέθηκαν πολλές SIM"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Υπάρχουν άλλοι χρήστες σε αυτήν τη συσκευή.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Μουσική"</li>\n<li>"Φωτογραφίες"</li>\n<li>"Άλλα δεδομένα χρήστη"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Εταιρείες κινητής τηλεφωνίας με eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Με αυτήν την ενέργεια, δεν θα ακυρωθεί το πρόγραμμα υπηρεσίας κινητής τηλεφωνίας που χρησιμοποιείτε."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Πρέπει να γίνει διαγραφή του "<b>"αποθηκευτικού χώρου USB"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των εικόνων και άλλων δεδομένων."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Πρέπει να γίνει διαγραφή της "<b>"κάρτας SD"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των εικόνων και άλλων δεδομένων."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Διαγρ. αποθ. χώρου USB"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1430,7 +1475,7 @@
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Οι αριθμοί PIN δεν ταιριάζουν"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Επιλογή ξεκλειδώματος"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Ο κωδικός πρόσβασης έχει οριστεί"</string>
-    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Ο αριθμός PIN έχει οριστεί"</string>
+    <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Το PIN έχει οριστεί"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Το μοτίβο έχει οριστεί"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Χρησιμοποιήστε το μοτίβο της συσκευής σας για να συνεχίσετε"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"Εισαγάγετε το PIN της συσκευής σας για να συνεχίσετε"</string>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Στοιχεία ελέγχου αναγνωστών οθόνης, οθόνης, αλληλεπίδρασης"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ρυθμίσεις όρασης"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Μπορείτε να προσαρμόσετε αυτήν τη συσκευή σύμφωνα με τις ανάγκες σας. Οι λειτουργίες προσβασιμότητας μπορούν να τροποποιηθούν αργότερα από τις ρυθμίσεις."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Αύξηση μεγέθους γραμματοσειράς"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Αναγνώστες οθόνης"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ήχος και κείμενο στην οθόνη"</string>
     <string name="display_category_title" msgid="685461049938269166">"Οθόνη"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί ενεργή τη συσκευή σας.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε αυτήν την εφαρμογή.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Το tablet σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί ενεργή τη συσκευή σας.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε αυτήν την εφαρμογή.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί ενεργή τη συσκευή σας.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε αυτήν την εφαρμογή.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει το τηλέφωνο διαρκώς.\n\nΓια να δοκιμάσετε να επιδιορθώσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g>.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Το tablet σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει το tablet διαρκώς.\n\nΓια να δοκιμάσετε να επιδιορθώσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g>.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει τη συσκευή διαρκώς.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g>.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Διακοπή εφαρμογής"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Απενεργοπ. χρήσης στο παρασκήνιο και διακοπή της εφαρμογής;"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει το τηλέφωνο διαρκώς.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g> και να αποτρέψετε την εκτέλεσή της στο παρασκήνιο."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Το tablet σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει το tablet διαρκώς.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g> και να αποτρέψετε την εκτέλεσή της στο παρασκήνιο."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP_0">%1$s</xliff:g> ξυπνάει τη συσκευή σας διαρκώς.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε την εφαρμογή <xliff:g id="APP_1">%1$s</xliff:g> και να αποτρέψετε την εκτέλεσή της στο παρασκήνιο."</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="7774807745601479888">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν την χρησιμοποιείτε.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Το tablet σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> συνεχίζει να ζητά την τοποθεσία σας όταν δεν την χρησιμοποιείτε.\n\nΓια να επιλύσετε αυτό το πρόβλημα, μπορείτε να απενεργοποιήσετε την τοποθεσία για αυτήν την εφαρμογή."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Η συσκευή σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία, επειδή η εφαρμογή <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ανάλυση από την τελευταία πλήρη φόρτιση"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Τελευταία πλήρης φόρτιση"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Ο χρόνος της μπαταρίας που απομένει υπολογίζεται κατά προσέγγιση και μπορεί να αλλάξει ανάλογα με τη χρήση"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Τα δεδομένα χρήσης μπαταρίας υπολογίζονται κατά προσέγγιση και μπορεί να αλλάξουν ανάλογα με τη χρήση"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Κατά την ενεργή χρήση"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Κατά την εκτέλεση στο παρασκήνιο"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Χρήση της μπαταρίας"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"σύρετε για ξεκλείδωμα, κωδικός πρόσβασης, μοτίβο, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"πρόκληση εργασίας, εργασία, προφίλ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"προφίλ εργασίας, διαχειριζόμενο προφίλ, ενοποιώ, ενοποίηση, εργασία, προφίλ"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"κίνηση"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"κινήσεις"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"πληρωμή, πάτημα, πληρωμές"</string>
     <string name="keywords_backup" msgid="470070289135403022">"αντίγραφο ασφαλείας, δημιουργία αντιγράφου ασφαλείας"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"κίνηση"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Αγγίξτε μια ετικέτα για εγγραφή…"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Μόνο από τις επαφές με αστέρι"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Κανένα"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ξυπνητήρια"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Τα ξυπνητήρια έχουν πάντα προτεραιότητα και ήχο"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Υπενθυμίσεις"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Συμβάντα"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Όλοι οι καλούντες"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3285,7 +3387,7 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Για να πραγματοποιήσετε αλλαγές στην παρακολούθηση τηλεφωνίας, επανεκκινήστε τη συσκευή"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Αυτόματες ενημερώσεις συστήματος"</string>
     <string name="usage" msgid="2977875522080448986">"Χρήση"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Χρήση δεδομένων κινητής τηλεφωνίας"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Χρήση δεδ. κιν. τηλεφ."</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Χρήση δεδομένων Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Χρήση δεδομένων Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Κίνηση βοήθειας"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Ευαισθησία"</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="gesture_setting_on" msgid="3455094265233870280">"Ενεργό"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Ανενεργό"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Το bootloader είναι ήδη ξεκλείδωτο"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Αυτόματος συγχρονισμός δεδομένων εργασίας"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Επιτρέπει στις εφαρμογές να ανανεώνουν δεδομένα αυτόματα"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Συγχρονισμός λογαριασμού"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Ο συγχρονισμός είναι ενεργοποιημένος για <xliff:g id="ID_1">%1$d</xliff:g> από <xliff:g id="ID_2">%2$d</xliff:g> στοιχεία"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Ο συγχρονισμός είναι ενεργοποιημένος για όλα τα στοιχεία"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Ο συγχρονισμός είναι απενεργοποιημένος για όλα τα στοιχεία"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Πληροφορίες διαχειριζόμενης συσκευής"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Η διαχείριση των αλλαγών και των ρυθμίσεων γίνεται από τον οργανισμό σας"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Η διαχείριση των αλλαγών και των ρυθμίσεων γίνεται από <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,9 +3682,10 @@
     <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>
+    <string name="autofill_app" msgid="7338387238377914374">"Υπηρεσία αυτόμ. συμπλήρωσης"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"αυτόματη, συμπλήρωση, αυτόματη συμπλήρωση"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Βεβαιωθείτε ότι εμπιστεύεστε αυτήν την εφαρμογή&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
     <string name="device_theme" msgid="4571803018917608588">"Θέμα συσκευής"</string>
@@ -3584,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ενεργή"</string>
     <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="storage_movies_tv" msgid="5498394447562086890">"Εφαρμογές ταινιών/TV"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Πληροφορίες παροχής εταιρείας κινητής τηλεφωνίας"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ενεργοποίηση παροχής εταιρείας κινητής τηλεφωνίας"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"Τι νέο και συναρπαστικό υπάρχει;"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Δείτε τις κορυφαίες 5 λειτουργίες"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Κατάσταση εγγραφής υπηρεσίας IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Εγγεγραμμένη"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Μη εγγεγραμμένη"</string>
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 395746a1d812db65648e8a36c41929135728a6c1..f3beb46522e59baa79e2294865024fdf4b8c10a1 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 40acb04ec27528fcc7c9f88c3e78bf09aec8844d..fee6d553c04e298880cbaf273548eb50de6654db 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Do it later"</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 +460,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 +532,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="1688030823464420974">"If you enter an incorrect pattern on the next attempt, this device\'s data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"If you enter an incorrect PIN on the next attempt, this device\'s data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"If you enter an incorrect password on the next attempt, this device\'s data 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="5047439819181833824">"Too many incorrect attempts. This device\'s data 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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Turn on Wi‑Fi automatically"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi will turn back on near high‑quality saved networks, like your home network"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Unavailable because Wi‑Fi scanning is turned off"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"To use, select a network rating provider"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Don\'t use a Wi‑Fi network unless it has a good Internet connection"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Only use networks that have a good Internet connection"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Connect to open networks"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatically connect to high‑quality public networks"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"To use, select a network rating provider"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"To use, select a compatible network rating provider"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"To improve location accuracy, system apps and services can still scan for Wi‑Fi networks. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"To improve location accuracy, turn on Wi-Fi scanning in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Always on/Increased battery usage"</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="6978257596231155345">"Show time, notification icons and other info. Increased battery usage."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Erase USB storage"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Increase font size"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"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 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="2369957934555162428">"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 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="6195430620406365292">"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 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_wakeup_alarm" product="default" msgid="1638726742782558262">"Your phone can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Your tablet can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Your device can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Turn off background usage &amp; stop app?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Your phone can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it from running in the background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Your tablet can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it from running in the background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Your device can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Last full charge"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Remaining battery time is approximate and can change based on usage"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Battery usage data is approximate and can change based on usage"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"While in active use"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"While in background"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Battery usage"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slide to unlock, password, pattern, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"work challenge, work, profile"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"work profile, managed profile, unify, unification, work, profile"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestures"</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_assist_gesture_launch" msgid="813968759791342591">"gesture"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarms are always a priority and make sound"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"On"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatically sync work data"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Let apps refresh data automatically"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Account sync"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sync on for <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g> items"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sync on for all items"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sync off for all items"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Managed device info"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Changes &amp; settings managed by your organisation"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Changes &amp; settings managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"What\'s new and exciting?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 395746a1d812db65648e8a36c41929135728a6c1..f3beb46522e59baa79e2294865024fdf4b8c10a1 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 40acb04ec27528fcc7c9f88c3e78bf09aec8844d..fee6d553c04e298880cbaf273548eb50de6654db 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Do it later"</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 +460,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 +532,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="1688030823464420974">"If you enter an incorrect pattern on the next attempt, this device\'s data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"If you enter an incorrect PIN on the next attempt, this device\'s data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"If you enter an incorrect password on the next attempt, this device\'s data 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="5047439819181833824">"Too many incorrect attempts. This device\'s data 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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Turn on Wi‑Fi automatically"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi will turn back on near high‑quality saved networks, like your home network"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Unavailable because Wi‑Fi scanning is turned off"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"To use, select a network rating provider"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Don\'t use a Wi‑Fi network unless it has a good Internet connection"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Only use networks that have a good Internet connection"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Connect to open networks"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatically connect to high‑quality public networks"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"To use, select a network rating provider"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"To use, select a compatible network rating provider"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"To improve location accuracy, system apps and services can still scan for Wi‑Fi networks. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"To improve location accuracy, turn on Wi-Fi scanning in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Always on/Increased battery usage"</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="6978257596231155345">"Show time, notification icons and other info. Increased battery usage."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Erase USB storage"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Increase font size"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"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 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="2369957934555162428">"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 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="6195430620406365292">"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 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_wakeup_alarm" product="default" msgid="1638726742782558262">"Your phone can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Your tablet can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Your device can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Turn off background usage &amp; stop app?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Your phone can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it from running in the background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Your tablet can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it from running in the background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Your device can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Last full charge"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Remaining battery time is approximate and can change based on usage"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Battery usage data is approximate and can change based on usage"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"While in active use"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"While in background"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Battery usage"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slide to unlock, password, pattern, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"work challenge, work, profile"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"work profile, managed profile, unify, unification, work, profile"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestures"</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_assist_gesture_launch" msgid="813968759791342591">"gesture"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarms are always a priority and make sound"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"On"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatically sync work data"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Let apps refresh data automatically"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Account sync"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sync on for <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g> items"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sync on for all items"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sync off for all items"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Managed device info"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Changes &amp; settings managed by your organisation"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Changes &amp; settings managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"What\'s new and exciting?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 395746a1d812db65648e8a36c41929135728a6c1..f3beb46522e59baa79e2294865024fdf4b8c10a1 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 40acb04ec27528fcc7c9f88c3e78bf09aec8844d..fee6d553c04e298880cbaf273548eb50de6654db 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Do it later"</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 +460,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 +532,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="1688030823464420974">"If you enter an incorrect pattern on the next attempt, this device\'s data will be deleted"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"If you enter an incorrect PIN on the next attempt, this device\'s data will be deleted"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"If you enter an incorrect password on the next attempt, this device\'s data 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="5047439819181833824">"Too many incorrect attempts. This device\'s data 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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Turn on Wi‑Fi automatically"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi will turn back on near high‑quality saved networks, like your home network"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Unavailable because Wi‑Fi scanning is turned off"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"To use, select a network rating provider"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Don\'t use a Wi‑Fi network unless it has a good Internet connection"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Only use networks that have a good Internet connection"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Connect to open networks"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatically connect to high‑quality public networks"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"To use, select a network rating provider"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"To use, select a compatible network rating provider"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"To improve location accuracy, system apps and services can still scan for Wi‑Fi networks. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"To improve location accuracy, turn on Wi-Fi scanning in <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanning settings<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Always on/Increased battery usage"</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="6978257596231155345">"Show time, notification icons and other info. Increased battery usage."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"You are currently signed in to the following accounts:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"There are other users present on this device.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operators on eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"This will not cancel your mobile service plan."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Erase USB storage"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen readers, display, interaction controls"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Vision settings"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"You can customise this device to fit your needs. These accessibility features can be changed later in Settings."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Increase font size"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen readers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; on-screen text"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"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 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="2369957934555162428">"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 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="6195430620406365292">"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 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_wakeup_alarm" product="default" msgid="1638726742782558262">"Your phone can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Your tablet can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Your device can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Turn off background usage &amp; stop app?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Your phone can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your phone.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it from running in the background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Your tablet can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your tablet.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it from running in the background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Your device can\'t manage battery normally because <xliff:g id="APP_0">%1$s</xliff:g> keeps waking up your device.\n\nTo try to fix this issue, you can stop <xliff:g id="APP_1">%1$s</xliff:g> and prevent it 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Last full charge"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Remaining battery time is approximate and can change based on usage"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Battery usage data is approximate and can change based on usage"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"While in active use"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"While in background"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Battery usage"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slide to unlock, password, pattern, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"work challenge, work, profile"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"work profile, managed profile, unify, unification, work, profile"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesture"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestures"</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_assist_gesture_launch" msgid="813968759791342591">"gesture"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"From starred contacts only"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"None"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarms"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarms are always a priority and make sound"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Reminders"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Events"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"All callers"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"On"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is already unlocked"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatically sync work data"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Let apps refresh data automatically"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Account sync"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sync on for <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g> items"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sync on for all items"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sync off for all items"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Managed device info"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Changes &amp; settings managed by your organisation"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Changes &amp; settings managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"What\'s new and exciting?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Check out the top 5 features"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registration state"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registered"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Not registered"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index d40bb835b43bec8e692374c3b0bf6b23aa169bb3..a476f8357b017df05a3d0bf7d9ac286c0596f3f7 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 367d00c1bd4fec2ce2064371a627dcd87c35efda..276e08246b56a15cad048b7705b38b768526282e 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 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">"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">"Desconectar"</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) -->
@@ -295,11 +307,11 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Configurar fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Establecer fecha, hora, zona horaria y formatos"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Fecha y hora automáticas"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar hora proporcionada por la red"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar hora proporcionada por la red"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar la hora proporcionada por la red"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar la hora proporcionada por la red"</string>
     <string name="zone_auto" msgid="334783869352026648">"Zona horaria automática"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar zona horaria proporcionada por la red"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar la zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar la zona horaria proporcionada por la red"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
@@ -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,39 @@
     <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: Es posible que la huella digital no sea tan segura como un PIN o un patrón eficaz."</string>
     <string name="security_settings_fingerprint_enroll_introduction_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 el 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 la 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 aprobar compras."</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Hacerlo más tarde"</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 en la parte posterior del teléfono 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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activar Wi-Fi automáticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"El Wi-Fi se volverá a activar automáticamente cerca de redes guardadas de alta calidad, como tu red doméstica"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"La opción no está disponible porque la búsqueda de redes Wi-Fi está desactivada"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Para usar la función, selecciona un proveedor de calificación de red"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar malas conexiones"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Usar solo redes con una conexión a Internet estable"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Conectar a redes abiertas"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Conectar automáticamente a redes públicas de alta calidad"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Para usar la función, selecciona un proveedor de calificación de red"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para usar la función, selecciona un proveedor de calificación de red compatible"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Para mejorar la precisión de la ubicación, los servicios y las aplicaciones del sistema todavía pueden buscar redes Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para mejorar la precisión de la ubicación, activa la búsqueda de Wi-Fi 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>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -845,16 +877,24 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para conectarte con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_tether_checkbox_text" msgid="1847167643625779136">"Hotspot 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">"Compartiendo la conexión a Internet de esta tablet por hotspot"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Compartiendo 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>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Error en la zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar la zona Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar hotspot Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuración de zona Wi-Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot WPA2 PSK de AndroidAP"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot: <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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">"Activar a una hora personalizada"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Activar de atardecer a amanecer"</string>
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
     <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>
@@ -1020,8 +1061,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="7337555569694794132">"Siempre activada/Aumenta el uso de la batería"</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 cuando haya notificaciones"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Siempre activada"</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Muestra la hora, los íconos de notificaciones y otra información. Aumenta el uso de la batería."</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>
@@ -1273,12 +1320,13 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Restablecer"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Restablecer configuración de red"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Se restablecerán las opciones de configuración de todas las redes, incluidos:\n\n"<li>"Wi‑Fi"</li>\n<li>"datos móviles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Se restablecerán las opciones de configuración de todas las redes, incluidos:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Restablecer configuración"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"¿Quieres restablecer la configuración de red? Esta acción no se puede deshacer."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer configuración"</string>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Accediste a las siguientes cuentas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Proveedores de la eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"No se cancelará tu plan de servicio móvil."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Eliminar almacenamiento USB"</string>
     <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>
@@ -1324,26 +1377,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 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>
@@ -1376,7 +1418,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>
@@ -1421,11 +1463,14 @@
     <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>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirma el PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Las contraseñas no coinciden."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Los PIN no coinciden."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Desbloquear la selección"</string>
@@ -1491,6 +1536,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>
@@ -1502,7 +1550,7 @@
     <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilidad de la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Memoria caché"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Eliminar memoria caché"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Borrar caché"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"Memoria caché"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
       <item quantity="other">%d elementos</item>
@@ -1527,7 +1575,7 @@
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"Decidiste permitir que esta aplicación pueda crear widgets y acceder a sus datos."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"No hay configuraciones predeterminadas establecidas."</string>
-    <string name="clear_activities" msgid="7408923511535174430">"Eliminar configuraciones predeterminadas"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Borrar valores predeterminados"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Es posible que esta aplicación no se haya diseñado para tu pantalla. Aquí puedes controlar cómo se ajusta a la pantalla."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Preguntar cuando se lanza"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Aplicación en escala"</string>
@@ -1539,7 +1587,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de emergencia"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán todas las preferencias de:\n\n "<li>"Aplicaciones inhabilitadas"</li>\n" "<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n" "<li>"Aplicaciones predeterminadas para realizar acciones"</li>\n" "<li>"Restricciones de datos en segundo plano para aplicaciones"</li>\n" "<li>"Restricciones de permisos"</li>\n\n" Los datos de las aplicaciones no se perderán."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán las preferencias de:\n\n "<li>"Apps inhabilitadas"</li>\n" "<li>"Notificaciones de apps inhabilitadas"</li>\n" "<li>"Apps predeterminadas para realizar acciones"</li>\n" "<li>"Restricciones de datos en segundo plano para apps"</li>\n" "<li>"Restricciones de permisos"</li>\n\n" No se perderán los datos de las apps."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1631,9 +1679,9 @@
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"Usuario: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Usuario eliminado"</string>
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
-    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> proceso y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
+    <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicio"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> procesos y <xliff:g id="NUMSERVICES">%2$d</xliff:g> servicios"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Memoria del dispositivo"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"RAM usada por las aplicaciones"</string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controles de interacción"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuración de visión"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Puedes personalizar este dispositivo para que se adapte a tus necesidades. Estas funciones de accesibilidad pueden cambiarse más tarde en Configuración."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar el tamaño de la fuente"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio y texto en pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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">"El dispositivo activo se mantiene 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="4006631636646776488">"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, detén la app.\n\nSi el problema persiste, es posible que debas desinstalarla para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP">%1$s</xliff:g> la mantiene activa.\n\nPara solucionar este problema, detén la app.\n\nSi el problema persiste, es posible que debas desinstalarla para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"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, detén la app.\n\nSi el problema persiste, es posible que debas desinstalarla para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, detén <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> la mantiene activa.\n\nPara solucionar este problema, detén <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="device" msgid="2854944538238649520">"Tu dispositivo no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, detén <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"¿Desactivar el uso en segundo plano y detener la app?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, detén <xliff:g id="APP_1">%1$s</xliff:g> y evita que se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> la mantiene activa.\n\nPara solucionar este problema, detén <xliff:g id="APP_1">%1$s</xliff:g> y evita que se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Tu dispositivo no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionar este problema, detén <xliff:g id="APP_1">%1$s</xliff:g> y evita que 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="7774807745601479888">"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 incluso cuando no estás usando la app.\n\nPara solucionar el problema, desactiva la ubicación en esta app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"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 incluso cuando no estás usando la app.\n\nPara solucionar el problema, desactiva la ubicación en esta app."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"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 incluso cuando no estás usando la app.\n\nPara solucionar el problema, desactiva la ubicación en 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última carga completa"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"El tiempo restante de batería es aproximado y puede cambiar en función del uso"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Los datos sobre la duración de la batería son aproximados y pueden cambiar en función del uso"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Durante el uso activo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Mientras se ejecuta en segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso de la batería"</string>
@@ -2564,7 +2645,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 extremas"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"desliza para desbloquear, contraseña, patrón, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafíos de trabajo, trabajo, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabajo, perfil administrado, unificar, unificación, trabajo, perfil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestos"</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_assist_gesture_launch" msgid="813968759791342591">"gesto"</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>
@@ -2791,7 +2876,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 esté bloqueado el dispositivo?"</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>
@@ -2806,6 +2892,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>
@@ -2831,8 +2921,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>
@@ -2916,6 +3004,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo de contactos destacados"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ninguno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Las alarmas son prioritarias y emiten sonido"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos los emisores"</string>
@@ -2963,11 +3052,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>
@@ -2975,7 +3059,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>
@@ -3093,6 +3177,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>
@@ -3185,8 +3278,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>
@@ -3276,6 +3369,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>
@@ -3294,8 +3396,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>
@@ -3315,7 +3416,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">"Ahorro de 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>
@@ -3379,8 +3480,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>
@@ -3451,25 +3551,32 @@
     <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 ubicado 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 ubicado 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 ubicado en la parte posterior del dispositivo."</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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Activado"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Desactivado"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El cargador de inicio está desbloqueado"</string>
@@ -3490,6 +3597,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronizar los datos de trabajo automáticamente"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Permitir que las apps actualicen datos automáticamente"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronización de la cuenta"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sincronización activada para <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g> elementos"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sincronización activada para todos los elementos"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sincronización desactivada para todos los elementos"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Información del dispositivo administrado"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Cambios y opciones de configuración que administra tu organización"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Cambios y opciones de configuración que administra <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3570,6 +3680,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>
@@ -3583,5 +3694,11 @@
     <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="698847081680980774">"¿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>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Estado de registro de IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Sin registrar"</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index ea13054d9621e96ccb2ec83a25d1de3f45690f37..bd5e0d991c99f84b074b37dc0cb6a30b269656b3 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 888461cbed215d0fc5629bd96632e6fbde99a73d..30e4c8afaa0504406ef67dfc9a36f07c0c206e62 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>
@@ -72,8 +74,8 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Desactivar USB"</string>
-    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desactivar tarjeta SD"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Desconectar USB"</string>
+    <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Desconectar tarjeta SD"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Borrar almacenamiento USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Borrar tarjeta SD"</string>
     <string name="preview_pager_content_description" msgid="8926235999291761243">"Vista previa"</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) -->
@@ -295,11 +307,11 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establecer fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Establecer fecha, hora, zona horaria y formatos"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Fecha y hora automáticas"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usar los datos proporcionados por la red"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usar los datos proporcionados por la red"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Usa los datos proporcionados por la red"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Usa los datos proporcionados por la red"</string>
     <string name="zone_auto" msgid="334783869352026648">"Zona horaria automática"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usar zona horaria proporcionada por la red"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usar zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Usa zona horaria proporcionada por la red"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Usa zona horaria proporcionada por la red"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Usar formato de 24 horas"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
@@ -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,39 @@
     <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">"Toca 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">"Toca 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">"Levanta el dedo y toca de nuevo"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Sigue levantando 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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Hacerlo más adelante"</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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activar Wi-Fi automáticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"La conexión Wi-Fi se volverá a activar automáticamente cerca de las redes de alta calidad guardadas, como la de tu casa"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"No está disponible porque la búsqueda de redes Wi-Fi está desactivada"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Para usar esta función, selecciona un proveedor de valoración de redes"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Solo conexiones estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Solo usar redes con buena conexión a Internet"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Conectarse a redes abiertas"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Conectarse automáticamente a redes Wi-Fi públicas de alta calidad"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Para usar esta función, selecciona un proveedor de valoración de redes"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para usar esta función, selecciona un proveedor de valoración de redes compatible"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Para mejorar la precisión de la ubicación, los servicios y las aplicaciones del sistema pueden buscar redes Wi-Fi aunque esté desactivada la conexión Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para mejorar la precisión de la ubicación, activa la búsqueda de redes Wi-Fi en los <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ajustes de la búsqueda<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -870,7 +910,7 @@
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferencia de itinerancia"</string>
   <string-array name="wifi_calling_mode_choices">
     <item msgid="2124257075906188844">"Preferir Wi-Fi"</item>
-    <item msgid="1335127656328817518">"Preferida para móviles"</item>
+    <item msgid="1335127656328817518">"Preferir datos móviles"</item>
     <item msgid="3132912693346866895">"Solo conexión Wi-Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
@@ -885,7 +925,7 @@
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
     <item msgid="5782108782860004851">"Preferir Wi-Fi"</item>
-    <item msgid="5074515506087318555">"Preferida para móviles"</item>
+    <item msgid="5074515506087318555">"Preferir datos móviles"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
     <item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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">"Programación"</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">"Programación"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ninguna"</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">"Desactivado/<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>
@@ -1020,8 +1061,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="7337555569694794132">"Siempre activada/Aumenta el uso de la batería"</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="6978257596231155345">"Muestra la hora, iconos de notificación y otra información. Aumenta el uso de la batería."</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>
@@ -1083,8 +1130,8 @@
     <string name="storage_settings" msgid="4211799979832404953">"Almacenamiento"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"Almacenamiento"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Ajustes de almacenamiento"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desactivar almacenamiento USB, ver almacenamiento disponible"</string>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desactivar tarjeta SD, ver almacenamiento disponible."</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Desconectar almacenamiento USB, ver almacenamiento disponible"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Desconectar tarjeta SD, ver almacenamiento disponible."</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -1119,10 +1166,10 @@
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (música, tonos, etc.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"Otros archivos"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Datos almacenados en caché"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desactivar almacenam comp"</string>
-    <string name="sd_eject" product="default" msgid="6915293408836853020">"Desactivar tarjeta SD"</string>
-    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desactivar almacenamiento USB interno"</string>
-    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desactivar la tarjeta SD para extraerla de forma segura"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Desconectar almacenamiento compartido"</string>
+    <string name="sd_eject" product="default" msgid="6915293408836853020">"Desconectar tarjeta SD"</string>
+    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Desconectar almacenamiento USB interno"</string>
+    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"Desconectar la tarjeta SD para extraerla de forma segura"</string>
     <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Inserta USB para activar almacenamiento"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Insertar una tarjeta SD para el montaje"</string>
     <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"Activar almacenamiento USB"</string>
@@ -1136,18 +1183,18 @@
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"¿Borrar datos almacenados en caché?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"Se borrarán los datos en caché de las aplicaciones."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"La función MTP o PTP está activa."</string>
-    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"¿Desactivar almacenamiento USB?"</string>
-    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"¿Desactivar tarjeta SD?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Si desactivas el almacenamiento USB, se detendrán algunas aplicaciones que estás usando y no estarán disponibles hasta que vuelvas a activarlo."</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Si desactivas la tarjeta SD, se detendrán algunas aplicaciones en ejecución y no estarán disponibles hasta que la vuelvas a activar."</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"¿Desconectar almacenamiento USB?"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"¿Desconectar tarjeta SD?"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"Si desconectas el almacenamiento USB, se detendrán algunas aplicaciones que estás usando y no estarán disponibles hasta que vuelvas a activarlo."</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Si desconectas la tarjeta SD, se detendrán algunas aplicaciones en ejecución y no estarán disponibles hasta que la vuelvas a activar."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"No se ha podido desactivar el almacenamiento USB. Inténtalo de nuevo más tarde."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"No se ha podido desactivar la tarjeta SD. Inténtalo de nuevo más tarde."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"No se ha podido desconectar el almacenamiento USB. Inténtalo de nuevo más tarde."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"No se ha podido desconectar la tarjeta SD. Inténtalo de nuevo más tarde."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Se desactivará el almacenamiento USB."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Se desactivará la tarjeta SD."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desactivando"</string>
-    <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desactivando."</string>
+    <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desconectando."</string>
     <string name="storage_low_title" msgid="1388569749716225155">"No queda espacio de almacenamiento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Es posible que algunas funciones del sistema, como la sincronización, no funcionen correctamente. Prueba a eliminar o a desactivar elementos para liberar espacio (por ejemplo, aplicaciones o contenido multimedia)."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"Cambiar nombre"</string>
@@ -1273,6 +1320,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>
@@ -1287,8 +1335,8 @@
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Se han restablecido los ajustes de red"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Restablecer datos de fábrica"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="other">Se recuperarán los ajustes de <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> cuentas</item>
-      <item quantity="one">Se recuperarán los ajustes de 1 cuenta</item>
+      <item quantity="other">Se borrarán los ajustes de <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> cuentas</item>
+      <item quantity="one">Se borrarán los ajustes de 1 cuenta</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"Se restaurarán todos los datos y el almacenamiento interno"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Has iniciado sesión en las cuentas que se indican a continuación:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores de la eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tu plan de servicios móviles no se cancelará."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamiento USB"</string>
     <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>
@@ -1324,26 +1377,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 conexión 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 conexión 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 conexión 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">"Compartir 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 la zona Wi-Fi y la conexión compartida para ofrecer tu conexión a Internet a otros dispositivos a través de datos móviles."</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Utiliza la zona Wi-Fi y la conexión compartida para ofrecer tu conexión a Internet a otros dispositivos a través de datos móviles. Las aplicaciones también pueden crear una zona Wi-Fi 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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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 la huella, añade una 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 huellas, añade un 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 la huella, añade un 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 PIN"</string>
@@ -1489,8 +1534,11 @@
     <string name="applications_settings" msgid="5281808652705396152">"Información de las aplicaciones"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrar aplicaciones y configurar accesos directos de inicio rápido"</string>
     <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" 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">"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>
@@ -1537,7 +1585,7 @@
     <string name="show_running_services" msgid="5736278767975544570">"Servicios en uso"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procesos en caché"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación Emergencia"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer ajustes de aplicaciones"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Recuperar ajustes de aplicaciones"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer preferencias de las aplicaciones?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Se restablecerán todas las preferencias de:\n\n "<li>"Aplicaciones inhabilitadas"</li>\n" "<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n" "<li>"Aplicaciones predeterminadas"</li>\n" "<li>"Restricciones de datos móviles de aplicaciones"</li>\n" "<li>"Restricciones de permisos"</li>\n\n"No se perderán los datos de las aplicaciones."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
@@ -1659,6 +1707,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>
@@ -1684,9 +1736,9 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Ayuda del teclado"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Teclado físico"</string>
     <string name="show_ime" msgid="2658582193437188227">"Mostrar teclado virtual"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"Debe seguir en pantalla mientras el teclado físico esté activo"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Sigue en pantalla mientras el teclado físico está activo"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ayuda de accesos directos de teclado"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar accesos directos de teclado disponibles"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Muestra accesos directos de teclado disponibles"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predeterminado"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Mandos de videojuegos"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controles de interacción"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ajustes de visión"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Personaliza este dispositivo para adaptarlo a tus necesidades. Puedes modificar las funciones de accesibilidad posteriormente en Ajustes."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar el tamaño de la fuente"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio y texto en pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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 mantiene 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 la aplicación?"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"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, detén 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="2369957934555162428">"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, detén 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="6195430620406365292">"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, detén 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_wakeup_alarm" product="default" msgid="1638726742782558262">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, detén <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persiste, desinstala la aplicación para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, detén <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi el problema persiste, desinstala la aplicación para mejorar el rendimiento de la batería."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Tu dispositivo no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, detén <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"¿Desactivar el uso en segundo plano y detener la aplicación?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Tu teléfono no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, puedes detener <xliff:g id="APP_1">%1$s</xliff:g> y evitar que se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tu tablet no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, puedes detener <xliff:g id="APP_1">%1$s</xliff:g> y evitar que se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Tu dispositivo no puede administrar el uso de la batería con normalidad porque <xliff:g id="APP_0">%1$s</xliff:g> lo mantiene activo.\n\nPara solucionarlo, puedes detener <xliff:g id="APP_1">%1$s</xliff:g> y evitar que se ejecute en segundo plano."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desactivar"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"¿Desactivar la ubicación?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"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 solucionarlo, puedes desactivar la ubicación de esta aplicación."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"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 solucionarlo, puedes desactivar la ubicación de esta aplicación."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"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 solucionarlo, 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última carga completa"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"El tiempo de batería restante es aproximado y puede variar en función del uso"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Los datos de uso de la batería son aproximados y pueden variar en función del uso"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"En uso activo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"En segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso de batería"</string>
@@ -2361,7 +2442,7 @@
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Las redes sin tarifa plana se tratan como redes móviles cuando se restringe el uso de datos en segundo plano. Las aplicaciones pueden mostrar una advertencia antes de usar estas redes para descargar archivos grandes."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi sin tarifa plana"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes de uso medido, activa el Wi‑Fi."</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes sin tarifa plana, activa el Wi‑Fi."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"El uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver a llamada"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Puedes crear más usuarios para compartir este dispositivo con otras personas. Cada usuario tiene su propio espacio, que puede personalizar con aplicaciones, fondos de pantalla, etc., y puede modificar opciones de configuración del dispositivo que afectan a todos los usuarios, como la conexión Wi‑Fi.\n\nCuando se añade un usuario, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Al añadir un usuario nuevo, este debe configurar su espacio.\n\nCualquier usuario puede actualizar las aplicaciones del resto de usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar usuario ahora?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asegúrate de que la persona pueda acceder al dispositivo y configurar su espacio"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asegúrate de que la persona pueda acceder al dispositivo y configurar su espacio."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"¿Quieres configurar un perfil ahora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar ahora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ahora no"</string>
@@ -2564,7 +2645,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 extremas"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"deslizar para desbloquear, contraseña, patrón, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"reto de trabajo, perfil, trabajo"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabajo, perfil administrado, unificar, unificación, trabajo, perfil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestos"</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_assist_gesture_launch" msgid="813968759791342591">"gesto"</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>
@@ -2787,11 +2872,12 @@
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"¿Cómo quieres que se muestren las notificaciones cuando el dispositivo esté bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificaciones"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Mostrar todo (notificaciones de trabajo)"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Ocultar confidencial (notificaciones de trabajo)"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Ocultar sensible (notificaciones de trabajo)"</string>
     <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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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 pantalla en pantalla"</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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo de contactos destacados"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ninguno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Las alarmas son prioritarias y emiten sonido"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todas las llamadas"</string>
@@ -2965,19 +3054,14 @@
     <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>
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Para proteger aún más tu dispositivo, haz 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" 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_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. ¿Quieres que se te pida el patrón 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>
@@ -3095,6 +3179,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 aplicaciones"</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>
@@ -3187,8 +3280,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 permitido"</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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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 no restringidos"</string>
+    <string name="unrestricted_data_saver" msgid="952796077540228711">"Datos no restringidos"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Las datos en segundo plano están desactivadas"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activado"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desactivado"</string>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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">"Acceso rápido a la 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 comprobarlo"</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_pickup_title" product="default" msgid="818688002837687268">"Levantar el teléfono para comprobarlo"</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 consultarlo"</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">"Coger 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Activado"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Desactivado"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El gestor de arranque ya está desbloqueado"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronizar datos del trabajo automáticamente"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Permitir que las aplicaciones actualicen los datos automáticamente"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronización de la cuenta"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Elementos con la sincronización activada: <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sincronización activada para todos los elementos"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sincronización desactivada para todos los elementos"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Información sobre el dispositivo administrado"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Cambios y ajustes administrados por tu organización"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Cambios y ajustes administrados por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activado"</string>
     <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="storage_movies_tv" msgid="5498394447562086890">"Apps de cine y TV"</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="698847081680980774">"¿Cuáles son las fascinantes novedades?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Consulta las 5 funciones principales"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Estado del registro de IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"No registrado"</string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index d8534ad4048fb1fbf24f66c2d97fede6b4cd618e..9256c39e74fe48cc072fbf9870e81ed99e31c9fe 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>
@@ -250,7 +240,7 @@
     <item msgid="4979188868761515915">"üldine asukoht"</item>
     <item msgid="5789673140227507995">"täpne asukoht"</item>
     <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"vibratsioon"</item>
+    <item msgid="5387405117297558954">"vibreerimine"</item>
     <item msgid="3434165993711230924">"kontaktide lugemine"</item>
     <item msgid="616161687718081936">"kontaktide muutmine"</item>
     <item msgid="7638002295329050091">"kõnelogi lugemine"</item>
@@ -317,7 +307,7 @@
     <item msgid="6602854600289714121">"Asukoht"</item>
     <item msgid="8677040780775113033">"Asukoht"</item>
     <item msgid="1660743989948992916">"Asukoht"</item>
-    <item msgid="8791172739860195290">"Vibratsioon"</item>
+    <item msgid="8791172739860195290">"Vibreerimine"</item>
     <item msgid="383413555642128046">"Kontaktide lugemine"</item>
     <item msgid="3654594895269697313">"Kontaktide muutmine"</item>
     <item msgid="7928393476362362538">"Kõnelogi lugemine"</item>
@@ -351,7 +341,7 @@
     <item msgid="5660213838861789350">"Hääle helitugevus"</item>
     <item msgid="7983336752371254444">"Helina helitugevus"</item>
     <item msgid="7878027809189330917">"Meedia helitugevus"</item>
-    <item msgid="7260546305036218513">"Alarmi helitugevus"</item>
+    <item msgid="7260546305036218513">"Äratuse helitugevus"</item>
     <item msgid="9103719301075748925">"Märguande helitugevus"</item>
     <item msgid="7025966722295861512">"Bluetoothi helitugevus"</item>
     <item msgid="4665183401128289653">"Hoia ärkvel"</item>
@@ -486,6 +476,6 @@
   <string-array name="automatic_storage_management_days">
     <item msgid="687318592238852312">"Üle 30 päeva vana"</item>
     <item msgid="2900554746706302178">"Üle 60 päeva vana"</item>
-    <item msgid="5692284879054004388">"Üle 90 päeva vana"</item>
+    <item msgid="5692284879054004388">"Üle 90 päeva vanad"</item>
   </string-array>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 36837061f76eeee2a26d986d1e39e668b12d4424..780e9069335477189bfbf51622cb5f9eaeb824b8 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) -->
@@ -322,14 +334,14 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administraatori keelatud"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Puudub"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Nt Joe\' Android."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Nt Martini Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Kasutajateave"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Kuva lukustusekraanil profiili teave"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiili teave"</string>
     <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,41 +366,40 @@
     <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_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_start_title" msgid="2068961812439460133">"Puudutage andurit"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Asetage oma sõrm andurile ja kui tunnete värinat, siis tõstke see üles"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Tõstke, seejärel 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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Teen seda hiljem"</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_error_dialog_title" msgid="3618021988442639280">"Registreerumist ei lõpetatud"</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">"Registreerimist 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>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Lisa veel üks"</string>
@@ -449,6 +460,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 +532,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="1688030823464420974">"Kui sisestate järgmisel katsel vale mustri, kustutatakse selle seadme andmed"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Kui sisestate järgmisel katsel vale PIN-koodi, kustutatakse selle seadme andmed"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Lülita WiFi automaatselt sisse"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"WiFi lülitub uuesti sisse kvaliteetsete salvestatud võrkude, näiteks teie koduse võrgu läheduses"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Pole saadaval, kuna WiFi skannimine on välja lülitatud"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Funktsiooni kasutamiseks valige võrgukvaliteedi hinnangute pakkuja"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Väldi halbu ühendusi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ära kasuta WiFi-võrku, kui selle Interneti-ühendus on halb"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Kasuta ainult võrke, millel on hea Interneti-ühendus"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Loo ühendus avatud võrkudega"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Loo automaatselt ühendus kvaliteetsete avalike võrkudega"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Funktsiooni kasutamiseks valige võrgukvaliteedi hinnangute pakkuja"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Funktsiooni kasutamiseks valige sobiv võrgukvaliteedi hinnangute pakkuja"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikaatide installimine"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Asukoha täpsuse parandamiseks saavad süsteemirakendused ja -teenused endiselt skannida WiFi-võrke. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Asukoha täpsuse parandamiseks lülitage <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>skannimisseadetes<xliff:g id="LINK_END_1">LINK_END</xliff:g> sisse WiFi-võrkude skannimine."</string>
@@ -717,7 +749,7 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"WiFi-võrgud"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-nupp"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Rohkem valikuid"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-i PIN-koodi kirje"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-i PIN-koodi sisestus"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"WiFi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skannimine"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Täpsemalt"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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,17 +878,25 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Kas soovite tühistada kutse kasutajaga <xliff:g id="PEER_NAME">%1$s</xliff:g> ühenduse loomiseks?"</string>
     <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_tether_starting" msgid="1322237938998639724">"Leviala sisselülitamine ..."</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Leviala väljalülitamine ..."</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WiFi-kuumkoht"</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 kuumkoha kaudu"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Telefoni Interneti-ühendust jagatakse kuumkoha 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 kuumkohta. Kuumkoht 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 luua kuumkoha, et jagada läheduses olevate seadmetega sisu."</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Kuumkoha sisselülitamine ..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Kuumkoha väljalülitamine ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivne"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Kaasaskantava WiFi-tugijaama viga"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Mobiilse WiFi-kuumkoha viga"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"WiFi-kuumkoha seadistamine"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"WiFi-leviala seadistamine"</string>
-    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK leviala"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"WiFi-kuumkoha seadistamine"</string>
+    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK-kuumkoht"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> leviala"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"WiFi-kõned"</string>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Alati sees / suurem akukasutus"</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="6978257596231155345">"Näitamise aeg, märguandeikoonid ja muu teave. Suurem akukasutus."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Seadmes on teisi kasutajaid.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muusika"</li>\n<li>"Fotod"</li>\n<li>"Muud kasutajaandmed"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-kaardi operaatorid"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"See ei tühista teie mobiilsideteenuse paketti."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Muusika, piltide ja muu kasutajateabe kustutamiseks tuleb tühjendada ka "<b>"USB-mäluseade"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"SD-kaart"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Kustuta USB-mäluseade"</string>
     <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>
@@ -1314,36 +1367,25 @@
     <string name="call_settings_title" msgid="5188713413939232801">"Kõneseaded"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Seadista kõnepost, kõne edastamine, ootel kõne, helistaja ID"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB jagamine"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Kantav tööpunkt"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobiilne kuumkoht"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Jagamine Bluetoothiga"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Jagamine"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"Kuumkoht ja jagamine"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Leviala on sees, jagamine"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Leviala on sees"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Kuumkoht on sees, jagamine"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Kuumkoht on sees"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Jagamine"</string>
     <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 kuumkohta ja jagamist. Rakendused saavad samuti luua kuumkoha, et jagada läheduses olevate seadmetega sisu."</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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1537,8 +1585,8 @@
     <string name="show_running_services" msgid="5736278767975544570">"Kuva töötavad teenused"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Kuva vahemällu salvestatud protsessid"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Hädaabirakendus"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Läht. rakend. eelistused"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Läht. rakend. eelistused?"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Lähtesta rakenduste eelistused"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Lähtestada rakenduste eelistused?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"See lähtestab kõik järgmised eelistused:\n\n "<li>"Keelatud rakendused"</li>\n" "<li>"Keelatud rakenduse märguanded"</li>\n" "<li>"Toimingute vaikerakendused"</li>\n" "<li>"Rakenduste taustaandmete piirangud"</li>\n" "<li>"Igasugused lubade piirangud"</li>\n\n" Rakenduse andmed säilivad."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Lähtesta rakendused"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Halda ruumi"</string>
@@ -1659,6 +1707,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>
@@ -1673,7 +1725,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Füüsilise klaviatuuri seaded"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Vajutage kaks korda tühikuklahvi, et sisestada „.”"</string>
     <string name="show_password" msgid="4837897357002495384">"Kuva paroolid"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"Sisestamisel kuvatakse korraks tähemärgid"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"Sisestamisel kuvatakse hetkeks tähemärgid"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"See õigekirjakontrollija võib koguda kogu sisestatava teksti, sh isiklikud andmed (nt paroolid ja krediitkaardinumbrid). See pärineb rakendusest <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Kas soovite seda õigekirjakontrolli kasutada?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Seaded"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Keel"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekraanilugejad, ekraan, interaktsiooni juhtnupud"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nähtavuse seaded"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Seadet saab kohandada vastavalt oma vajadustele. Neid juurdepääsetavuse funktsioone saab hiljem muuta menüüs Seaded."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Suurendage fondi suurust"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekraanilugejad"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Heli ja ekraanil kuvatud tekst"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekraan"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Teie telefon ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP">%1$s</xliff:g> hoiab seadet ärkvel.\n\nProbleemi lahendamiseks võite proovida rakenduse peatada.\n\nKui probleem ei lahene, tuleb teil aku tööea pikendamiseks võib-olla rakendus desinstallida."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Teie tahvelarvuti ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP">%1$s</xliff:g> hoiab seadet ärkvel.\n\nProbleemi lahendamiseks võite proovida rakenduse peatada.\n\nKui probleem ei lahene, tuleb teil aku tööea pikendamiseks võib-olla rakendus desinstallida."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Teie seade ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP">%1$s</xliff:g> hoiab seadet ärkvel.\n\nProbleemi lahendamiseks võite proovida rakenduse peatada.\n\nKui probleem ei lahene, tuleb teil aku tööea pikendamiseks võib-olla rakendus desinstallida."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Teie telefon ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP_0">%1$s</xliff:g> äratab telefoni sageli.\n\nProbleemi lahendamiseks võite proovida rakenduse <xliff:g id="APP_1">%1$s</xliff:g> peatada.\n\nKui probleem ei lahene, tuleb teil aku tööea pikendamiseks võib-olla rakendus desinstallida."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Teie tahvelarvuti ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP_0">%1$s</xliff:g> äratab tahvelarvutit sageli.\n\nProbleemi lahendamiseks võite proovida rakenduse <xliff:g id="APP_1">%1$s</xliff:g> peatada.\n\nKui probleem ei lahene, tuleb teil aku tööea pikendamiseks võib-olla rakendus desinstallida."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Teie seade ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP_0">%1$s</xliff:g> äratab seadet sageli.\n\nProbleemi lahendamiseks võite proovida rakenduse <xliff:g id="APP_1">%1$s</xliff:g> peatada.\n\nKui probleem ei lahene, tuleb teil aku tööea pikendamiseks võib-olla rakendus desinstallida."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Peata rakendus"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Kas peatada rakendus ja lülitada taustal kasutamine välja?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Teie telefon ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP_0">%1$s</xliff:g> äratab telefoni sageli.\n\nProbleemi lahendamiseks võite rakenduse <xliff:g id="APP_1">%1$s</xliff:g> peatada ja takistada seda taustal töötamast."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Teie tahvelarvuti ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP_0">%1$s</xliff:g> äratab tahvelarvutit sageli.\n\nProbleemi lahendamiseks võite rakenduse <xliff:g id="APP_1">%1$s</xliff:g> peatada ja takistada seda taustal töötamast."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Teie seade ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP_0">%1$s</xliff:g> äratab seadet sageli.\n\nProbleemi lahendamiseks võite rakenduse <xliff:g id="APP_1">%1$s</xliff:g> peatada ja takistada seda taustal töötamast."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Lülita välja"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Kas soovite asukohateabe edastamise välja lülitada?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"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 asukohateabe edastamise selle rakenduse jaoks välja lülitada."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"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 asukohateabe edastamise selle rakenduse jaoks välja lülitada."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"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 asukohateabe edastamise 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Üksikasjalik teave alates viimasest täislaadimisest"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Viimane täislaadimine"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Aku järelejäänud tööaeg on ligikaudne ja võib olenevalt kasutusest muutuda."</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Aku kasutuse andmed on ligikaudsed ja võivad olenevalt kasutusest muutuda"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktiivse kasutamise ajal"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Taustal"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Akukasutus"</string>
@@ -2497,10 +2578,10 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Kas lisada uus kasutaja?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Võite jagada seadet teiste inimestega, luues uusi kasutajaid. Igal kasutajal on oma ruum, mida saab kohandada rakenduste, taustapildi ja muuga. Kasutajad saavad kohandada ka seadme seadeid, näiteks WiFi-valikuid, mis mõjutavad kõiki kasutajaid.\n\nKui lisate uue kasutaja, siis peab ta seadistama oma ruumi.\n\nIga kasutaja saab värskendada rakendusi kõigi kasutajate jaoks."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kui lisate uue kasutaja, siis peab ta seadistama oma ruumi.\n\nIga kasutaja saab värskendada rakendusi kõigi kasutajate jaoks."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kas seadistada nüüd kasutaja?"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kas seadistada kasutaja kohe?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Veenduge, et isik saaks seadet kasutada ja oma ruumi seadistada"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Kas soovite kohe profiili seadistada?"</string>
-    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Seadista nüüd"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Seadista kohe"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Mitte praegu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Ainult tahvelarvuti omanik saab hallata kasutajaid."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Ainult telefoni omanik saab hallata kasutajaid."</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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">"kuumkoht"</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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"libista avamiseks, parool, muster, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"töö väljakutse, töö, profiil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"tööprofiil, hallatud profiil, ühenda, ühendamine, töö, profiil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"liigutus"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"liigutused"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"maksa, puuduta, maksed"</string>
     <string name="keywords_backup" msgid="470070289135403022">"varukoopia, varundamine"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"liigutus"</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>
@@ -2791,7 +2876,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">"Rakenduste 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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Ainult tärniga tähistatud kontaktidelt"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Mitte kelleltki"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Äratused"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Äratused on alati prioriteetsed ja esitavad heli"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Meeldetuletused"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sündmused"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Kõik helistajad"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3119,13 +3212,13 @@
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Selle seadme laadimine"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Toite andmine"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Laadige ühendatud seadet. Töötab ainult seadmetes, mis toetavad USB kaudu laadimist."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Failide teisaldamine"</string>
-    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Failide teisaldamine teise seadmesse"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Failide edastamine"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Failide edastamine teise seadmesse"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Fotode edastamine (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Fotode või failide edastamine, kui MTP-d ei toetata (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Seadme kasutamine MIDI-na"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Kasutage seda seadet MIDI-na"</string>
-    <string name="usb_use" msgid="3256040963685055320">"Kasutage USB-d järgmiseks."</string>
+    <string name="usb_use" msgid="3256040963685055320">"USB kasutusviisid"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Seadme laadimine"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Toiteallikas"</string>
@@ -3187,8 +3280,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>
@@ -3261,8 +3354,8 @@
     <string name="condition_turn_on" msgid="9089876276117874591">"Lülita sisse"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"Kuva"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"Peida"</string>
-    <string name="condition_hotspot_title" msgid="7778958849468560027">"Leviala on sees"</string>
-    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Teisaldatav WiFi-leviala <xliff:g id="ID_1">%1$s</xliff:g> on aktiivne, WiFi on selles seadmes välja lülitatud."</string>
+    <string name="condition_hotspot_title" msgid="7778958849468560027">"Kuumkoht on sees"</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Teisaldatav WiFi-kuumkoht <xliff:g id="ID_1">%1$s</xliff:g> on aktiivne, WiFi on selles seadmes välja lülitatud."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Lennurežiim on sees"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"WiFi, Bluetooth ja mobiilne andmeside on välja lülitatud. Te ei saa helistada ega Internetiga ühendust luua."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Režiim Mitte segada on sees (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
@@ -3278,6 +3371,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>
@@ -3286,7 +3388,7 @@
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automaatsed süsteemivärskendused"</string>
     <string name="usage" msgid="2977875522080448986">"Kasutus"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiilse andmeside kasutus"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"WiFi andmekasutus"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"WiFi-andmekasutus"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Etherneti andmekasutus"</string>
     <string name="wifi" msgid="1081550856200013637">"WiFi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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 andmeside"</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>
@@ -3381,8 +3482,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>
@@ -3452,26 +3552,33 @@
     <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_summary" msgid="242037150983277829">"Kaamera kiireks avamiseks vajutage toitenuppu kaks korda. See töötab igast kuvast."</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Sees"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Väljas"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Buudilaadur on juba avatud"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sünkrooni tööandmed automaatselt"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Luba rakendustel andmeid automaatselt värskendada"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Konto sünkroonimine"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sünkroonimine on sisse lülitatud <xliff:g id="ID_1">%1$d</xliff:g> üksuse jaoks <xliff:g id="ID_2">%2$d</xliff:g>-st"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sünkroonimine on kõigi üksuste jaoks sisse lülitatud"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sünkroonimine on kõigi üksuste jaoks välja lülitatud"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Hallatava seadme teave"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Teie organisatsiooni hallatavad muudatused ja seaded"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Organisatsiooni <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> hallatavad muudatused ja seaded"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Mis on uut ja põnevat?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Vaadake viit populaarseimat funktsiooni"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-i registreerimise olek"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registreeritud"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ei ole registreeritud"</string>
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 25c162d4a349ac238a5b35c2f6cdcdc54432574a..8cf4ae864574683ffbe45c67431597ff6398ea07 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 840384b452cca9dccfe6bf6c5d22a72e8a1dbe70..a3e4b6cf29f0fdcc4bf459a5edccbba32378619f 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 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 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 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,7 @@
     <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>
+    <string name="security_settings_title" msgid="4918904614964215087">"Segurtasuna eta kokapena"</string>
     <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 +366,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Egin geroago"</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="1688030823464420974">"Hurrengo saiakeran eredua oker marrazten baduzu, gailu honetako datuak ezabatu egingo dira"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Hurrengo saiakeran PIN kodea oker idazten baduzu, gailu honetako datuak ezabatu egingo dira"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Hurrengo saiakeran pasahitza oker idazten baduzu, gailu honetako datuak 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="5047439819181833824">"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>
@@ -613,7 +634,7 @@
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Agenda partekatu nahi dituzu?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuak zure kontaktuak eta dei-historia atzitu nahi ditu."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuak Bluetooth bidez parekatu nahi du. Konektatuta dagoenean, zure kontaktuak eta deien historia atzitu ahal izango ditu."</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Bikotetutako gailuak"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Parekatutako gailuak"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Gailu erabilgarriak"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Ez dago gailurik erabilgarri"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Konektatu"</string>
@@ -624,8 +645,16 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Aukerak…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Ezarpen aurreratuak"</string>
     <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="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth aktibatuta 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. 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>
@@ -673,7 +702,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desaktibatuta"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ez dago erabilgarri NFC desaktibatuta dagoelako"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC erabiltzen duten beste gailu batzuekin, gailuak bata besteari hurbilduta. Besteak beste, web-orriak, YouTube bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC gaitasuna duten beste gailu batzuekin, gailuak bata bestearengana hurbilduta. Besteak beste, web-orriak, YouTube bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu zure pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Aktibatu Wi-Fia"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktibatu Wi-Fi konexioa automatikoki"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Gordetako kalitate handiko sare batetik (adibidez, etxeko saretik) gertu zaudenean aktibatuko da berriro Wi‑Fi konexioa"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ez dago erabilgarri, Wi-Fi sareak bilatzeko aukera desaktibatuta dagoelako"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Erabiltzeko, hautatu sareen balorazioen hornitzaile bat"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Saihestu konexio ahulak"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ez erabili Wi-Fi sareak ez badute Interneteko konexio onik"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Erabili Interneteko konexio ona duten sareak soilik"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Konektatu sare irekietara"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Konektatu automatikoki kalitate handiko sare publikoetara"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Erabiltzeko, hautatu sareen balorazioen hornitzaile bat"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Erabiltzeko, hautatu sareen balorazioen hornitzaile bateragarri bat"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalatu ziurtagiriak"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Kokapenaren zehaztasuna hobetzeko, sistemaren aplikazioek eta zerbitzuek Wi-Fi sareak 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Kokapenaren zehaztasuna hobetzeko, aktibatu Wi-Fi sareak bilatzeko aukera <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>bilatzeko ezarpenetan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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">"Programatu"</string>
+    <string name="night_display_auto_mode_never" msgid="2483761922928753400">"Bat ere 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>
@@ -1020,8 +1061,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="7337555569694794132">"Beti aktibatuta. Bateria gehiago kontsumitzen du."</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="6978257596231155345">"Erakutsi ordua, jakinarazpenen ikonoak eta bestelako informazioa. Bateria gehiago kontsumitzen du."</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>
@@ -1273,12 +1320,13 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Berrezarri"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Berrezarri dira sareko ezarpenak"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Hori eginez gero, berrezarri egingo zaizkie ezarpenak mota guztietako sareei, besteak beste: \n\n"<li>"Wi‑Fi"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Hori eginez gero, sare guztien ezarpenak berrezarri egingo dira, besteak beste: \n\n"<li>"Wi‑Fi"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Berrezarri ezarpenak"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Sareko ezarpen guztiak berrezarri nahi dituzu? Ekintza hori ezin da desegin."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Berrezarri ezarpenak"</string>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM txartela onartzen duten operadoreak"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Horrek ez du utziko bertan behera operadorearekin kontratatuta duzun zerbitzu-plana."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB memoria"</b>" ezabatu behar da."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txartela"</b>" ezabatu behar da."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ezabatu USB memoria"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Pantaila-irakurgailuak, pantaila, interakzioak kontrolatzeko aukerak"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Ikusmen-ezarpenak"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Zure beharretara doi dezakezu gailua. Erabilerraztasun-eginbideak edonoiz alda ditzakezu Ezarpenak atalean."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Handitu letra-tamaina"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Pantaila-irakurgailuak"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audioa eta pantailako testua"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantaila"</string>
@@ -1784,7 +1837,7 @@
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Kontraste handiko testua"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Eguneratu auto. pantaila-handiagotzea"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Eguneratu handiagotzea aplik. batetik bestera pasatzean."</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Amaitu deiak pizteko botoiarekin"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Amaitu deiak pizteko etengailuarekin"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Saguaren erakusle handia"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio monofonikoa"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Konbinatu kanalak audioa erreproduzitzean"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g>\n\n\n\n"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tabletak ezin du kudeatu bateria modu normalean <xliff:g id="APP">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi aplikazioa.\nArazoa horrela ere konpontzen ez bada\n, agian aplikazioa desinstalatu beharko duzu bateriak gehiago iraun dezan."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Gailuak ezin du kudeatu bateria modu normalean <xliff:g id="APP">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi aplikazioa.\nHorrela\n ere arazoa konpontzen ez bada, agian aplikazioa desinstalatu beharko duzu bateriak gehiago iraun dezan."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g>\n\n <xliff:g id="APP_1">%1$s</xliff:g>.\n\n"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g>\n\n <xliff:g id="APP_1">%1$s</xliff:g>.\n\n"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g>\n\n <xliff:g id="APP_1">%1$s</xliff:g>.\n\n"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Gelditu aplikazioa"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Atzeko planoko erabilera desaktibatu eta aplikazioa gelditu?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefonoak ezin du kudeatu bateria modu normalean <xliff:g id="APP_0">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi <xliff:g id="APP_1">%1$s</xliff:g> aplikazioa atzeko planoan exekuta ez dadin."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tabletak ezin du kudeatu bateria modu normalean <xliff:g id="APP_0">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi <xliff:g id="APP_1">%1$s</xliff:g> aplikazioa atzeko planoan exekuta ez dadin."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Gailuak ezin du kudeatu bateria modu normalean <xliff:g id="APP_0">%1$s</xliff:g> aplikazioak esnarazi egiten duelako etengabe.\n\nArazoa konpontzeko, geldiarazi <xliff:g id="APP_1">%1$s</xliff:g> aplikazioa atzeko planoan exekuta ez dadin."</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="7774807745601479888">"Telefonoak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioa kokapena eskatzen ari delako etengabe, baita aplikazio hori erabiltzen ari ez zarenean ere.\n\nArazoa konpontzeko, desaktibatu aplikazio horrek kokapena erabiltzeko aukera."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Tabletak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioa kokapena eskatzen ari delako etengabe, baita aplikazio hori erabiltzen ari ez zarenean ere.\n\nArazoa konpontzeko, desaktibatu aplikazio horrek kokapena erabiltzeko aukera."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Gailuak ezin du kudeatu bateria modu normalean, <xliff:g id="APP">%1$s</xliff:g> aplikazioa kokapena eskatzen ari delako etengabe, baita aplikazio hori erabiltzen ari ez zarenean ere.\n\nArazoa konpontzeko, desaktibatu aplikazio horrek kokapena erabiltzeko aukera."</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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Guztiz kargatu zenetik emandako erabileraren datuak"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Azkenekoz guztiz kargatu zenetik"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Gelditzen den bateriari buruzko informazioa gutxi gorabeherakoa da eta aldatu egin liteke erabileraren arabera"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Bateriaren erabilera-datuak gutxi gorabeherakoak dira eta aldatu egin litezke erabileraren arabera"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktiboki erabili bitartean"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Atzeko planoan dagoen bitartean"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Bateriaren erabilera"</string>
@@ -2077,9 +2158,9 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ahots-sarreraren eta -irteeraren ezarpenak"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ahozko bilaketa"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android teklatua"</string>
-    <string name="voice_input_settings" msgid="1099937800539324567">"Ahots bidezko idazketaren ezarpenak"</string>
-    <string name="voice_input_settings_title" msgid="2676028028084981891">"Ahots bidezko idazketa"</string>
-    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Ahots bidezko idazketa-zerbitzuak"</string>
+    <string name="voice_input_settings" msgid="1099937800539324567">"Ahozko idazketaren ezarpenak"</string>
+    <string name="voice_input_settings_title" msgid="2676028028084981891">"Ahozko idazketa"</string>
+    <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Ahozko idazketa-zerbitzuak"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Ahozko pasahitzak eta erabateko interakzioa"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Ahoz idazteko eginbide arrunta"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Aginduak ahoz emateko zerbitzu honek uneoro kontrolatuko du ahotsa eta ahozko gaitasuna duten aplikazioak ere kontrolatu ahal izango ditu. <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> aplikazioarena da. Zerbitzu hau erabiltzeko aukera gaitu nahi duzu?"</string>
@@ -2169,7 +2250,7 @@
     <string name="select_device_admin_msg" msgid="7347389359013278077">"Gailua administratzeko aplikazioak"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Ez dago gailua administratzeko aplikaziorik"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Pertsonala"</string>
-    <string name="managed_device_admin_title" msgid="7853955652864478435">"Lantokia"</string>
+    <string name="managed_device_admin_title" msgid="7853955652864478435">"Lanekoak"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Ez dago agente fidagarririk erabilgarri"</string>
     <string name="add_device_admin_msg" msgid="1501847129819382149">"Gailua administratzeko aplikazioa aktibatu?"</string>
     <string name="add_device_admin" msgid="4192055385312215731">"Aktibatu gailua administratzeko aplikazioa"</string>
@@ -2315,10 +2396,10 @@
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Ezarri Wi-Fi datuen muga"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
-    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Datu mugikorrak"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Datu-konexioa"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
-    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mugikorra"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Datu-konexioa"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Bat ere ez"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Datu mugikorrak"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G datuak"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"lerratu desblokeatzeko, pasahitza, eredua, PIN, kodea"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"laneko erronka, lana, profila"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"laneko profila, kudeatutako profila, bateratu, bateratzea, lana, profila"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"keinua"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"keinuak"</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_assist_gesture_launch" msgid="813968759791342591">"keinua"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantaila txiki gainjarria"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Baimendu pantaila txiki gainjarria erabiltzea"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Baimendu aplikazio honek pantaila txiki gainjarri 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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kontaktu izardunenak soilik"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Bat ere ez"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmak"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmek soinua egiten dute lehentasuna dutelako"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Abisuak"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Gertaerak"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Deitzaile guztiak"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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">"Kontsumo handia"</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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3290,14 +3392,13 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet datuen erabilera"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi konexioa"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> datu-konexioaren bidez"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"Datu mugikorren <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi konexioaren bidez"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ethernet-konexioaren bidez"</string>
     <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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Aktibatuta"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Desaktibatuta"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Abiarazlea desblokeatuta dago dagoeneko"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sinkronizatu laneko datuak automatikoki"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Utzi aplikazioei datuak automatikoki freskatzen"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Kontuaren sinkronizazioa"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> elementuk aktibatuta dute sinkronizazioa"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Elementu guztiek aktibatuta dute sinkronizazioa"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Elementu guztiek desaktibatuta dute sinkronizazioa"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Gailu kudeatuaren informazioa"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Erakundeak kudeatzen dituen aldaketak eta ezarpenak"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak kudeatzen dituen aldaketak eta ezarpenak"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Zer berri dago?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Eman begiratu bat bost eginbide nagusiei"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS erregistratzearen egoera"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Erregistratuta"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Erregistratu gabe"</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 32ca0b7d8ceecf055d9db3ba868fc0cb04bdb203..cd8b986387c4c66219e8d4b2c565b24346d4f3ae 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 37a53c3ddf9b91b295227192c10cb2e96decc922..92277c5fb2110cb215349b99cb3dc0a8efa4298d 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"بعداً انجام شود"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"از تنظیم اثر انگشت رد می‌شوید؟"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"انتخاب کرده‌اید که از اثر انگشتتان به‌عنوان روشی برای باز کردن قفل تلفن استفاده کنید. اگر اکنون این مرحله را رد کنید، باید بعداً آن را تنظیم کنید. تنظیم فقط یک دقیقه یا همین حدود طول می‌کشد."</string>
     <string name="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="1688030823464420974">"اگر در تلاش بعدی الگوی نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"اگر در تلاش بعدی‌ پین نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"اگر در تلاش بعدی‌ گذرواژه نادرستی وارد کنید، داده‌های این دستگاه حذف خواهد شد"</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="5047439819181833824">"تلاش‌های نادرست بسیار زیادی انجام شده است. داده‌های این دستگاه حذف خواهد شد."</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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"‏روشن شدن خودکار Wi-Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"‏Wi-Fi درنزدیکی شبکه‌های با کیفیت بالای ذخیره‌شده (ازجمله شبکه خانه‌تان) دوباره روشن می‌شود."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‏در دسترس نیست چون اسکن Wi‑Fi خاموش است"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"برای استفاده، یک ارائه‌دهنده رتبه‌بندی شبکه انتخاب کنید"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"اجتناب از اتصالات ضعیف"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"‏از شبکه Wi-Fi استفاده نکنید، مگر آنکه اتصال اینترنتی مناسب باشد"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"فقط از شبکه‌هایی استفاده می‌شود که اتصال اینترنتی خوبی دارند"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"اتصال به شبکه‌های باز"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"اتصال خودکار به شبکه‌های عمومی با کیفیت بالا"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"برای استفاده، یک ارائه‌دهنده رتبه‌بندی شبکه انتخاب کنید"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"برای استفاده، یک ارائه‌دهنده رتبه‌بندی شبکه سازگار انتخاب کنید"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"نصب مجوزها"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"‏برای بهبود صحت مکان، برنامه‌ها و سرویس‌های سیستم همچنان می‌توانند شبکه‌های 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"‏برای بهبود دقت مکان، اسکن Wi-Fi‌ را در <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>تنظیمات اسکن<xliff:g id="LINK_END_1">LINK_END</xliff:g> روشن کنید."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"همیشه روشن / مصرف شارژ بالا"</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="6978257596231155345">"نمایش زمان، نمادهای اعلان و سایر اطلاعات. مصرف شارژ بالا."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"کاربران دیگری در این دستگاه وجود دارند.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"عکس ها"</li>\n<li>"سایر اطلاعات کاربر"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">"‏"<li>"شرکت‌های مخابراتی در eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"با این کار طرح سرویس تلفن همراهتان لغو نخواهد شد."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nبرای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"حافظهٔ USB"</b>" باید پاک شود."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nبرای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"کارت SD"</b>" باید پاک شود."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"‏پاک کردن حافظهٔ USB"</string>
     <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 +1377,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>
@@ -1376,7 +1418,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 +1463,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>
@@ -1491,6 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"صفحه‌خوان‌ها، نمایشگر، کنترل‌های تعامل"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"تنظیمات بینایی"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"می‌توانید این دستگاه را متناسب با نیازهایتان سفارشی کنید. می‌توانید بعداً در «تنظیمات»، این قابلیت‌های دسترس‌پذیری را تغییر دهید."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"افزایش اندازه قلم"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"صفحه‌خوان‌ها"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"صدا و نوشتار روی صفحه"</string>
     <string name="display_category_title" msgid="685461049938269166">"نمایشگر"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"تلفنتان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP">%1$s</xliff:g> آن را بیدار نگه می‌دارد.\n\nبرای برطرف کردن این مشکل، می‌توانید برنامه را متوقف کنید.\n\nاگر مشکل ادامه داشت، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"رایانه لوحی‌تان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP">%1$s</xliff:g> آن را بیدار نگه می‌دارد.\n\nبرای برطرف کردن این مشکل، می‌توانید برنامه را متوقف کنید.\n\nاگر مشکل ادامه داشت، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"دستگاهتان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP">%1$s</xliff:g> آن را بیدار نگه می‌دارد.\n\nبرای برطرف کردن این مشکل، می‌توانید برنامه را متوقف کنید.\n\nاگر مشکل ادامه داشت، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"تلفنتان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP_0">%1$s</xliff:g> مرتب تلفنتان را بیدار می‌کند.\n\nبرای برطرف کردن این مشکل، می‌توانید <xliff:g id="APP_1">%1$s</xliff:g> را متوقف کنید.\n\nاگر مشکل ادامه پیدا کرد، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"رایانه لوحی‌تان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP_0">%1$s</xliff:g> مرتب رایانه لوحی‌تان را بیدار می‌کند.\n\nبرای برطرف کردن این مشکل، می‌توانید <xliff:g id="APP_1">%1$s</xliff:g> را متوقف کنید.\n\nاگر مشکل ادامه پیدا کرد، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"دستگاهتان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP_0">%1$s</xliff:g> مرتب دستگاهتان را بیدار می‌کند.\n\nبرای برطرف کردن این مشکل، می‌توانید <xliff:g id="APP_1">%1$s</xliff:g> را متوقف کنید.\n\nاگر مشکل ادامه پیدا کرد، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"متوقف کردن برنامه"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"استفاده در پس‌زمینه خاموش شود و برنامه متوقف شود؟"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"تلفنتان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP_0">%1$s</xliff:g> مرتب تلفنتان را بیدار می‌کند.\n\nبرای برطرف کردن این مشکل، می‌توانید <xliff:g id="APP_1">%1$s</xliff:g> را متوقف کنید و از اجرا شدن آن در پس‌زمینه جلوگیری کنید."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"رایانه لوحی‌تان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP_0">%1$s</xliff:g> مرتب رایانه لوحی‌تان را بیدار می‌کند.\n\nبرای برطرف کردن این مشکل، می‌توانید <xliff:g id="APP_1">%1$s</xliff:g> را متوقف کنید و از اجرا شدن آن در پس‌زمینه جلوگیری کنید."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"دستگاهتان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP_0">%1$s</xliff:g> مرتب دستگاهتان را بیدار می‌کند.\n\nبرای برطرف کردن این مشکل، می‌توانید <xliff:g id="APP_1">%1$s</xliff:g> را متوقف کنید و از اجرا شدن آن در پس‌زمینه جلوگیری کنید."</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="7774807745601479888">"تلفنتان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا زیرا وقتی درحال استفاده از <xliff:g id="APP">%1$s</xliff:g> نیستید مرتب مکان شما را درخواست می‌کند.\n\nبرای برطرف کردن این مشکل، می‌توانید مکان را برای این برنامه خاموش کنید."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"رایانه لوحی‌تان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت زیرا وقتی درحال استفاده از <xliff:g id="APP">%1$s</xliff:g> نیستید مرتب مکان شما را درخواست می‌کند.\n\nبرای برطرف کردن این مشکل، می‌توانید مکان را برای این برنامه خاموش کنید."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"دستگاهتان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا وقتی درحال استفاده از <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"تفکیک مصرف شارژ از زمان آخرین شارژ کامل"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"آخرین شارژ کامل"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"زمان باقی‌مانده از شارژ باتری تقریبی است و بسته‌ به استفاده می‌تواند تغییر کند"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"داده‌های مصرف باتری تقریبی هستند و بسته‌ به استفاده می‌توانند تغییر کنند"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"هنگام استفاده فعال"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"درحالت پس‌زمینه"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"مصرف باتری"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"لغزاندن برای بازگشایی قفل، گذرواژه، الگو، پین"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"چالش کار، کار، نمایه"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"نمایه کاری، نمایه مدیریت‌شده، یکی شدن، یکپارچگی، کار، نمایه"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"اشاره"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"اشاره‌ها"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"پرداخت کردن، ضربه زدن، پرداخت‌ها"</string>
     <string name="keywords_backup" msgid="470070289135403022">"پشتیبان‌گیری، پشتیبان"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"اشاره"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"تنها از مخاطین ستاره‌دار"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"هیچ‌کدام"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"هشدارها"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"هشدارها همیشه اولویت دارند و صدا ایجاد می‌کنند"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"یادآوری‌ها"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"رویدادها"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"همه تماس‌گیرندگان"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"اشاره دستیار"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"حساسیت"</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="gesture_setting_on" msgid="3455094265233870280">"روشن"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"خاموش"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"‏قفل Bootloader قبلاً باز شده است"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"همگام‌سازی خودکار داده‌های کاری"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"اجازه دادن به برنامه‌ها برای بازخوانی خودکار داده‌ها"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"همگام‌سازی حساب"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"همگام‌سازی <xliff:g id="ID_1">%1$d</xliff:g> مورد از <xliff:g id="ID_2">%2$d</xliff:g> مورد روشن است"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"همگام‌سازی همه موارد روشن است"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"همگام‌سازی همه موارد خاموش است"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"اطلاعات دستگاه مدیریت‌شده"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"تغییرات و تنظیماتی که توسط سازمان شما مدیریت می‌شوند"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"تغییرات و تنظیماتی که توسط <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> مدیریت می‌شوند"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"چه مواردی جدید و هیجان‌انگیز هستند؟"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"بررسی ۵ قابلیت برتر"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"‏وضعیت ثبت IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"ثبت‌شده"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ثبت نشده است"</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 88cea35f21e38f493f2b4a6702868e4e7516755e..7ce271b5473dd58990069a0306c6c9db01f5cff1 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 5c3cd4f98adf420aa47bf5b77cc2e71b68431bac..4dbe8b10be055a6bcccfc634d00ac4511d4d84a3 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Tee myöhemmin"</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 +460,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 +532,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="1688030823464420974">"Jos annat väärän kuvion seuraavalla yrityskerralla, laitteen tiedot poistetaan."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Jos annat väärän PIN-koodin seuraavalla yrityskerralla, laitteen tiedot poistetaan."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -665,7 +694,7 @@
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> haluaa poistaa Wi-Fin käytöstä."</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Salli tiedonsiirto, kun tabletti koskettaa toista laitetta"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta."</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC käyttöön"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC vaihtaa tietoja tämän ja muiden lähellä olevien laitteiden tai kohteiden, esimerkiksi maksupäätteiden, syötteenlukijoiden tai interaktiivisten mainosten/tagien, kanssa."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Ota Wi-Fi käyttöön automaattisesti"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi otetaan automaattisesti käyttöön, kun lähistöllä on kotiverkkosi tai muita laadukkaita tallennettuja verkkoja."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ei käytettävissä, koska Wi‑Fi-haku on pois päältä."</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Valitse verkon arviointipalvelu, jotta voit käyttää tätä."</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vältä huonoja yhteyksiä"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Älä käytä Wi-Fi-verkkoa, jos sillä on huono internetyhteys"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Käytä vain verkkoja, joiden yhteyslaatu on hyvä"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Muodosta yhteys avoimiin verkkoihin"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Muodosta automaattisesti yhteys laadukkaisiin julkisiin verkkoihin."</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Valitse verkon arviointipalvelu, jotta voit käyttää tätä."</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Valitse yhteensopiva verkon arviointipalvelu, jotta voit käyttää tätä."</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Asenna varmenteet"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Parantaakseen sijainnin tarkkuutta järjestelmäsovellukset ja -palvelut voivat edelleen etsiä Wi-Fi-verkkoja. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Paranna sijainnin tarkkuutta ottamalla käyttöön Wi-Fi-verkkojen etsiminen <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>etsintäasetuksissa<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -718,7 +750,7 @@
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Lisää asetuksia"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Suora Wi-Fi-yhteys"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Etsi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lisäasetukset"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"Määritä"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -829,7 +861,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Yhdyskäytävä"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Verkon etuliitteen pituus"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Suora Wi-Fi-yhteys"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Laitteen tiedot"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Muista tämä yhteys"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Etsi laitteita"</string>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Aina käytössä / lisää akun käyttöä"</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="6978257596231155345">"Näytä aika, ilmoituskuvakkeet ja muut tiedot. Tämä asetus kuluttaa akkua nopeammin."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Tällä laitteella on muita paikalla olevia käyttäjiä.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIMiä käyttävät operaattorit"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tämä ei peruuta mobiilipalvelupakettiasi."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Tyhjennä USB-tallennustila"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Näytönlukijat, näyttö, käytönhallinta"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Näköasetukset"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Voit muokata laitteen ominaisuuksia tarpeidesi mukaan. Käytettävyysvalintoja voi muuttaa myöhemmin asetuksissa."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Suurenna kirjasinkokoa"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Näytönlukuohjelmat"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ääni ja näyttöteksti"</string>
     <string name="display_category_title" msgid="685461049938269166">"Näyttö"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"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="2369957934555162428">"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="6195430620406365292">"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_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Puhelin ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP_0">%1$s</xliff:g> aktivoi näytön toistuvasti.\n\nOngelman korjaamiseksi <xliff:g id="APP_1">%1$s</xliff:g> voidaan lopettaa.\n\nJos tämä tapahtuu toistuvasti, akun optimointi voi edellyttää sovelluksen poistamista."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tabletti ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP_0">%1$s</xliff:g> aktivoi näytön toistuvasti.\n\nOngelman korjaamiseksi <xliff:g id="APP_1">%1$s</xliff:g> voidaan lopettaa.\n\nJos tämä tapahtuu toistuvasti, akun optimointi voi edellyttää sovelluksen poistamista."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Laite ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP_0">%1$s</xliff:g> aktivoi näytön toistuvasti.\n\nOngelman korjaamiseksi <xliff:g id="APP_1">%1$s</xliff:g> voidaan lopettaa.\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="6936542136153283692">"Estetäänkö taustalla toimiminen ja lopetetaanko sovellus?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Puhelin ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP_0">%1$s</xliff:g> aktivoi näytön toistuvasti.\n\nOngelman korjaamiseksi <xliff:g id="APP_1">%1$s</xliff:g> voidaan lopettaa ja sen toiminta taustalla estää."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tabletti ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP_0">%1$s</xliff:g> aktivoi näytön toistuvasti.\n\nOngelman korjaamiseksi <xliff:g id="APP_1">%1$s</xliff:g> voidaan lopettaa ja sen toiminta taustalla estää."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Laite ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP_0">%1$s</xliff:g> aktivoi näytön toistuvasti.\n\nOngelman korjaamiseksi <xliff:g id="APP_1">%1$s</xliff:g> voidaan lopettaa ja sen toiminta taustalla estää."</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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Erittely edellisen täyden latauksen jälkeen"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Edellinen täysi lataus"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Akun jäljellä oleva varaus on arvio ja voi muuttua käytön perusteella."</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Akun käyttötiedot ovat arvioita ja voivat muuttua käytön perusteella."</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktiivisen käytön aikana"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Taustalla"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Akun käyttö"</string>
@@ -2564,7 +2645,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>
@@ -2600,7 +2681,7 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Salli tiedonsiirto, kun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koskettaa toista NFC-laitetta"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Salli tiedonsiirto, kun tabletti koskettaa toista laitetta"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta."</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Sijainti"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Anna sovellusten käyttää sijaintitietojasi"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Edellinen"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"avaa liu\'uttamalla, salasana, lukituksenpoistokuvio, PIN-koodi"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"työhaaste, työ, profiili"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"työprofiili, hallinnoitu profiili, yhdistä, yhdistäminen, työ, profiili"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"eleet"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"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_assist_gesture_launch" msgid="813968759791342591">"ele"</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>
@@ -2734,7 +2819,7 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Värinä myös puheluille"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Muut äänet"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Näppäimistön näppäinäänet"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ruudun lukitusäänet"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Näytön lukitusäänet"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"Latausäänet"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Telakointiäänet"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Kosketusäänet"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2875,7 +2963,7 @@
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Poista"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Nimeä uudelleen"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Säännön nimi"</string>
-    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Nimeä sääntö."</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Nimeä sääntö"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Säännön nimi on jo käytössä."</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"Lisää"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Poista sääntö"</string>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Vain tähdellä merkityiltä kontakteilta"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ei keneltäkään"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Herätykset"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Herätykset ovat aina tärkeitä ja toistavat äänimerkin."</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Muistutukset"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tapahtumat"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Kaikki soittajat"</string>
@@ -2942,9 +3031,9 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ota vain herätykset käyttöön kello <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> asti."</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Salli keskeytykset aina."</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Estä, kun näyttö on päällä."</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Estä, kun näyttö on päällä"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Estä Älä häiritse ‑tilan hiljentämiä ilmoituksia kurkistamasta tai näkymästä näytöllä."</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Estä, kun näyttö on pois päältä."</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Estä, kun näyttö on pois päältä"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Estä Älä häiritse ‑tilan hiljentämiä ilmoituksia käynnistämästä näyttöä tai vilkuttamasta ilmoitusvaloa."</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Estä Älä häiritse ‑tilan hiljentämiä ilmoituksia käynnistämästä näyttöä."</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Pois käytöstä"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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">"Pyyhkäise ilmoitukset esiin"</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Käytössä"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Ei käytössä"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Käynnistysohjelman lukitus on jo avattu."</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Synkronoi työtiedot automaattisesti"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Salli sovellusten päivittää tietoja automaattisesti."</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Tilin synkronointi"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Synkronointi käytössä <xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> kohteella"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Synkronointi käytössä kaikilla kohteilla"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Synkronointi pois käytöstä kaikilla kohteilla"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Hallinnoidun laitteen tiedot"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Organisaatiosi hallitsemat valinnat ja asetukset"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Valinnat ja asetukset, joita hallitsee <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Uutta"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Katso viisi kätevää ominaisuutta"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-rekisteröinnin tila"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Rekisteröity"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ei rekisteröity"</string>
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 7de3854c13d408d05a9102057b06e2e493042a35..c58e1f761e63a41923abec5528744616320e4145 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>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ad7ab23952c550ef0867da61a17a32d9352da904..668ce7cb6dc57739169b7c79ae549f89e8c6b90c 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) -->
@@ -236,7 +248,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Mémoire USB en lecture seule"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Carte SD installée en lecture seule"</string>
     <string name="skip_label" msgid="47510779345218297">"Passer"</string>
-    <string name="next_label" msgid="4693520878012668114">"SUIVANTE"</string>
+    <string name="next_label" msgid="4693520878012668114">"SUIVANT"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"Langues"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"Préférences linguistiques"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"Supprimer"</string>
@@ -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,43 +366,42 @@
     <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">"Relever le doigt et toucher le capteur"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Plus tard"</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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"L\'enregistrement de l\'empreinte digitale n\'a pas fonctionné. Réessayez ou utilisez un autre doigt."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ajouter une empreinte"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et l\'accès à l\'application. "<annotation id="url">"En savoir plus"</annotation></string>
@@ -449,6 +460,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>
@@ -486,46 +499,54 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre schéma."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre schéma.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre NIP."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre NIP.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre mot de passe."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre mot de passe. <xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Les fonctions de protection de l\'appareil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de cet appareil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Les fonctions de protection du profil ne fonctionneront pas sans votre schéma."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Les fonctions de protection du profil ne fonctionneront pas sans votre schéma.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Les fonctions de protection du profil ne fonctionneront pas sans votre NIP."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Les fonctions de protection du profil ne fonctionneront pas sans votre NIP.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre profil, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Les fonctions de protection du profil ne fonctionneront pas sans votre mot de passe."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Les fonctions de protection de profil ne fonctionneront pas sans votre mot de passe. <xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Les fonctions de protection du profil ne fonctionneront pas sans votre verrouillage d\'écran."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Les fonctions de protection du profil ne fonctionneront pas sans votre verrouillage d\'écran.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications avec celles-ci."</string>
+</xliff:g>Vos empreintes digitales enregistrées seront également supprimées de ce profil et vous ne pourrez pas déverrouiller votre téléphone, autoriser des achats ni vous connecter à des applications avec celles-ci."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Oui, supprimer"</string>
     <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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -673,7 +702,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Désactivé"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponible, car la NFC est désactivée"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages Web, des vidéos YouTube, des contacts et plus encore.\n\nIl vous suffit de rapprocher les appareils (en les plaçant dos à dos), puis de toucher votre écran. L\'application détermine le contenu à transférer."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages Web, des vidéos YouTube, des contacts et plus encore.\n\nIl vous suffit de rapprocher les appareils (en les plaçant généralement dos à dos), puis de toucher votre écran. L\'application détermine le contenu à transférer."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activer le Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activer le Wi-Fi automatiquement"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Le Wi‑Fi se réactivera automatiquement à proximité des réseaux de haute qualité qui sont enregistrés, comme celui de votre domicile"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Cette fonction n\'est pas accessible, car la recherche de réseaux Wi-Fi est désactivée"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Pour utiliser cette option, sélectionnez un fournisseur d\'avis sur le réseau"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions instables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"N\'utiliser que réseaux dotés d\'une connexion Internet stable"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Se connecter auto. aux réseaux ouverts"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Se connecter auto. aux réseaux publics de haute qualité"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Pour utiliser cette option, sélectionnez un fournisseur d\'avis sur le réseau"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Pour utiliser cette option, sélectionnez un fournisseur d\'avis sur le réseau compatible"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Pour améliorer la précision de la localisation, les applications et les services système peuvent toujours rechercher les réseaux Wi-Fi. 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="wifi_scan_notify_text" msgid="5593805423071186757">"Pour améliorer la précision de la localisation, les applications et les services système peuvent rechercher en permanence des réseaux Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Pour améliorer la précision de la localisation, activez la recherche Wi-Fi 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="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Ne plus afficher"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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">"Connexion Internet ou contenu non partagés 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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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">"Aucun"</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>
@@ -1020,8 +1061,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="7337555569694794132">"Toujours activé / Utilisation accrue de la pile"</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 lorsque vous recevez des notifications"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Toujours activé"</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Afficher l\'heure, les icônes de notifications et d\'autres renseignements. Utilisation accrue de la pile."</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>
@@ -1234,7 +1281,7 @@
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuler le déplacement"</string>
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Ce <xliff:g id="NAME_0">^1</xliff:g> ne semble pas rapide. \n\nVous pouvez continuer, mais les applications déplacées vers cet endroit risquent de se bloquer et les transferts de données pourront prendre du temps.\n\nVeuillez utiliser un <xliff:g id="NAME_1">^1</xliff:g> plus rapide pour obtenir de meilleures performances."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
-    <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la batterie"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la pile"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Modifier le point d\'accès"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Non défini"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Fournisseurs de services sur la carte eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Cela n\'annulera pas votre forfait de services cellulaires."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Effacer la mémoire de stockage USB"</string>
     <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>
@@ -1315,7 +1368,7 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurer la messagerie vocale, le transfert d\'appel, la mise en attente d\'appels, le numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Partage de connexion par USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Point d\'accès Wi-Fi mobile"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Par Bluetooth"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Partage connexion Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"Partage de connexion"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Point d\'accès activé, partage de connexion"</string>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,14 +1463,17 @@
     <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 utiliser empreinte digitale, configurer 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">"Confirmer votre NIP"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Les NIP ne correspondent pas."</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Méthode de déverrouillage"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Mode de déverrouillage"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Le mot de passe a été défini."</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Le NIP a été défini."</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Le schéma a été défini."</string>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Faire apparaître le schéma"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Rendre visible le schéma du profil"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrer au toucher"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Verr. auto MARCHE-ARRÊT"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Verr. auto avec Marche/Arrêt"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Sauf lorsque l\'appareil est maintenu en activité par <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Créer un schéma"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Modifier le schéma"</string>
@@ -1491,6 +1536,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 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>
@@ -1538,7 +1586,7 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Afficher processus en cache"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Application d\'urgence"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Réinitialiser préférences applis"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences?"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Réinitialiser préférences applis?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Cette opération a pour effet de réinitialiser toutes les préférences relatives aux éléments suivants :\n\n "<li>"Applications désactivées"</li>\n" "<li>"Notifications associées aux applications désactivées"</li>\n" "<li>"Applications par défaut pour les actions"</li>\n" "<li>"Restrictions de données en arrière-plan pour les applications"</li>\n" "<li>"Toutes les restrictions d\'autorisations"</li>\n\n"Vous ne perdrez aucune donnée liée aux applications."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Réinitialiser applis"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gérer l\'espace"</string>
@@ -1659,6 +1707,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>
@@ -1677,7 +1729,7 @@
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Ce correcteur orthographique peut recueillir l\'ensemble du texte saisi, y compris des données personnelles comme des mots de passe et des numéros de carte de paiement. Il provient de l\'application <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utiliser ce correcteur orthographique?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Paramètres"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Langue"</string>
-    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Clavier et entrées"</string>
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Clavier et modes d\'entrée"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Clavier virtuel"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Claviers virtuels proposés"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Gérer les claviers"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lecteurs d\'écran, affichage, commandes interactives"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Paramètres de visibilité"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Vous pouvez personnaliser cet appareil en fonction de vos besoins. Il est possible de modifier ces fonctionnalités d\'accessibilité plus tard dans les paramètres."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Augmenter la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lecteurs d\'écran"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio et texte à l\'écran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Affichage"</string>
@@ -1873,6 +1926,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>
@@ -1887,7 +1944,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"Service désactivé"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"Tâches d\'impression"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Tâches d\'impression"</string>
-    <string name="print_restart" msgid="8373999687329384202">"Recommencer"</string>
+    <string name="print_restart" msgid="8373999687329384202">"Redémarrer"</string>
     <string name="print_cancel" msgid="3621199386568672235">"Annuler"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"Impression de <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> en cours…"</string>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Votre téléphone n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Votre tablette n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> la maintient activée.\n\nPour y remédier, vous pouvez arrêter l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Votre appareil n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter l\'application.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Votre téléphone n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP_0">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Votre tablette n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP_0">%1$s</xliff:g> la maintient activée.\n\nPour y remédier, vous pouvez arrêter <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Votre appareil n\'arrive pas à gérer sa pile normalement, car l\'application <xliff:g id="APP_0">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSi le problème persiste, vous devrez peut-être désinstaller l\'application pour améliorer les performances de la pile."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Arrêter l\'application"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Désactiver l\'utilisation en arrière-plan et arrêter l\'application?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Votre téléphone n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP_0">%1$s</xliff:g> le maintient activé.\n\nPour résoudre le problème, vous pouvez arrêter <xliff:g id="APP_1">%1$s</xliff:g> et l\'empêcher de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Votre tablette n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP_0">%1$s</xliff:g> la maintient activée.\n\nPour résoudre le problème, vous pouvez arrêter <xliff:g id="APP_1">%1$s</xliff:g> et l\'empêcher de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Votre appareil n\'arrive pas à gérer sa pile normalement, car <xliff:g id="APP_0">%1$s</xliff:g> le maintient activé.\n\nPour résoudre le problème, vous pouvez arrêter <xliff:g id="APP_1">%1$s</xliff:g> et l\'empêcher 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Dernière charge complète"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"L\'autonomie restante de la pile est approximative et peut changer en fonction de l\'utilisation"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Les données d\'utilisation de la pile sont approximatives et peuvent changer en fonction de l\'utilisation"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Durant l\'utilisation active"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Lorsqu\'elle fonctionne en arrière-plan"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Utilisation de la pile"</string>
@@ -2194,7 +2275,7 @@
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Ajouter un réseau"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Actualiser la liste"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Passer"</string>
-    <string name="wifi_setup_next" msgid="3388694784447820477">"SUIVANTE"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"SUIVANT"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Précédent"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Informations sur le réseau"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"Connexion"</string>
@@ -2280,7 +2361,7 @@
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilisation des données"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Util. données aplication"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"La manière dont le fournisseur de services effectue les calcul des données peut être différente."</string>
-    <string name="data_usage_app" msgid="4970478397515423303">"Utilisation de l\'application"</string>
+    <string name="data_usage_app" msgid="4970478397515423303">"Utilisation de l\'appli"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"DÉTAILS DE L\'APPLICATION"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Données cellulaires"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Définir limite consommation de données"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Vous pouvez partager cet appareil avec d\'autres personnes en ajoutant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser, entre autres, ses applications et son fond d\'écran. Chacun peut également modifier les paramètres de l\'appareil, comme les réseaux Wi-Fi, qui touchent tous les utilisateurs.\n\nLorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nTout utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nTout utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurer l\'utilisateur?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est disponible, et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est disponible et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurer le profil maintenant?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurer maintenant"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Pas maintenant"</string>
@@ -2564,7 +2645,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>
@@ -2604,7 +2685,7 @@
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Position"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Autoriser les applications à utiliser vos données de localisation"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Précédent"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"SUIVANTE"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"SUIVANT"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Terminer"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"Prendre une photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Sélectionner une photo dans la galerie"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"glisser pour déverrouiller, mot de passe, schéma, nip"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"défi professionnel, travail, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil professionnel, profil géré, unifier, unification, travail, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"geste"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestes"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"payer, toucher, paiements"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sauvegarde, sauvegarder"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"geste"</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>
@@ -2791,7 +2876,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\'appli"</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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Des contacts favoris seulement"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Les alarmes sont toujours une priorité et émettent un son"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tous les appelants"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3118,16 +3211,16 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Charger cet appareil"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Charger cet appareil seulement"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Fournir l\'alimentation"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Charger l\'appareil connecté. Ne fonctionne qu\'avec les appareils compatibles avec le rechargement USB."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Charger l\'appareil connecté. Ne fonctionne qu\'avec les appareils compatibles avec le chargement USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transférer les fichiers"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transférer des fichiers vers un autre appareil"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transfert de photos (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transférer des photos (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferer des photos ou des fichiers si MTP n\'est pas pris en charge (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Utiliser l\'appareil en tant que MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utiliser cet appareil en tant que MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utiliser la connexion USB pour"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Charger cet appareil"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Chargement de l\'appareil"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Fournir de l\'alimentation"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transfert de fichiers"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transfert de photos (profil PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran a une teinte ambre qui 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>
@@ -3296,8 +3398,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 (le <xliff:g id="ID_1">%1$s</xliff:g>)"</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>
@@ -3305,8 +3406,8 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Le suivi de consommation de données du fournisseur de services peut différer de celui de l\'appareil."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Définir avertisseur util. données"</string>
-    <string name="data_warning" msgid="209133958008062117">"Avertissement consomm. données"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Activer une alerte"</string>
+    <string name="data_warning" msgid="209133958008062117">"Seuil d\'alerte"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Définir limite consomm. données"</string>
     <string name="data_limit" msgid="1885406964934590552">"Limite de données"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés entre <xliff:g id="ID_2">%2$s</xliff:g>"</string>
@@ -3317,10 +3418,10 @@
       <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>
+    <string name="data_saver_off" msgid="6892309031162738794">"Désactivé"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Utilis. donn. sans restriction"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Ignorer restrict. données lorsque Écon. donn. act."</string>
     <string name="home_app" msgid="4066188520886810030">"Application d\'accueil"</string>
@@ -3338,7 +3439,7 @@
     <string name="not_battery_optimizing" msgid="5362861851864837617">"L\'optimisation de la pile n\'est pas utilisée"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Si l\'appareil est verrouillé, empêcher l\'entrée de réponses ou de texte dans les notifications"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Correcteur ortho par défaut"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"Sélectionnez correcteur ortho"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"Sélectionner correcteur ortho"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Non sélectionné"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(aucun)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">" : "</string>
@@ -3381,8 +3482,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">"Assistance 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>
@@ -3453,25 +3553,32 @@
     <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 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">"Toucher deux fois le téléphone 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 pour consulter le téléphone"</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, saisir 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, saisir 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Activé"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Désactivé"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Le programme d\'amorçage est déjà déverrouillé"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Synchroniser automatiquement les données professionnelles"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Autoriser les applications à actualiser les données automatiquement"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Synchronisation du compte"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"La synchronisation est activée pour <xliff:g id="ID_1">%1$d</xliff:g> éléments sur <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"La synchronisation est activée pour tous les éléments"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"La synchronisation est désactivée pour tous les éléments"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Renseignements sur l\'appareil géré"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Changements et paramètres gérés par votre organisation"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Changements et paramètres gérés par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,9 +3682,10 @@
     <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>
+    <string name="autofill_app" msgid="7338387238377914374">"Service de remplissage auto"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatique, remplir, remplissage automatique"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Assurez-vous de faire confiance à cette application&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Remplissage automatique&gt;%1$s&lt;/xliff:g&gt;utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
     <string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
@@ -3584,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activé"</string>
     <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="storage_movies_tv" msgid="5498394447562086890">"Applis de films et d\'émissions"</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="698847081680980774">"Quelles sont les nouveautés toutes chaudes?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Découvrez les cinq principales fonctionnalités"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"État d\'enregistrement IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Enregistré"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non enregistré"</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index de93bacb6e5e97c24a323b292d8096e3b2e18acf..e8d1cb4423d4c434044cbf118d16c7441dee76a4 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 b8f49bf00d26c2434b675df3d52f0bc6d5dc6ed3..71755aee8fea690a1cd57339c7d5d0202a7a75eb 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) -->
@@ -322,14 +334,14 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Désactivé par l\'administrateur"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Aucun"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Exemple : l\'Android de Jean"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Exemple : Android de Jean"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Infos utilisateur"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afficher infos de profil sur écran de verrouillage"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Infos de profil"</string>
     <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,46 +366,45 @@
     <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">"Posez le doigt sur le lecteur"</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">"Posez le doigt sur le lecteur"</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">"Levez le doigt, puis appuyez de nouveau"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Plus tard"</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>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ajouter une empreinte"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Suivant"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et l\'accès à l\'application. "<annotation id="url">"En savoir plus"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Votre empreinte digitale vous permet non seulement de déverrouiller votre téléphone, mais également d\'autoriser des achats et d\'accéder à des applications. "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" L\'option de verrouillage de l\'écran est désactivée. Pour en savoir plus, contactez l\'administrateur de votre entreprise. "<annotation id="admin_details">"Plus d\'informations"</annotation>\n\n"Vous pouvez toujours utiliser votre empreinte digitale pour autoriser des achats et l\'accès aux applications. "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Relevez le doigt, puis appuyez à nouveau sur le capteur."</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales."</string>
@@ -437,7 +448,7 @@
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Changer le mode de saisie"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Définir le verrouillage de l\'écran"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protégez votre appareil"</string>
-    <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utiliser le lecteur d\'empreinte digitale"</string>
+    <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utiliser votre empreinte digitale"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Déverrouiller un appareil avec votre empreinte digitale"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Verrouillage de l\'écran"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Verrouill. profil pro"</string>
@@ -449,6 +460,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 +532,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="1688030823464420974">"Si vous dessinez un schéma incorrect lors de la prochaine tentative, les données de cet appareil seront supprimées"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Si vous saisissez un code incorrect lors de la prochaine tentative, les données de cet appareil seront supprimées"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Si vous saisissez un mot de passe incorrect lors de 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 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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activation automatique du Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Réactiver le Wi‑Fi à proximité des réseaux haute qualité déjà enregistrés, par exemple votre réseau domestique"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Indisponible, car la recherche Wi‑Fi est désactivée"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Pour utiliser cette fonctionnalité, sélectionnez un fournisseur d\'évaluation de l\'état du réseau"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions instables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"N\'utiliser que réseaux dotés d\'une connexion Internet stable"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Connexion aux réseaux ouverts"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Se connecter automatiquement aux réseaux publics haute qualité"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Pour utiliser cette fonctionnalité, sélectionnez un fournisseur d\'évaluation de l\'état du réseau"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Pour utiliser cette fonctionnalité, sélectionnez un fournisseur d\'évaluation de l\'état du réseau compatible"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installation de certificats"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Pour améliorer la précision de la localisation, les applications et les services système peuvent rechercher en permanence les réseaux Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Pour améliorer la précision de la position, activez la recherche Wi-Fi 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>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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">"Ne partager ni la connexion, ni aucun contenu, 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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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">"Programme"</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">"Programme"</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>
@@ -1020,8 +1061,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="7337555569694794132">"Toujours activé/Batterie davantage sollicitée"</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="6978257596231155345">"Afficher l\'heure, les icônes de notification et d\'autres informations. Batterie davantage sollicitée."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"La musique"</li>\n<li>"Les photos"</li>\n<li>"Les autres données utilisateur"</li>"."</string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Opérateurs sur la carte eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Cette opération n\'annulera pas votre forfait mobile."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez formater la "<b>"carte SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Effacer la mémoire USB"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,11 +1463,14 @@
     <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 votre empreinte, définissez un mot 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 utiliser votre empreinte, définissez un 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 votre empreinte, définissez un code PIN"</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>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmez votre code PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Les mots de passe ne correspondent pas."</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Les codes PIN ne correspondent pas."</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Méthode de déverrouillage"</string>
@@ -1491,6 +1536,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>
@@ -1514,7 +1562,7 @@
     <string name="total_size_label" msgid="1048676419552557254">"Total"</string>
     <string name="application_size_label" msgid="7376689739076506885">"Taille d\'application"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Application sur USB"</string>
-    <string name="data_size_label" msgid="6117971066063850416">"Informations sur l\'utilisateur"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"Données utilisateur"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Données sur USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"Carte SD"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Désinstaller"</string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lecteurs d\'écran, affichage, contrôles par interaction"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Paramètres visuels"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Vous pouvez personnaliser cet appareil en fonction de vos besoins et modifier ces fonctionnalités d\'accessibilité ultérieurement dans les paramètres."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Augmenter la taille de la police"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lecteurs d\'écran"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio et texte à l\'écran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Écran"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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 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="4006631636646776488">"Votre téléphone ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter 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="2369957934555162428">"Votre tablette ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> la maintient activée.\n\nPour y remédier, vous pouvez arrêter 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="6195430620406365292">"Votre appareil ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter 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_wakeup_alarm" product="default" msgid="1638726742782558262">"Votre téléphone ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP_0">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter l\'application <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Votre tablette ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP_0">%1$s</xliff:g> la maintient activée.\n\nPour y remédier, vous pouvez arrêter l\'application <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="device" msgid="2854944538238649520">"Votre appareil ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP_0">%1$s</xliff:g> le maintient activé.\n\nPour y remédier, vous pouvez arrêter l\'application <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Désactiver l\'exécution en arrière-plan et arrêter l\'appli ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Votre téléphone ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP_0">%1$s</xliff:g> le maintient activé.\n\nPour résoudre le problème, vous pouvez arrêter <xliff:g id="APP_1">%1$s</xliff:g> et l\'empêcher de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Votre tablette ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP_0">%1$s</xliff:g> la maintient activée.\n\nPour résoudre le problème, vous pouvez arrêter <xliff:g id="APP_1">%1$s</xliff:g> et l\'empêcher de s\'exécuter en arrière-plan."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Votre appareil ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP_0">%1$s</xliff:g> le maintient activé.\n\nPour résoudre le problème, vous pouvez arrêter <xliff:g id="APP_1">%1$s</xliff:g> et l\'empêcher 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="7774807745601479888">"Votre téléphone ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> continue de demander votre position lorsque vous ne l\'utilisez pas.\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="118745801732181618">"Votre tablette ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> continue de demander votre position lorsque vous ne l\'utilisez pas.\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="6783678153382298295">"Votre appareil ne peut pas gérer la batterie normalement, car l\'application <xliff:g id="APP">%1$s</xliff:g> continue de demander votre position lorsque vous ne l\'utilisez pas.\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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Dernière charge complète"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"La durée d\'autonomie restante est approximative et peut changer en fonction de l\'utilisation"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Les informations relatives à la batterie sont approximatives et peuvent varier en fonction de l\'utilisation"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Lors des périodes d\'utilisation active"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Lorsque l\'application s\'exécute en arrière-plan"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Utilisation de la batterie"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Vous pouvez partager cet appareil avec d\'autres personnes en ajoutant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser ses applications et son fond d\'écran, entre autres. Chacun des utilisateur peut également modifier les paramètres de l\'appareil qui s\'appliquent à tous les utilisateurs, tels que le Wi-Fi.\n\nLorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Lorsque vous ajoutez un utilisateur, celui-ci doit configurer son espace.\n\nN\'importe quel utilisateur peut mettre à jour les applications pour tous les autres utilisateurs."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurer l\'utilisateur ?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est disponible, et qu\'elle peut utiliser l\'appareil pour configurer son espace."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Assurez-vous que la personne est prête à utiliser l\'appareil et configurer son espace."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurer le profil maintenant ?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurer"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Pas maintenant"</string>
@@ -2507,7 +2588,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Les profils limités ne peuvent pas ajouter de compte."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Paramètres de l\'écran de verrouillage"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter des utilisateurs depuis l\'écran de verrouillage"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter utilisateurs depuis écran de verrouillage"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nouvel utilisateur"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nouveau profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Supprimer cet utilisateur ?"</string>
@@ -2564,7 +2645,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 extrêmes"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"faire glisser pour déverrouiller, mot de passe, schéma, code d\'accès"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"verrouillage profil pro, professionnel, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil professionnel, profil géré, unifier, unification, professionnel, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"geste"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestes"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"payer, appuyer, paiements"</string>
     <string name="keywords_backup" msgid="470070289135403022">"sauvegarde, sauvegarder"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"geste"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Des contacts favoris uniquement"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Aucun"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmes toujours prioritaires et sonores"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Rappels"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Événements"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tous les appelants"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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 é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 a un comportement anormal</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications ont 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>
@@ -3117,8 +3210,8 @@
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Refuser"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Recharger cet appareil"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Uniquement pour charger cet appareil"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"Fournir l\'alimentation"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Charger l\'appareil connecté. Ne fonctionne qu\'avec les appareils compatibles avec le rechargement USB."</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Fournir du courant"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Permet de recharger les appareils connectés compatibles avec le rechargement USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transférer des fichiers"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transférer des fichiers vers un autre appareil"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transférer des photos (PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,15 @@
     <string name="condition_night_display_summary" msgid="5443722724310650381">"L\'écran prend une teinte rouge ambré qui 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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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, saisissez 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">"Utiliser le lecteur d\'empreinte pour afficher 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Activé"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Désactivé"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader déjà déverrouillé"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Synchronisation automatique des données professionnelles"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Autoriser les applications à actualiser les données automatiquement"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Synchronisation du compte"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Synchronisation activée pour <xliff:g id="ID_1">%1$d</xliff:g> élément(s) sur <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Synchronisation activée pour tous les éléments"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Synchronisation désactivée pour tous les éléments"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Infos sur l\'appareil géré"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Modifications et paramètres gérés par votre entreprise"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Modifications et paramètres gérés par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Nouveautés à découvrir"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Découvrez les cinq fonctionnalités clés"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"État de l\'enregistrement IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Enregistré"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non enregistré"</string>
 </resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 9cd177a8bee7ccdc72223b62440e7e722d4e6d12..ad43c345719b26dbdcbc1283d7416d6e3a800983 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -67,7 +67,7 @@
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"Buscando..."</item>
+    <item msgid="8934131797783724664">"Explorando..."</item>
     <item msgid="8513729475867537913">"Conectando..."</item>
     <item msgid="515055375277271756">"Autenticando…"</item>
     <item msgid="1943354004029184381">"Obtendo enderezo IP..."</item>
@@ -81,7 +81,7 @@
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"Buscando..."</item>
+    <item msgid="8878186979715711006">"Explorando..."</item>
     <item msgid="355508996603873860">"Conectando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="554971459996405634">"Autenticando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="7928343808033020343">"Obtendo enderezo IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
@@ -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>
@@ -264,7 +254,7 @@
     <item msgid="8181415497109310680">"ler SMS"</item>
     <item msgid="6816551144382117307">"escribir SMS"</item>
     <item msgid="4600463921908905030">"recibir SMS"</item>
-    <item msgid="5958926493289432745">"recibir SMS de emerxencia"</item>
+    <item msgid="5958926493289432745">"recibir SMS de urxencia"</item>
     <item msgid="4945269495221089540">"recibir MMS"</item>
     <item msgid="5570472453573929087">"recibir WAP push"</item>
     <item msgid="7125408150230860501">"enviar SMS"</item>
@@ -282,7 +272,7 @@
     <item msgid="4547883971364273343">"enfoque de audio"</item>
     <item msgid="2603878814882344450">"volume principal"</item>
     <item msgid="7136963238377062018">"volume da voz"</item>
-    <item msgid="4270236897655923007">"volume do timbre"</item>
+    <item msgid="4270236897655923007">"volume do ton"</item>
     <item msgid="6325739889222559394">"volume multimedia"</item>
     <item msgid="5762123934816216821">"volume da alarma"</item>
     <item msgid="785049718065337473">"volume das notificacións"</item>
@@ -349,7 +339,7 @@
     <item msgid="3265262911688671938">"Enfoque de audio"</item>
     <item msgid="2098976479485046797">"Volume principal"</item>
     <item msgid="5660213838861789350">"Volume da voz"</item>
-    <item msgid="7983336752371254444">"Volume do timbre"</item>
+    <item msgid="7983336752371254444">"Volume do ton"</item>
     <item msgid="7878027809189330917">"Volume multimedia"</item>
     <item msgid="7260546305036218513">"Volume da alarma"</item>
     <item msgid="9103719301075748925">"Volume das notificacións"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 018a9007da860f5455d37e9fc506b2f308d2525a..620be9ab8b05a919cd63edb7d5088e1eabec9863 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>
@@ -54,7 +56,7 @@
     <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"Rexistro de IMS: <xliff:g id="STATUS">%1$s</xliff:g>\nVoz por LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nVoz por wifi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideochamada: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nInterface de UT: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1697703164394784618">"En servizo"</string>
     <string name="radioInfo_service_out" msgid="7999094221728929681">"Fóra de servizo"</string>
-    <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Só chamadas de emerxencia"</string>
+    <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Só chamadas de urxencia"</string>
     <string name="radioInfo_service_off" msgid="7536423790014501173">"Radio desactivada"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Itinerancia"</string>
     <string name="radioInfo_roaming_not" msgid="4849214885629672819">"Non está en itinerancia"</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) -->
@@ -231,8 +243,8 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB extraído durante uso."</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"A tarxeta SD extraeuse mentres estaba en uso."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes utilizados:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Buscando ficheiros no USB…"</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Buscando multimedia na tarxeta SD…"</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Explorando ficheiros no USB…"</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Explorando ficheiros multimedia na tarxeta SD…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB instalado é só lectura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"A tarxeta SD instalada é de só lectura."</string>
     <string name="skip_label" msgid="47510779345218297">"Omitir"</string>
@@ -322,14 +334,14 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desactivado polo administrador"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Ningunha"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Por exemplo, Android de Xan."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Por exemplo: Android de Xoán."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Información usuario"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar info do perfil na pantalla de bloqueo"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Información do perfil"</string>
     <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>
+    <string name="security_settings_title" msgid="4918904614964215087">"Seguranza e localización"</string>
     <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>
@@ -338,7 +350,7 @@
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Define A miña localización, o desbloqueo da pantalla e o bloqueo do almacenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desactivado polo administrador"</string>
-    <string name="security_status_title" msgid="5848766673665944640">"Estado da seguranza"</string>
+    <string name="security_status_title" msgid="5848766673665944640">"Estado de seguranza"</string>
     <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo de pantalla, impresión dixital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impresión dixital"</string>
@@ -354,43 +366,42 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Facelo máis tarde"</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_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>
+    <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 o rexistro"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Esgotouse o tempo de espera do rexistro da impresión dixital. Téntao de novo."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O rexistro da impresión dixital non funcionou. Téntao de novo ou utiliza outro dedo."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Engadir outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Seguinte"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ademais de desbloquear o teu teléfono, tamén podes utilizar a túa impresión dixital para autorizar compras e o acceso a aplicacións. "<annotation id="url">"Máis información"</annotation></string>
@@ -434,7 +445,7 @@
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Erro no descifrado"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"O contrasinal que introduciches é correcto, pero lamentablemente os teus datos están danados. \n\nPara continuar usando a túa tableta, necesitas realizar un restablecemento de fábrica. Cando configures a túa tableta despois do restablecemento, poderás restaurar os datos dos que se fixo unha copia de seguranza na túa conta de Google."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"O contrasinal que introduciches é correcto, pero lamentablemente os teus datos están danados. \n\nPara continuar usando o teu teléfono, necesitas realizar un restablecemento de fábrica. Cando configures o teu teléfono despois do restablecemento, poderás restaurar os datos dos que se fixo unha copia de seguranza na túa conta de Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar o método de entrada"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar de método de introdución"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Definir bloqueo da pantalla"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protexe o teu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utilizar impresión dixital"</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 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 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="1688030823464420974">"Se insires un padrón incorrecto no seguinte intento, eliminaranse os datos deste dispositivo"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Se insires un PIN incorrecto no seguinte intento, eliminaranse os datos deste dispositivo"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Se insires 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="5047439819181833824">"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>
@@ -625,7 +646,15 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Config. avanzada"</string>
     <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="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 exploración<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>
@@ -671,7 +700,7 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Listo para transmitir o contido da aplicación a través de NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivado"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Non dispoñible debido a que NFC está desactivada"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Non dispoñible debido a que a opción NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Cando esta función está activada, podes transferir contido de aplicacións a outros dispositivos compatibles con NFC achegando os dispositivos entre si. Por exemplo, podes transmitir páxinas web, vídeos de YouTube, contactos, etc.\n\nSimplemente achega os dispositivos entre si (normalmente as súas partes posteriores) e, a continuación, toca a pantalla. A aplicación determina o que se transfire."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wifi"</string>
@@ -691,14 +720,17 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activar a wifi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"A wifi volverase activar preto de redes de alta calidade gardadas, como a túa rede doméstica"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Non está dispoñible porque a busca de redes wifi está desactivada"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Para utilizar a función, selecciona un provedor de valoración de rede"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexións deficientes"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Non utilizar unha rede wifi se non ten unha boa conexión a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Usa só redes que teñan unha boa conexión a Internet"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Conectarse ás redes abertas"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Conectarse automaticamente a redes públicas de alta calidade"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Para utilizar a función, selecciona un provedor de valoración de rede"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para utilizar a función, selecciona un provedor de valoración de rede que sexa compatible"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Para mellorar a precisión da localización, as aplicacións do sistema e os servizos aínda poden buscar redes wifi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para mellorar a precisión de localización, activa a busca de redes wifi 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="wifi_scan_notify_text" msgid="5593805423071186757">"Para mellorar a precisión da localización, as aplicacións do sistema e os servizos aínda poden explorar redes wifi. Podes cambiar esta opción na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de exploración<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para mellorar a precisión de localización, activa a exploración de redes wifi na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de exploración<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Non mostrar outra vez"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter a wifi activada durante o modo de suspensión"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wifi activada na suspensión"</string>
@@ -779,11 +811,12 @@
     <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>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Introduce o contrasinal da túa rede"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mellorar a precisión da localización e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> quere activar a busca de redes, aínda que a wifi estea desactivada.\n\nQueres permitilo para todas as aplicacións que queren buscar redes?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mellorar a precisión da localización e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> quere activar a exploración de redes, aínda que a wifi estea desactivada.\n\nQueres permitilo para todas as aplicacións que queren buscar redes?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Para desactivar esta función, accede ás opcións avanzadas no menú adicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Rexeitar"</string>
@@ -810,7 +843,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>
@@ -847,9 +879,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 do punto de acceso"</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>
@@ -896,8 +936,9 @@
     <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="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="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
+    <string name="emergency_address_title" msgid="3571902448699714454">"Actualizar enderezo de urxencia"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"Enderezo que utilizan os servizos de urxencia 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>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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 en suspensión"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Pantalla en suspensión"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Activada continuamente (consómese máis batería)"</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="6978257596231155345">"Mostra a hora, as iconas de notificación e outra información. Consómese máis batería."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Hai outros usuarios presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros datos do usuario"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores da eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Con esta acción non se cancelará o teu plan de servizos móbiles."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar o "<b>"almacenamento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para borrar música, imaxes e outros datos de usuario, é necesario borrar a "<b>"tarxeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Borrar almacenamento USB"</string>
     <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>
@@ -1317,33 +1370,22 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona wifi portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Conexión por Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Conexión compartida"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Zona wifi e conex. compartida"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Zona wifi/conexión compartida"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Zona wifi e conexión compartida activadas"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Zona wifi activada"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Conexión compartida activada"</string>
     <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>
@@ -1376,13 +1418,13 @@
     <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_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_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">"Exploración de conexións"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Exploración 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>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Busca de dispositivos Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Exploración de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Mellora a localización permitindo que as aplicacións do sistema e os servizos detecten dispositivos Bluetooth en calquera momento."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Situación rede móbil e wifi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Situación por rede móbil/wifi"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Permite usar o servizo de localización para calcular a localización rápido. Recompilaranse datos anónimos e enviaranse a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localización determinada por wifi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
@@ -1421,8 +1463,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>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Facer visible o padrón"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Facer visible o padrón do perfil"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquea ao acender"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear ao acender"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Excepto se <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> mantén o dispositivo desbloqueado"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Definir padrón de desbloqueo"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambiar deseño de desbloqueo"</string>
@@ -1486,16 +1531,19 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"O mesmo que o bloqueo da pantalla do dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Xestionar aplicacións"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Xestiona e elimina as aplicacións instaladas"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Información das aplicacións"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Información da aplicación"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Xestiona aplicacións e configura atallos de inicio rápido"</string>
     <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activa máis opcións de configuración"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Información da aplicación"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Info da app"</string>
     <string name="storage_label" msgid="8700867073480107253">"Almacenamento"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Abrir de forma predeterminada"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Valores predeterminados"</string>
@@ -1536,8 +1584,8 @@
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar servizos en curso"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos na caché"</string>
-    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de emerxencia"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer as preferencias"</string>
+    <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación de urxencia"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias das aplicacións"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Restablecer as preferencias das aplicacións?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Con esta acción, restableceranse todas as preferencias de:\n\n "<li>"aplicacións desactivadas"</li>\n" "<li>"notificacións de aplicacións desactivadas"</li>\n" "<li>"aplicacións predeterminadas para accións"</li>\n" "<li>"restricións de datos en segundo plano para aplicacións"</li>\n" "<li>"calquera restrición de permisos"</li>\n\n" Non perderás datos de ningunha aplicación."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicacións"</string>
@@ -1659,6 +1707,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>
@@ -1677,7 +1729,7 @@
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"É posible que este corrector ortográfico recolla todo o texto que escribes, incluídos datos persoais como contrasinais e números de tarxetas de crédito. Provén da aplicación <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Queres usar este corrector ortográfico?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuración"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
-    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Teclado e métodos de entrada"</string>
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"Teclado e métodos de introdución"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Teclado virtual"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Teclado virtual dispoñible"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Xestionar teclados"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controis de interacción"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuración de visualización"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Podes personalizar este dispositivo segundo as túas necesidades. Podes cambiar estas funcións de accesibilidade máis tarde en Configuración."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Incrementar o tamaño do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lectores de pantalla"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio e texto na pantalla"</string>
     <string name="display_category_title" msgid="685461049938269166">"Pantalla"</string>
@@ -1873,6 +1926,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>
@@ -1910,7 +1967,7 @@
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Non se permite a execución da aplicación en segundo plano"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da pantalla desde a carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da pantalla"</string>
-    <string name="device_cellular_network" msgid="4724773411762382950">"Busca da rede de telefonía móbil"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"Exploración de redes móbiles"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"Hai <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde a carga completa (hai <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="power_usage_list_summary_device" msgid="7036566616386864302">"Uso do dispositivo desde a carga completa (hai <xliff:g id="TIME">^1</xliff:g>)"</string>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"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> manteno activo.\n\nPara tentar solucionar este problema, podes deter a aplicación.\n\nSe o problema persiste, é posible que necesites desinstalala para mellorar o rendemento da batería."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"A tableta non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> mantena activa.\n\nPara tentar solucionar este problema, podes deter a aplicación.\n\nSe o problema persiste, é posible que necesites desinstalala para mellorar o rendemento da batería."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"O dispositivo non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> manteno activo.\n\nPara tentar solucionar este problema, podes deter a aplicación.\n\nSe o problema persiste, é posible que necesites desinstalala para mellorar o rendemento da batería."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"O teléfono non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP_0">%1$s</xliff:g> manteno activo.\n\nPara tentar solucionar este problema, podes deter <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe o problema persiste, é posible que necesites desinstalala para mellorar o rendemento da batería."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"A tableta non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP_0">%1$s</xliff:g> mantena activa.\n\nPara tentar solucionar este problema, podes deter <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe o problema persiste, é posible que necesites desinstalala para mellorar o rendemento da batería."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"O dispositivo non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP_0">%1$s</xliff:g> manteno activo.\n\nPara tentar solucionar este problema, podes deter <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe o problema persiste, é posible que necesites desinstalala 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="6936542136153283692">"Desactivar uso en segundo plano e deter a aplicación?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"O teléfono non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP_0">%1$s</xliff:g> manteno activo .\n\nPara solucionar este problema, podes deter <xliff:g id="APP_1">%1$s</xliff:g> e impedir que se execute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"A tableta non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP_0">%1$s</xliff:g> mantena activa.\n\nPara solucionar este problema, podes deter <xliff:g id="APP_1">%1$s</xliff:g> e impedir que se execute en segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"O dispositivo non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP_0">%1$s</xliff:g> manteno activo.\n\nPara solucionar este problema, podes deter <xliff:g id="APP_1">%1$s</xliff:g> e impedir que 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="7774807745601479888">"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 a utilizas.\n\nPara solucionar este problema, podes desactivar a localización para esta aplicación."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"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 a utilizas.\n\nPara solucionar este problema, podes desactivar a localización para esta aplicación."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"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 a utilizas.\n\nPara 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>
@@ -1953,7 +2033,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>
@@ -1976,7 +2056,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Uso de enerxía computado"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Uso de enerxía observado"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar a parada"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Información de aplicacións"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Información da aplicación"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configuración da aplicación"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Configuración da pantalla"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Configuración da wifi"</string>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Análise detallada desde a última carga completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última carga completa"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"O tempo restante da batería é aproximado e pode cambiar en función do uso"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Os datos da utilización da batería son aproximados e poden cambiar en función do uso"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Durante o uso activo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Mentres está en segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso da batería"</string>
@@ -2144,8 +2225,8 @@
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacen. credenciais activado"</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Tes que definir un PIN ou un contrasinal de pantalla de bloqueo para poder utilizar o almacenamento de credenciais."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps con acceso de uso"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de emerxencia"</string>
-    <string name="emergency_tone_summary" msgid="722259232924572153">"Define o comportamento cando se realiza unha chamada de emerxencia"</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de urxencia"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Define o comportamento cando se realiza unha chamada de urxencia"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Copia de seguranza"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Copia de seguranza e restauración"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos persoais"</string>
@@ -2201,7 +2282,7 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"Borrar"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Gardar"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
-    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Buscando redes…"</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Explorando redes…"</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Toca unha rede para conectarte a ela"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Conéctate a unha rede existente"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conéctate a unha rede non protexida"</string>
@@ -2333,8 +2414,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"É posible que esta función provoque que unha aplicación que dependa dos datos en segundo plano deixe de funcionar cando só estean dispoñibles redes móbiles.\n\nPodes atopar controis de uso de datos máis adecuados na configuración dispoñible na aplicación."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"A restrición de datos en segundo plano só é posible se estableciches un límite de datos móbiles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar autosincronización?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente na túa tableta.\n\nÉ posible que algunhas contas tamén copien automaticamente na web os cambios que efectúas na tableta. As contas de Google funcionan desta forma."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente no teu teléfono.\n\nÉ posible que algunhas contas tamén copien automaticamente na web os cambios que efectúas no teléfono. As contas de Google funcionan desta forma."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente na túa tableta.\n\nAlgunhas contas tamén poden copiar automaticamente na web os cambios que efectúas na tableta. As contas de Google funcionan desta forma."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente no teu teléfono.\n\nAlgunhas contas tamén poden copiar automaticamente na web os cambios que efectúas no teléfono. As contas de Google funcionan desta forma."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desactivar autosincronización?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto aforrará datos e uso da batería, pero terás que sincronizar cada conta manualmente para recompilar a información recente e non recibirás notificacións cando se efectúen actualizacións."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de restablecemento do ciclo de uso"</string>
@@ -2363,7 +2444,7 @@
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes wifi de pago por consumo"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes de pago por consumo, activa a wifi."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
-    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emerxencia"</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de urxencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver á chamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
     <string name="vpn_type" msgid="5435733139514388070">"Tipo"</string>
@@ -2534,7 +2615,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"O historial de chamadas compartirase con este usuario."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Activar chamadas telefónicas e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"O historial de chamadas e SMS compartirase con este usuario."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Información de emerxencia"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Información de urxencia"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Información e contactos para <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicacións e contido"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicacións con restricións"</string>
@@ -2564,7 +2645,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>
@@ -2579,7 +2660,7 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Xestor de chamadas"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Difusións de emerxencia"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Difusións de urxencia"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadores de rede"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Nomes dos puntos de acceso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo mellorado de LTE 4G"</string>
@@ -2654,9 +2735,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>
@@ -2695,7 +2779,7 @@
     <string name="keywords_users" msgid="3434190133131387942">"restrición, restrinxir, restrinxido"</string>
     <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"corrección de texto, correcto, son, vibrar, automático, idioma, xesto, suxerir, suxestión, tema, ofensivo, palabra, escribir, emoji, internacional"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"restablecer, preferencias, predeterminadas"</string>
-    <string name="keywords_emergency_app" msgid="3143078441279044780">"emerxencia, en caso de emerxencia, aplicación, predeterminada"</string>
+    <string name="keywords_emergency_app" msgid="3143078441279044780">"urxencia, en caso de urxencia, aplicación, predeterminada"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"teléfono, marcador, predeterminado"</string>
     <string name="keywords_all_apps" msgid="7814015440655563156">"aplicacións, descarga, aplicacións, sistema"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"aplicacións, permisos, seguranza"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"pasar o dedo para desbloquear, contrasinal, padrón, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafío de traballo, traballo, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de traballo, perfil xestionado, agrupar, agrupación traballo, perfil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"xesto"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"xestos"</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_assist_gesture_launch" msgid="813968759791342591">"xesto"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Só dos contactos marcados con estrela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ningunha"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"As alarmas sempre son prioritarias e emiten son"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os emisores de chamadas"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -2987,8 +3071,8 @@
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Cando introduzas o teu padrón para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Cando introduzas o teu contrasinal para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Nota: Tras un reinicio, non se pode iniciar esta aplicación ata que desbloquees o teléfono"</string>
-    <string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"Información relativa de IMEI"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"Información do IMEI"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"Información relativa ao IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Rañura<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Abrir de forma predeterminada"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Apertura de ligazóns"</string>
@@ -3095,6 +3179,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>
@@ -3117,7 +3210,7 @@
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Anular"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Cargar este dispositivo"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Só carga o dispositivo"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"Cargar dispositivos"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Subministrar corrente eléctrica"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carga o dispositivo conectado. Só funciona con dispositivos compatibles coa carga por USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferir ficheiros"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transferencia de ficheiros a outro dispositivo"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Activado"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Desactivado"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O cargador de inicio xa está desbloqueado"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronizar datos do traballo automaticamente"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Permite ás aplicacións actualizar os datos automaticamente"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronización da conta"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"A sincronización está activada para <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g> elementos"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"A sincronización está activada para todos os elementos"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"A sincronización está desactivada para todos os elementos"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Información sobre o dispositivo xestionado"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Os cambios e a configuración están xestionados pola túa organización"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Os cambios e a configuración están xestionados por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3566,12 +3676,13 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Outras aplicacións"</string>
     <string name="storage_files" msgid="8581083146777364063">"Ficheiros"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"En uso de: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"en uso de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"en uso"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Borrar aplicación"</string>
     <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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"activado"</string>
     <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="storage_movies_tv" msgid="5498394447562086890">"Apps de películas e TV"</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="698847081680980774">"Cales son as novidades fascinantes?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Consulta as 5 funcións principais"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Estado de rexistro de IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Rexistrado"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non rexistrado"</string>
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index bad1b55e8af30bdf9bcf290052253a94b612c72e..efeeda49219f439f06ffd273e7feabc039ccec18 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -30,7 +30,7 @@
     <item msgid="8392017019801393511">"તમામ"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 સેકંડ"</item>
+    <item msgid="3342301044271143016">"15 સેકન્ડ"</item>
     <item msgid="8881760709354815449">"30 સેકન્ડ"</item>
     <item msgid="7589406073232279088">"1 મિનિટ"</item>
     <item msgid="7001195990902244174">"2 મિનિટ"</item>
@@ -40,7 +40,7 @@
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"ક્યારેય નહીં"</item>
-    <item msgid="2194151041885903260">"15 સેકંડ"</item>
+    <item msgid="2194151041885903260">"15 સેકન્ડ"</item>
     <item msgid="5892295237131074341">"30 સેકન્ડ"</item>
     <item msgid="3538441365970038213">"1 મિનિટ"</item>
     <item msgid="412343871668955639">"2 મિનિટ"</item>
@@ -50,8 +50,8 @@
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"ત્વરિત"</item>
-    <item msgid="6736512735606834431">"5 સેકંડ"</item>
-    <item msgid="8044619388267891375">"15 સેકંડ"</item>
+    <item msgid="6736512735606834431">"5 સેકન્ડ"</item>
+    <item msgid="8044619388267891375">"15 સેકન્ડ"</item>
     <item msgid="1822002388249545488">"30 સેકન્ડ"</item>
     <item msgid="8538071621211916519">"1 મિનિટ"</item>
     <item msgid="5663439580228932882">"2 મિનિટ"</item>
@@ -107,7 +107,7 @@
     <item msgid="7981731051382306293">"TLS"</item>
     <item msgid="2892994535305020162">"TTLS"</item>
     <item msgid="435667726254379514">"PWD"</item>
-    <item msgid="8549485714107012129">"SIM"</item>
+    <item msgid="8549485714107012129">"સિમ"</item>
     <item msgid="1023893786681286517">"AKA"</item>
     <item msgid="3030483188676375009">"AKA\'"</item>
   </string-array>
@@ -122,8 +122,8 @@
     <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"પુશ બટન"</item>
-    <item msgid="1624323946324499595">"પીઅર ઉપકરણ પરથી PIN"</item>
-    <item msgid="5366790421523328066">"આ ઉપકરણ પરથી PIN"</item>
+    <item msgid="1624323946324499595">"પીઅર ઉપકરણ પરથી પિન"</item>
+    <item msgid="5366790421523328066">"આ ઉપકરણ પરથી પિન"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"કનેક્ટ કર્યું"</item>
@@ -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>
@@ -179,7 +169,7 @@
     <item msgid="5760470455461128892">"કોઈ નહીં"</item>
     <item msgid="7480272092408291086">"MSCHAPV2"</item>
     <item msgid="5881794903338319324">"GTC"</item>
-    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="5610607665198791980">"સિમ"</item>
     <item msgid="2860798636241124128">"AKA"</item>
     <item msgid="8926455723452645935">"AKA\'"</item>
   </string-array>
@@ -258,7 +248,7 @@
     <item msgid="446877710771379667">"કૅલેન્ડર વાંચો"</item>
     <item msgid="7674458294386319722">"કૅલેન્ડર સંશોધિત કરો"</item>
     <item msgid="8281201165558093009">"wi-fi સ્કેન કરો"</item>
-    <item msgid="8694611243479480497">"સૂચના"</item>
+    <item msgid="8694611243479480497">"નોટિફિકેશન"</item>
     <item msgid="7776439107987345446">"સેલ સ્કેન"</item>
     <item msgid="514615766544675057">"કૉલ કરો"</item>
     <item msgid="8181415497109310680">"SMS વાંચો"</item>
@@ -280,14 +270,14 @@
     <item msgid="3045529469061083747">"ક્લિપબોર્ડ સંશોધિત કરો"</item>
     <item msgid="5124443975763747838">"મીડિયા બટન્સ"</item>
     <item msgid="4547883971364273343">"ઑડિઓ ફોકસ"</item>
-    <item msgid="2603878814882344450">"માસ્ટર વોલ્યુમ"</item>
-    <item msgid="7136963238377062018">"વૉઇસ વોલ્યુમ"</item>
-    <item msgid="4270236897655923007">"રિંગ વોલ્યુમ"</item>
+    <item msgid="2603878814882344450">"માસ્ટર વૉલ્યૂમ"</item>
+    <item msgid="7136963238377062018">"વૉઇસ વૉલ્યૂમ"</item>
+    <item msgid="4270236897655923007">"રિંગ વૉલ્યૂમ"</item>
     <item msgid="6325739889222559394">"મીડિયા વૉલ્યૂમ"</item>
-    <item msgid="5762123934816216821">"એલાર્મ વોલ્યુમ"</item>
-    <item msgid="785049718065337473">"સૂચના વૉલ્યૂમ"</item>
-    <item msgid="6700305533746877052">"Bluetooth વૉલ્યૂમ"</item>
-    <item msgid="2029227495214047094">"જાગૃત રહો"</item>
+    <item msgid="5762123934816216821">"એલાર્મ વૉલ્યૂમ"</item>
+    <item msgid="785049718065337473">"નોટિફિકેશન વૉલ્યૂમ"</item>
+    <item msgid="6700305533746877052">"બ્લૂટૂથ વૉલ્યૂમ"</item>
+    <item msgid="2029227495214047094">"સક્રિય રાખો"</item>
     <item msgid="26109888160231211">"સ્થાનને મૉનિટર કરો"</item>
     <item msgid="5753382310468855812">"હાઇ પાવર સ્થાન મૉનિટર કરો"</item>
     <item msgid="3356591542543137332">"વપરાશ આંકડા મેળવો"</item>
@@ -325,7 +315,7 @@
     <item msgid="6093344633066170692">"કૅલેન્ડર વાંચો"</item>
     <item msgid="1334886368750347692">"કૅલેન્ડર સંશોધિત કરો"</item>
     <item msgid="1638204101698708656">"સ્થાન"</item>
-    <item msgid="2154671955760380322">"પોસ્ટ સૂચના"</item>
+    <item msgid="2154671955760380322">"પોસ્ટ નોટિફિકેશન"</item>
     <item msgid="4282477730595931828">"સ્થાન"</item>
     <item msgid="4891423912898525905">"કૉલ કરો"</item>
     <item msgid="2623604824935968113">"SMS/MMS વાંચો"</item>
@@ -347,14 +337,14 @@
     <item msgid="5238692940326972503">"ક્લિપબોર્ડ સંશોધિત કરો"</item>
     <item msgid="5753789168376302997">"મીડિયા બટન્સ"</item>
     <item msgid="3265262911688671938">"ઑડિઓ ફોકસ"</item>
-    <item msgid="2098976479485046797">"માસ્ટર વોલ્યુમ"</item>
-    <item msgid="5660213838861789350">"વૉઇસ વોલ્યુમ"</item>
-    <item msgid="7983336752371254444">"રિંગ વોલ્યુમ"</item>
+    <item msgid="2098976479485046797">"માસ્ટર વૉલ્યૂમ"</item>
+    <item msgid="5660213838861789350">"વૉઇસ વૉલ્યૂમ"</item>
+    <item msgid="7983336752371254444">"રિંગ વૉલ્યૂમ"</item>
     <item msgid="7878027809189330917">"મીડિયા વૉલ્યૂમ"</item>
-    <item msgid="7260546305036218513">"એલાર્મ વોલ્યુમ"</item>
-    <item msgid="9103719301075748925">"સૂચના વૉલ્યૂમ"</item>
-    <item msgid="7025966722295861512">"Bluetooth વૉલ્યૂમ"</item>
-    <item msgid="4665183401128289653">"જાગૃત રહો"</item>
+    <item msgid="7260546305036218513">"એલાર્મ વૉલ્યૂમ"</item>
+    <item msgid="9103719301075748925">"નોટિફિકેશન વૉલ્યૂમ"</item>
+    <item msgid="7025966722295861512">"બ્લૂટૂથ વૉલ્યૂમ"</item>
+    <item msgid="4665183401128289653">"સક્રિય રાખો"</item>
     <item msgid="8584357129746649222">"સ્થાન"</item>
     <item msgid="7669257279311110599">"સ્થાન"</item>
     <item msgid="3459320345690097795">"ઉપયોગના આંકડા મેળવો"</item>
@@ -463,7 +453,7 @@
     <item msgid="5069825997142785829">"નિરંતર"</item>
     <item msgid="5779398140277006695">"ટોચની પ્રવૃત્તિ"</item>
     <item msgid="1439598363694578255">"મહત્વપૂર્ણ (અગ્રભૂમિ)"</item>
-    <item msgid="3396458970745718652">"મહત્વપૂર્ણ (પૃષ્ઠભૂમિ)"</item>
+    <item msgid="3396458970745718652">"મહત્વપૂર્ણ (બૅકગ્રાઉન્ડ)"</item>
     <item msgid="5214825238247511992">"બેકઅપ"</item>
     <item msgid="311372689168254967">"ભારે વજન"</item>
     <item msgid="7438189122367820362">"સેવા (ચાલે છે)"</item>
@@ -484,8 +474,8 @@
     <item msgid="6131821495505931173">"લાલ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
-    <item msgid="687318592238852312">"30 દિવસથી વધુ જૂનું"</item>
-    <item msgid="2900554746706302178">"60 દિવસથી વધુ જૂનું"</item>
-    <item msgid="5692284879054004388">"90 દિવસથી વધુ જૂનું"</item>
+    <item msgid="687318592238852312">"30 દિવસથી વધુ જૂના"</item>
+    <item msgid="2900554746706302178">"60 દિવસથી વધુ જૂના"</item>
+    <item msgid="5692284879054004388">"90 દિવસથી વધુ જૂના"</item>
   </string-array>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index acc4f612d3db5a5a88b64e9cd77bbfcb66b4856c..13f1349e30d0c057f0c50c2ae6b7f57cd5bae955 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>
@@ -39,10 +40,11 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ડેટા કનેક્શન સક્ષમ કરો"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ડેટા કનેક્શન અક્ષમ કરો"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ની જોગવાઈ કરી"</string>
-    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"વિડિઓ કૉલિંગની જોગવાઈ કરી"</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_viewADN" msgid="7069468158519465139">"સિમ સરનામાં પુસ્તિકા જુઓ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ફિક્સ્ડ ડાયલિંગ નંબર્સ જુઓ"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"સેવા ડાયલિંગ નંબર્સ જુઓ"</string>
     <string name="radioInfo_menu_getIMS" msgid="185171476413967831">"IMS સેવા સ્થિતિ"</string>
@@ -51,7 +53,7 @@
     <string name="radio_info_ims_reg_status_not_registered" msgid="4438054067642750717">"નોંધણી કરેલ નથી"</string>
     <string name="radio_info_ims_feature_status_available" msgid="3687807290327566879">"ઉપલબ્ધ"</string>
     <string name="radio_info_ims_feature_status_unavailable" msgid="4606182208970114368">"અનુપલબ્ધ"</string>
-    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS નોંધણી: <xliff:g id="STATUS">%1$s</xliff:g>\nLTE પર વૉઇસ: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nWiFi પર વૉઇસ: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nવિડિઓ કૉલિંગ: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT ઇન્ટરફેસ: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS નોંધણી: <xliff:g id="STATUS">%1$s</xliff:g>\nLTE પર વૉઇસ: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nWiFi પર વૉઇસ: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nવીડિઓ કૉલિંગ: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT ઇન્ટરફેસ: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1697703164394784618">"સેવામાં"</string>
     <string name="radioInfo_service_out" msgid="7999094221728929681">"કાર્યરત્ નથી"</string>
     <string name="radioInfo_service_emergency" msgid="6274434235469661525">"ફક્ત કટોકટીના કૉલ્સ"</string>
@@ -90,15 +92,15 @@
     <string name="font_size_save" msgid="3450855718056759095">"ઓકે"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB સ્ટોરેજ"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD કાર્ડ"</string>
-    <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"નજીકનાં તમામ Bluetooth ઉપકરણો પર દૃશ્યક્ષમ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"નજીકનાં તમામ Bluetooth ઉપકરણો પર દૃશ્યક્ષમ"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"અન્ય Bluetooth ઉપકરણોને દૃશ્યક્ષમ નથી"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"બ્લૂટૂથ"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"નજીકનાં તમામ બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"નજીકનાં તમામ બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"અન્ય બ્લૂટૂથ ઉપકરણોને દૃશ્યક્ષમ નથી"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ફક્ત જોડી કરેલ ઉપકરણો પર દૃશ્યક્ષમ છે"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"દૃશ્યતાની સમયસમાપ્તિ"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"વૉઇસ ડાયલિંગ લૉક કરો"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"જ્યારે સ્ક્રીન લૉક થયેલ હોય ત્યારે બ્લૂટૂથ ડાયલરના ઉપયોગને અટકાવો"</string>
-    <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth ઉપકરણો"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"બ્લૂટૂથ ઉપકરણો"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"ઉપકરણનું નામ"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"ઉપકરણ સેટિંગ્સ"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"પ્રોફાઇલ સેટિંગ્સ"</string>
@@ -106,47 +108,54 @@
     <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_empty_list_user_restricted" msgid="603521233563983689">"તમારી પાસે Bluetooth સેટિંગ્સ બદલવાની પરવાનગી નથી."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"જ્યારે Bluetooth  સેટિંગ્સ ખુલ્લી હોય ત્યારે <xliff:g id="DEVICE_NAME">%1$s</xliff:g> નજીકનાં ઉપકરણોને દૃશ્યક્ષમ છે."</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>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"આને અક્ષમ કરવામાં આવશે:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;દ્વારા:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_device" msgid="5291950341750186887">"અનામાંકિત Bluetooth ઉપકરણ"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"અનામાંકિત બ્લૂટૂથ ઉપકરણ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"શોધી રહ્યું છે"</string>
-    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"કોઈ નજીકનાં Bluetooth ઉપકરણો મળ્યાં નહોતા."</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth જોડી કરવાની વિનંતી"</string>
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"કોઈ નજીકનાં બ્લૂટૂથ ઉપકરણો મળ્યાં નહોતા."</string>
+    <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="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>
-    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"કોઈ ઍપ્લિકેશન Bluetooth ચાલુ કરવા માગે છે"</string>
-    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"કોઈ ઍપ્લિકેશન Bluetooth બંધ કરવા માગે છે"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટેબ્લેટને અન્ય Bluetooth ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકંડ માટે તમારા ફોનને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય Bluetooth ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય Bluetooth ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટેબ્લેટને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ફોનને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય Bluetooth ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"કોઈ ઍપ્લિકેશન Bluetooth ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"ઍપ્લિકેશન Bluetooth ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકંડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"કોઈ ઍપ્લિકેશન Bluetooth ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"કોઈ ઍપ્લિકેશન Bluetooth ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી Bluetooth સેટિંગ્સમાં બદલી શકો છો."</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth ચાલુ કરી રહ્યું છે…"</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth બંધ થઈ રહ્યું છે…"</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>
+    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા માગે છે"</string>
+    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ બંધ કરવા માગે છે"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g>, <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g>, તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"કોઈ ઍપ્લિકેશન તમારા ટેબ્લેટને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"કોઈ ઍપ્લિકેશન તમારા ફોનને અન્ય બ્લૂટૂથ ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%2$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર <xliff:g id="TIMEOUT">%1$d</xliff:g> સેકન્ડ માટે દૃશ્યક્ષમ બનાવવા માગે છે."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g>, બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ટેબ્લેટને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"બ્લૂટૂથ ચાલુ કરી રહ્યું છે…"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"બ્લૂટૂથ બંધ થઈ રહ્યું છે…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"સ્વતઃ કનેક્ટ કરો"</string>
-    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth કનેક્શન વિનંતી"</string>
+    <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"બ્લૂટૂથ કનેક્શન વિનંતી"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" સાથે કનેક્ટ કરવા માટે ટૅપ કરો."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"શું તમે \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" સાથે કનેક્ટ કરવા માંગો છો?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ફોન પુસ્તિકા ઍક્સેસની વિનંતી"</string>
@@ -155,8 +164,11 @@
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"ફરીથી પૂછશો નહીં"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"સંદેશ ઍક્સેસ વિનંતી"</string>
     <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_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) -->
@@ -274,7 +286,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"એરપ્લેન મોડ"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"વધુ"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"વાયરલેસ અને નેટવર્ક્સ"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, એરપ્લેન મોડ, મોબાઇલ નેટવર્ક્સ અને VPN સંચાલિત કરો"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"વાઇ-ફાઇ, બ્લૂટૂથ, એરપ્લેન મોડ, મોબાઇલ નેટવર્ક્સ અને VPN સંચાલિત કરો"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"મોબાઇલ ડેટા"</string>
     <string name="calls_title" msgid="3544471959217176768">"કૉલ્સ"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS સંદેશા"</string>
@@ -297,7 +309,7 @@
     <string name="date_time_auto" msgid="7076906458515908345">"સ્વચાલિત તારીખ અને સમય"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"નેટવર્ક દ્વારા પ્રદાન કરવામાં આવેલ સમયનો ઉપયોગ કરો"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"નેટવર્ક દ્વારા પ્રદાન કરવામાં આવેલ સમયનો ઉપયોગ કરો"</string>
-    <string name="zone_auto" msgid="334783869352026648">"સ્વચલિત સમય ઝોન"</string>
+    <string name="zone_auto" msgid="334783869352026648">"સ્વચાલિત સમય ઝોન"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"નેટવર્ક દ્વારા પ્રદાન કરાયેલ સમય ઝોનનો ઉપયોગ કરો"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"નેટવર્ક દ્વારા પ્રદાન કરાયેલ સમય ઝોનનો ઉપયોગ કરો"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑કલાકનું ફોર્મેટ"</string>
@@ -322,14 +334,14 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"વ્યવસ્થાપકે અક્ષમ કરેલ"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"કોઈ નહીં"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"દા.ત., જૉનું Android."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"દા.ત., જો નું Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"વપરાશકર્તા માહિતી"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"લૉક સ્ક્રીન પર પ્રોફાઇલ માહિતી બતાવો"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"પ્રોફાઇલ માહિતી"</string>
     <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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"એ થોડા સમય પછી કરશો"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ફિંગરપ્રિન્ટ સેટ કરવાનું છોડીએ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"તમે તમારા ફોનને અનલૉક કરવા માટેની એક રીત તરીકે તમારી ફિંગરપ્રિન્ટને ઉપયોગમાં લેવાનું પસંદ કર્યું છે. જો તમે હવે છોડી દો છો, તો તમારે આને પછીથી સેટ કરવું પડશે. સેટઅપમાં માત્ર એક મિનિટ અથવા તેથી વધુ સમય લાગે છે."</string>
     <string name="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>
@@ -444,11 +455,13 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ટેબ્લેટની સુરક્ષા કરો"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ઉપકરણને સુરક્ષિત કરો"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ફોનની સુરક્ષા કરો"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"વધારાની સુરક્ષા માટે, એક બેકઅપ સ્ક્રીન લૉક સેટ કરો."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"વધારાની સુરક્ષા માટે, એક બૅકઅપ સ્ક્રીન લૉક સેટ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ટેબ્લેટનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <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="1688030823464420974">"જો તમે આગલા પ્રયત્નમાં ખોટી પૅટર્ન દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"જો તમે આગલા પ્રયત્નમાં ખોટો પિન દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"જો તમે આગલા પ્રયત્નમાં ખોટો પાસવર્ડ દાખલ કરશો, તો આ ઉપકરણનો ડેટા કાઢી નાખવામાં આવશે"</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="5047439819181833824">"ઘણા બધા ખોટા પ્રયત્નો. આ ઉપકરણોનો ડેટા કાઢી નાખવામાં આવશે."</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>
@@ -581,13 +602,13 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> સક્રિય ટ્રસ્ટ એજન્ટ</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> સક્રિય ટ્રસ્ટ એજન્ટ</item>
     </plurals>
-    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
-    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth ચાલુ કરો"</string>
-    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"બ્લૂટૂથ"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"બ્લૂટૂથ ચાલુ કરો"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"બ્લૂટૂથ"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"બ્લૂટૂથ"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"કનેક્શન્સ સંચાલિત કરો, ઉપકરણનું નામ અને શોધક્ષમતા સેટ કરો"</string>
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી કરીએ?"</string>
-    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"Bluetooth નો જોડી બનાવવાનો કોડ"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"બ્લૂટૂથ નો જોડી બનાવવાનો કોડ"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"જોડી બનાવવાનો કોડ લખો તે પછી Return અથવા Enter દબાવો"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"પિન અક્ષરો અથવા સંજ્ઞાઓનો સમાવે છે"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"સામાન્ય રીતે 0000 અથવા 1234"</string>
@@ -612,7 +633,7 @@
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"આ ઉપકરણ સાથે જોડી કરીએ?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ફોન પુસ્તિકા શેર કરીએ?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> તમારા સંપર્કો અને કૉલ ઇતિહાસને અ‍ૅક્સેસ કરવા માંગે છે."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, Bluetooth સાથે જોડી કરવા માંગે છે. જ્યારે કનેક્ટ થયેલ હોય, ત્યારે તેની પાસે તમારા સંપર્કો અને કૉલ ઇતિહાસની ઍક્સેસ હશે."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, બ્લૂટૂથ સાથે જોડી કરવા માંગે છે. જ્યારે કનેક્ટ થયેલ હોય, ત્યારે તેની પાસે તમારા સંપર્કો અને કૉલ ઇતિહાસની ઍક્સેસ હશે."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"જોડી કરેલા ઉપકરણો"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"ઉપલબ્ધ ઉપકરણો"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"કોઈ ઉપકરણો ઉપલબ્ધ નથી"</string>
@@ -623,9 +644,17 @@
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ડિસ્કનેક્ટ કરો અને જોડી અલગ કરો"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"વિકલ્પો..."</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"વિગતવાર"</string>
-    <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_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>
@@ -633,9 +662,9 @@
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> મારફતે ઇન્ટરનેટ ઍક્સેસને ડિસ્કનેક્ટ કરવામાં આવશે."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> આ ટેબ્લેટના ઇન્ટરનેટ કનેક્શનને શેર કરવામાંથી ડિસ્કનેક્ટ કરશે."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> આ ફોનના ઇન્ટરનેટ કનેક્શનને શેર કરવામાંથી ડિસ્કનેક્ટ કરશે."</string>
-    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"જોડી કરેલ Bluetooth ઉપકરણ"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"જોડી કરેલ બ્લૂટૂથ ઉપકરણ"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"કનેક્ટ કરો"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Bluetooth ઉપકરણ સાથે કનેક્ટ કરો"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"બ્લૂટૂથ ઉપકરણ સાથે કનેક્ટ કરો"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"આ માટે ઉપયોગ કરો"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"નામ બદલો"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"આવનારા ફાઇલ સ્થાનાંતરોને મંજૂરી આપો"</string>
@@ -653,16 +682,16 @@
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"કનેક્ટ કર્યું"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"ઉપયોગમાં છે"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"અનુપલબ્ધ"</string>
-    <string name="wifi_display_details" msgid="7791118209992162698">"પ્રદર્શન સેટિંગ્સ"</string>
-    <string name="wifi_display_options_title" msgid="5740656401635054838">"વાયરલેસ પ્રદર્શન વિકલ્પો"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"ડિસ્પ્લે સેટિંગ્સ"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"વાયરલેસ ડિસ્પ્લે વિકલ્પો"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"ભૂલી જાઓ"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"થઈ ગયું"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"નામ"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
-    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g>, Wi-Fi ચાલુ કરવા માગે છે"</string>
-    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g>, Wi-Fi બંધ કરવા માગે છે"</string>
+    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g>, વાઇ-ફાઇ ચાલુ કરવા માગે છે"</string>
+    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g>, વાઇ-ફાઇ બંધ કરવા માગે છે"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"જ્યારે ટેબ્લેટ બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"જ્યારે ફોન બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
@@ -673,52 +702,55 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"બંધ"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC બંધ હોવાને કારણે અનુપલબ્ધ"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android બીમ"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"જ્યારે આ સુવિધા ચાલુ હોય, ત્યારે તમે ઉપકરણોને એકબીજાની નજીક રાખીને ઍપ્લિકેશનની સામગ્રીને બીજા NFC-સક્ષમ ઉપકરણ પર બીમ કરી શકો છો. ઉદાહરણ તરીકે, તમે વેબ પેજ, YouTube વિડિઓ, સંપર્કો અને વધુને બીમ કરી શકો છો.\n\nબસ ઉપકરણોને એકબીજાની નજીક લાવો (સામાન્ય રીતે એકબીજાની પાછળ) અને પછી તમારી સ્ક્રીનને ટૅપ કરો. શું બીમ થાય તે ઍપ્લિકેશન નક્કી કરે છે."</string>
-    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi ચાલુ કરો"</string>
-    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi સેટિંગ્સ"</string>
-    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"જ્યારે આ સુવિધા ચાલુ હોય, ત્યારે તમે ઉપકરણોને એકબીજાની નજીક રાખીને ઍપ્લિકેશનના કન્ટેન્ટને બીજા NFC-સક્ષમ ઉપકરણ પર બીમ કરી શકો છો. ઉદાહરણ તરીકે, તમે વેબ પેજ, YouTube વીડિઓ, સંપર્કો અને વધુને બીમ કરી શકો છો.\n\nબસ ઉપકરણોને એકબીજાની નજીક લાવો (સામાન્ય રીતે એકબીજાની પાછળ) અને પછી તમારી સ્ક્રીનને ટૅપ કરો. શું બીમ થાય તે ઍપ્લિકેશન નક્કી કરે છે."</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"વાઇ-ફાઇ"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"વાઇ-ફાઇ ચાલુ કરો"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"વાઇ-ફાઇ"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"વાઇ-ફાઇ સેટિંગ્સ"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"વાઇ-ફાઇ"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"વાયરલેસ ઍક્સેસ બિંદુઓને સેટ અને સંચાલિત કરો"</string>
-    <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi પસંદ કરો"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi ચાલુ કરી રહ્યું છે…"</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi બંધ થઈ રહ્યું છે…"</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"વાઇ-ફાઇ પસંદ કરો"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"વાઇ-ફાઇ ચાલુ કરી રહ્યું છે…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"વાઇ-ફાઇ બંધ થઈ રહ્યું છે…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ભૂલ"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"આ દેશમાં 5 GHz બેન્ડ ઉપલબ્ધ નથી"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"એરપ્લેન મોડમાં"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"નેટવર્ક સૂચના ખોલો"</string>
-    <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"જ્યારે ઉચ્ચ ગુણવત્તાવાળું સાર્વજનિક નેટવર્ક ઉપલબ્ધ હોય ત્યારે સૂચના આપો"</string>
-    <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi આપમેળે ચાલુ કરો"</string>
-    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ગુણવત્તાવાળા નેટવર્કની નજીકમાં આપમેળે ફરી ચાલુ થશે"</string>
-    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"અનુપલબ્ધ છે કારણ કે Wi-Fi સ્કેનિંગ બંધ છે"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"નેટવર્ક નોટિફિકેશન ખોલો"</string>
+    <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"જ્યારે ઉચ્ચ ગુણવત્તાવાળું સાર્વજનિક નેટવર્ક ઉપલબ્ધ હોય ત્યારે નોટિફિકેશન આપો"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"વાઇ-ફાઇ આપમેળે ચાલુ કરો"</string>
+    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"વાઇ-ફાઇ, તમારા હોમ નેટવર્ક જેવા, સાચવેલા ઉચ્ચ ગુણવત્તાવાળા નેટવર્કની નજીકમાં આપમેળે ફરી ચાલુ થશે"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"અનુપલબ્ધ છે કારણ કે વાઇ-ફાઇ સ્કેનિંગ બંધ છે"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"નબળા જોડાણો ટાળો"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"જ્યાં સુધી સારું ઇન્ટરનેટ કનેક્શન ન ધરાવતું હોય ત્યાં સુધી Wi‑Fi નેટવર્કનો ઉપયોગ કરશો નહીં"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"જ્યાં સુધી સારું ઇન્ટરનેટ કનેક્શન ન ધરાવતું હોય ત્યાં સુધી વાઇ-ફાઇ નેટવર્કનો ઉપયોગ કરશો નહીં"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ફક્ત સારું ઇન્ટરનેટ કનેક્શન ધરાવતા નેટવર્ક્સનો જ ઉપયોગ કરો"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ખુલ્લા નેટવર્કો સાથે કનેક્ટ કરો"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ઉચ્ચ ગુણવત્તાવાળા સાર્વજનિક નેટવર્ક સાથે આપમેળે કનેક્ટ કરો"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"આ સુવિધાનો ઉપયોગ કરવા માટે, નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"આ સુવિધાનો ઉપયોગ કરવા માટે, સુસંગત નેટવર્ક રેટિંગ પ્રદાતાને પસંદ કરો"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"પ્રમાણપત્રો ઇન્સ્ટોલ કરો"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"સ્થાન સચોટતા બહેતર બનાવવા માટે, સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓ હજી પણ 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"સ્થાનની સચોટતા સુધારવા માટે, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કૅનીંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g> માં જઈને Wi-Fi સ્કૅનીંગ ચાલુ કરો."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"સ્થાન સચોટતા બહેતર બનાવવા માટે, સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓ હજી પણ વાઇ-ફાઇ નેટવર્ક્સને સ્કેન કરી શકે છે. તમે આને <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કેનિંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g>માં બદલી શકો છો."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"સ્થાનની સચોટતા સુધારવા માટે, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>સ્કૅનીંગ સેટિંગ્સ<xliff:g id="LINK_END_1">LINK_END</xliff:g> માં જઈને વાઇ-ફાઇ સ્કૅનીંગ ચાલુ કરો."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ફરીથી બતાવશો નહીં"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"નિષ્ક્રિય દરમ્યાન Wi‑Fi ચાલુ રાખો"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"નિષ્ક્રિય હોય તે દરમ્યાન Wi‑Fi ચાલુ"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"નિષ્ક્રિય દરમ્યાન વાઇ-ફાઇ ચાલુ રાખો"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"નિષ્ક્રિય હોય તે દરમ્યાન વાઇ-ફાઇ ચાલુ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"સેટિંગ બદલવામાં એક સમસ્યા હતી"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"કાર્યક્ષમતા બહેતર બનાવો"</string>
-    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi ઓપ્ટિમાઇઝેશન"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi‑Fi ચાલુ હોય ત્યારે બૅટરી વપરાશને ન્યૂનતમ કરો"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi દ્વારા વપરાતી બૅટરીને સીમિત કરો"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"જો Wi‑Fi ઇન્ટરનેટની ઍક્સેસ ગુમાવે, તો મોબાઇલ ડેટા પર સ્વિચ કરો."</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"વાઇ-ફાઇ ઓપ્ટિમાઇઝેશન"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"વાઇ-ફાઇ ચાલુ હોય ત્યારે બૅટરી વપરાશને ન્યૂનતમ કરો"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"વાઇ-ફાઇ દ્વારા વપરાતી બૅટરીને સીમિત કરો"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"જો વાઇ-ફાઇ ઇન્ટરનેટની ઍક્સેસ ગુમાવે, તો મોબાઇલ ડેટા પર સ્વિચ કરો."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"મોબાઇલ ડેટા પર સ્વત: સ્વિચ કરો"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"જ્યારે Wi-Fiને ઇન્ટરનેટની ઍક્સેસ ન હોય, ત્યારે મોબાઇલ ડેટાનો ઉપયોગ કરો. ડેટા વપરાશ લાગુ થઈ શકે છે."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"નેટવર્ક ઉમેરો"</string>
-    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi પસંદગીઓ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi ફરી આપમેળે ચાલુ થાય છે"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi પાછું આપમેળે ચાલુ થતું નથી"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi નેટવર્ક્સ"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"વાઇ-ફાઇ પસંદગીઓ"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"વાઇ-ફાઇ ફરી આપમેળે ચાલુ થાય છે"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"વાઇ-ફાઇ પાછું આપમેળે ચાલુ થતું નથી"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"વાઇ-ફાઇ નેટવર્ક્સ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS પુશ બટન"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"વધુ વિકલ્પો"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS પિન એન્ટ્રી"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"વાઇ-ફાઇ ડાઇરેક્ટ"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"સ્કેન"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"વિગતવાર"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"ગોઠવો"</string>
@@ -727,27 +759,27 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"નેટવર્કને ભૂલી જાઓ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"નેટવર્ક સંશોધિત કરો"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ટૅગ પર લખો"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ઉપલબ્ધ નેટવર્ક્સ જોવા માટે, Wi‑Fi ચાલુ કરો."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fi નેટવર્ક્સ માટે શોધી રહ્યું છે..."</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"તમને Wi‑Fi નેટવર્ક બદલવાની પરવાનગી નથી."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ઉપલબ્ધ નેટવર્ક્સ જોવા માટે, વાઇ-ફાઇ ચાલુ કરો."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"વાઇ-ફાઇ નેટવર્ક્સ માટે શોધી રહ્યું છે..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"તમને વાઇ-ફાઇ નેટવર્ક બદલવાની પરવાનગી નથી."</string>
     <string name="wifi_more" msgid="3195296805089107950">"વધુ"</string>
-    <string name="wifi_setup_wps" msgid="8128702488486283957">"સ્વયંચાલિત સેટઅપ (WPS)"</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"ઑટોમૅટિક સેટઅપ (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"વિગતવાર વિકલ્પો"</string>
     <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ડ્રોપ ડાઉન સૂચિ વિગતવાર વિકલ્પો. સંકુચિત કરવા માટે બે વાર ટૅપ કરો."</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ડ્રોપ ડાઉન સૂચિ વિગતવાર વિકલ્પો. વિસ્તૃત કરવા માટે બે વાર ટૅપ કરો."</string>
-    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi-Fi સુરક્ષિત સેટઅપ"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"વાઇ-ફાઇ સુરક્ષિત સેટઅપ"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS પ્રારંભ કરી રહ્યું છે…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"તમારા રાઉટર પર Wi‑Fi સંરક્ષિત સેટઅપ બટન દબાવો. તેને \"WPS\" પણ કહેવામાં આવી શકે છે અથવા આ પ્રતીક વડે ચિહ્નિત કરવામાં આવેલું હોઇ શકે છે:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"તમારા રાઉટર પર વાઇ-ફાઇ સંરક્ષિત સેટઅપ બટન દબાવો. તેને \"WPS\" પણ કહેવામાં આવી શકે છે અથવા આ પ્રતીક વડે ચિહ્નિત કરવામાં આવેલું હોઇ શકે છે:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"તમારા વાઇ-ફાઇ રાઉટર પર પિન <xliff:g id="NUMBER">%1$s</xliff:g> દાખલ કરો. સેટઅપને પૂર્ણ થવામાં બે મિનિટનો સમય લાગી શકે છે."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS સફળ થયું. નેટવર્ક સાથે કનેક્ટ કરી રહ્યું છે…"</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi‑Fi નેટવર્ક  <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરેલ"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"વાઇ-ફાઇ નેટવર્ક  <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરેલ"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS પહેલાંથી જ પ્રગતિમાં છે અમે તેમે પૂર્ણ થવામાં બે મિનિટનો સમય લાગી શકે છે"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS નિષ્ફળ. કૃપા કરીને થોડીવારમાં ફરી પ્રયાસ કરો."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"વાયરલેસ રાઉટર સુરક્ષા સેટિંગ (WEP) સમર્થિત નથી"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"વાયરલેસ રાઉટર સુરક્ષા સેટિંગ (TKIP) સમર્થિત નથી"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"નિષ્ફળ થયું. કૃપા કરીને ફરીથી પ્રયાસ કરો."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"અન્ય એક WPS સત્ર મળ્યું હતું. કૃપા કરીને થોડી મિનિટ્સમાં ફરીથી પ્રયાસ કરશો."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi ડિસ્કનેક્ટ થયું. WPS સેટઅપ રદ કરાયું."</string>
+    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"વાઇ-ફાઇ ડિસ્કનેક્ટ થયું. WPS સેટઅપ રદ કરાયું."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"નેટવર્કનું નામ"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID દાખલ કરો"</string>
     <string name="wifi_security" msgid="6603611185592956936">"સુરક્ષા"</string>
@@ -779,11 +811,12 @@
     <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>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"તમારો નેટવર્ક પાસવર્ડ દાખલ કરો"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"સ્થાન સચોટતા બહેતર બનાવવા માટે અને અન્ય હેતુઓ માટે, Wi-Fi બંધ હોય ત્યારે પણ <xliff:g id="APP_NAME">%1$s</xliff:g> નેટવર્ક સ્કેનિંગ ચાલુ કરવા માંગે છે.\n\nસ્કેન કરવા માંગે છે તે બધી ઍપ્લિકેશનો માટે આને મંજૂરી આપીએ?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"સ્થાન સચોટતા બહેતર બનાવવા માટે અને અન્ય હેતુઓ માટે, વાઇ-ફાઇ બંધ હોય ત્યારે પણ <xliff:g id="APP_NAME">%1$s</xliff:g> નેટવર્ક સ્કેનિંગ ચાલુ કરવા માંગે છે.\n\nસ્કેન કરવા માંગે છે તે બધી ઍપ્લિકેશનો માટે આને મંજૂરી આપીએ?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"આ બંધ કરવા માટે, ઓવરફ્લો મેનૂમાં વિગતવાર પર જાઓ."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"મંજૂરી આપો"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"નકારો"</string>
@@ -792,10 +825,10 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"કનેક્ટ કરો"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"આ નેટવર્કને ઇન્ટરનેટની ઍક્સેસ નથી. કનેક્ટ રહીએ?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"આ નેટવર્ક વિશે મને ફરીથી પૂછશો નહીં"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi ઇન્ટરનેટ સાથે કનેક્ટ કરેલ નથી"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"જ્યારે પણ Wi-Fi કનેક્શન ખરાબ હોય, ત્યારે તમે મોબાઇલ નેટવર્ક પર સ્વિચ કરી શકો છો. ડેટા વપરાશ માટે શુલ્ક લાગુ થઈ શકે છે."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"વાઇ-ફાઇ ઇન્ટરનેટ સાથે કનેક્ટ કરેલ નથી"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"જ્યારે પણ વાઇ-ફાઇ કનેક્શન ખરાબ હોય, ત્યારે તમે મોબાઇલ નેટવર્ક પર સ્વિચ કરી શકો છો. ડેટા વપરાશ માટે શુલ્ક લાગુ થઈ શકે છે."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"મોબાઇલ પર સ્વિચ કરો"</string>
-    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi-Fi પર રહો"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"વાઇ-ફાઇ પર રહો"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"ફરી ક્યારેય બતાવશો નહીં"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"કનેક્ટ કરો"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"નેટવર્ક સાથે કનેક્ટ કરવામાં નિષ્ફળ થયાં"</string>
@@ -809,8 +842,7 @@
       <item quantity="one">%d નેટવર્ક</item>
       <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_titlebar" msgid="4485841401774142908">"વિગતવાર વાઇ-ફાઇ"</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>
@@ -818,7 +850,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 સરનામા"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"સાચવેલા નેટવર્ક્સ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP સેટિંગ્સ"</string>
-    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"આ વપરાશકર્તા માટે Wi‑Fi વિગતવાર સેટિંગ્સ ઉપલબ્ધ નથી"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"આ વપરાશકર્તા માટે વાઇ-ફાઇ વિગતવાર સેટિંગ્સ ઉપલબ્ધ નથી"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"સાચવો"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"રદ કરો"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"એક માન્ય IP સરનામું લખો."</string>
@@ -829,7 +861,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"ગેટવે"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"નેટવર્ક પ્રીફિક્સ લંબાઈ"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"વાઇ-ફાઇ ડાઇરેક્ટ"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ઉપકરણ માહિતી"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"આ કનેક્શન યાદ રાખો"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ઉપકરણો શોધો"</string>
@@ -847,9 +879,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">"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">"વાઇ-ફાઇ પાસવર્ડ"</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>
@@ -861,7 +901,7 @@
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"વાઇ-ફાઇ કૉલિંગ"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"વાઇ-ફાઇ કૉલિંગ ચાલુ કરો"</string>
-    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"મોબાઇલ નેટવર્કને બદલે Wi-Fi નો ઉપયોગ કરો"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"મોબાઇલ નેટવર્કને બદલે વાઇ-ફાઇ નો ઉપયોગ કરો"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"કૉલિંગ પસંદગી"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"વાઇ-ફાઇ કૉલિંગ મોડ"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"રોમિંગ પસંદગી"</string>
@@ -869,14 +909,14 @@
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"રોમિંગ પસંદગી"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"Wi-Fi પસંદ કર્યું"</item>
+    <item msgid="2124257075906188844">"વાઇ-ફાઇ પસંદ કર્યું"</item>
     <item msgid="1335127656328817518">"મોબાઇલને પસંદગી"</item>
-    <item msgid="3132912693346866895">"ફક્ત Wi-Fi"</item>
+    <item msgid="3132912693346866895">"ફક્ત વાઇ-ફાઇ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="742988808283756263">"Wi-Fi"</item>
+    <item msgid="742988808283756263">"વાઇ-ફાઇ"</item>
     <item msgid="7715869266611010880">"મોબાઇલ"</item>
-    <item msgid="2838022395783120596">"ફક્ત Wi-Fi"</item>
+    <item msgid="2838022395783120596">"ફક્ત વાઇ-ફાઇ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
@@ -884,11 +924,11 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"Wi-Fi પસંદ કર્યું"</item>
+    <item msgid="5782108782860004851">"વાઇ-ફાઇ પસંદ કર્યું"</item>
     <item msgid="5074515506087318555">"મોબાઇલને પસંદગી"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="6132150507201243768">"Wi-Fi"</item>
+    <item msgid="6132150507201243768">"વાઇ-ફાઇ"</item>
     <item msgid="1118703915148755405">"મોબાઇલ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values_without_wifi_only">
@@ -896,6 +936,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">"જો તમે WiFi નો ઉપયોગ કરીને 911 કૉલ કરો તો કટોકટીની સેવાઓ દ્વારા તમારા સ્થાનનો સરનામા તરીકે ઉપયોગ કરવામાં આવે છે"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ડિસ્પ્લે"</string>
@@ -904,14 +945,14 @@
     <string name="musicfx_title" msgid="3415566786340790345">"સંગીત પ્રભાવો"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"રિંગ વૉલ્યુમ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"શાંત હોય ત્યારે વાઇબ્રેટ કરો"</string>
-    <string name="notification_sound_title" msgid="5137483249425507572">"ડિફોલ્ટ સૂચના માટે ધ્વનિ"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"રિંગટોન"</string>
-    <string name="notification_volume_title" msgid="2012640760341080408">"સૂચના"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"નોટિફિકેશન"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"સૂચનાઓ માટે ઇનકમિંગ કૉલ વોલ્યુમનો ઉપયોગ કરો"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"કાર્ય પ્રોફાઇલ્સનું સમર્થન કરતું નથી"</string>
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ડિફોલ્ટ સૂચના માટે ધ્વનિ"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"મીડિયા"</string>
-    <string name="media_volume_summary" msgid="5363248930648849974">"સંગીત અને વિડિઓ માટે વોલ્યૂમ સેટ કરો"</string>
+    <string name="media_volume_summary" msgid="5363248930648849974">"સંગીત અને વીડિઓ માટે વોલ્યૂમ સેટ કરો"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"એલાર્મ"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"જોડેલ ડોક માટેની ઑડિઓ સેટિંગ્સ"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ડાયલ પેડ ટચ ટોન્સ"</string>
@@ -919,9 +960,9 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"સ્ક્રીન લૉક ધ્વનિ"</string>
     <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"ટૅપ કરવા પર વાઇબ્રેટ કરો"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"અવાજ રદ્દીકરણ"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"સંગીત, વિડિઓ, રમતો, અને અને અન્ય મીડિયા"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"સંગીત, વીડિઓ, રમતો, અને અને અન્ય મીડિયા"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"રિંગટોન અને સૂચનાઓ"</string>
-    <string name="volume_notification_description" msgid="5810902320215328321">"સૂચનાઓ"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"નોટિફિકેશનો"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"એલાર્મ્સ"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"રિંગટોન અને સૂચનાઓ મ્યૂટ કરો"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"સંગીત અને અન્ય મીડિયાને મ્યૂટ કરો"</string>
@@ -951,8 +992,9 @@
     <string name="search_settings" msgid="1910951467596035063">"શોધો"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"શોધ સેટિંગ્સ અને ઇતિહાસ સંચાલિત કરો"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"કોઈ પરિણામ નથી"</string>
-    <string name="display_settings" msgid="7965901687241669598">"પ્રદર્શન"</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>
@@ -980,24 +1022,23 @@
     <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="screen_timeout" msgid="4351334843529712571">"નિષ્ક્રિય થાઓ"</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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"વૉલપેપર"</string>
@@ -1020,8 +1061,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="doze_summary" msgid="3846219936142814032">"જ્યારે તમને સૂચનાઓ પ્રાપ્ત થાય ત્યારે સ્ક્રીન સક્રિય કરો"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ઍમ્બિઅન્ટ ડિસ્પ્લે"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"હંમેશા ચાલુ / વધારેલ બૅટરી વપરાશ"</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="6978257596231155345">"સમય, નોટિફિકેશનના આઇકન અને અન્ય માહિતી બતાવો. વધારેલ બૅટરી વપરાશ."</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>
@@ -1049,12 +1096,12 @@
     <string name="sim_lock_failed" msgid="2489611099235575984">"સિમ કાર્ડ લૉક સ્થિતિ બદલી શકાતી નથી.\nસંભવિતરૂપે ખોટો પિન છે."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ઓકે"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"રદ કરો"</string>
-    <string name="sim_multi_sims_title" msgid="9159427879911231239">"બહુવિધ SIM મળી"</string>
-    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"મોબાઇલ ડેટા માટે તમારી પસંદગીનું SIM પસંદ કરો."</string>
-    <string name="sim_change_data_title" msgid="294357201685244532">"ડેટા SIM બદલીએ?"</string>
+    <string name="sim_multi_sims_title" msgid="9159427879911231239">"બહુવિધ સિમ મળી"</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"મોબાઇલ ડેટા માટે તમારી પસંદગીનું સિમ પસંદ કરો."</string>
+    <string name="sim_change_data_title" msgid="294357201685244532">"ડેટા સિમ બદલીએ?"</string>
     <string name="sim_change_data_message" msgid="5854582807996717811">"મોબાઇલ ડેટા માટે <xliff:g id="OLD_SIM">%2$s</xliff:g>ને બદલે <xliff:g id="NEW_SIM">%1$s</xliff:g>નો ઉપયોગ કરીએ?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"મનપસંદ સિમ કાર્ડ અપડેટ કરીએ?"</string>
-    <string name="sim_preferred_message" msgid="8466930554330635780">"તમારા ઉપકરણમાં એકમાત્ર <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM છે. શું તમે મોબાઇલ ડેટા, કૉલ અને SMS સંદેશા માટે આ SIMનો ઉપયોગ કરવા માગો છો?"</string>
+    <string name="sim_preferred_message" msgid="8466930554330635780">"તમારા ઉપકરણમાં એકમાત્ર <xliff:g id="NEW_SIM">%1$s</xliff:g> સિમ છે. શું તમે મોબાઇલ ડેટા, કૉલ અને SMS સંદેશા માટે આ સિમનો ઉપયોગ કરવા માગો છો?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ખોટો સિમ પિન કોડ, તમારે હવે તમારું ઉપકરણ અનલૉક કરવા માટે તમારા કૅરીઅરનો સંપર્ક કરવો આવશ્યક છે."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
       <item quantity="one">ખોટો સિમ પિન કોડ, તમારી પાસે <xliff:g id="NUMBER_1">%d</xliff:g> પ્રયાસ બાકી છે.</item>
@@ -1081,7 +1128,7 @@
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"બૅટરી, નેટવર્કની સ્થિતિ અને અન્ય માહિતી"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"ફોન નંબર, સિગ્નલ વગેરે"</string>
     <string name="storage_settings" msgid="4211799979832404953">"સ્ટોરેજ"</string>
-    <string name="storage_usb_settings" msgid="7293054033137078060">"સંગ્રહ"</string>
+    <string name="storage_usb_settings" msgid="7293054033137078060">"સ્ટોરેજ"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"સ્ટોરેજ સેટિંગ્સ"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB સંગ્રહને અનમાઉન્ટ કરો, ઉપલબ્ધ સંગ્રહ જુઓ"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD કાર્ડ અનમાઉન્ટ કરો, ઉપલબ્ધ સંગ્રહ જુઓ"</string>
@@ -1099,8 +1146,8 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"સિગ્નલ પ્રબળતા"</string>
     <string name="status_roaming" msgid="2638800467430913403">"રોમિંગ"</string>
     <string name="status_operator" msgid="2274875196954742087">"નેટવર્ક"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC સરનામું"</string>
-    <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth સરનામું"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"વાઇ-ફાઇ MAC સરનામું"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"બ્લૂટૂથ સરનામું"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"શૃંખલા ક્રમાંક"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"અનુપલબ્ધ"</string>
     <string name="status_up_time" msgid="7294859476816760399">"ચાલુ થયાનો સમય"</string>
@@ -1131,8 +1178,8 @@
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB સ્ટોરેજ ભૂસી નાખો"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD કાર્ડ કાઢી નાંખો"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"આંતરિક USB સંગ્રહમાંથી તમામ ડેટા કાઢી નાંખે છે, જેમ કે સંગીત અને ફોટા"</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD કાર્ડમાંથી તમામ ડેટા કાઢી નાંખે છે, જેમ કે સંગીત અને ફોટા"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"આંતરિક USB સંગ્રહમાંથી તમામ ડેટા કાઢી નાંખે છે, જેમ કે સંગીત અને ફોટો"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD કાર્ડમાંથી તમામ ડેટા કાઢી નાંખે છે, જેમ કે સંગીત અને ફોટો"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"કેશ્ડ ડેટા સાફ કરીએ?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"આ તમામ એપ્લિકેશન્સનો કેશ્ડ ડેટા સાફ કરશે."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP અથવા PTP ફંક્શન્સ સક્રિય છે"</string>
@@ -1149,14 +1196,14 @@
     <string name="sd_ejecting_title" msgid="8824572198034365468">"અનમાઉન્ટ કરી રહ્યું છે"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"અનમાઉન્ટ કરવું પ્રગતિ પર છે"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"સંગ્રહ સ્થાન સમાપ્ત થયું"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"કેટલાક સિસ્ટમ કાર્યો, જેમ કે સમન્વયન, યોગ્ય રીતે કાર્ય કરશે નહીં. આઇટમ્સને કાઢી નાંખીને અથવા અનપિન કરીને સ્થાન ખાલી કરવાનો પ્રયાસ કરો, જેમ કે ઍપ્લિકેશનો અથવા મીડિયા સામગ્રી."</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"કેટલાક સિસ્ટમ કાર્યો, જેમ કે સમન્વયન, યોગ્ય રીતે કાર્ય કરશે નહીં. આઇટમ્સને કાઢી નાંખીને અથવા અનપિન કરીને સ્થાન ખાલી કરવાનો પ્રયાસ કરો, જેમ કે ઍપ્લિકેશનો અથવા મીડિયા કન્ટેન્ટ."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"નામ બદલો"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"માઉન્ટ કરો"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"બહાર કાઢો"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"ફોર્મેટ"</string>
     <string name="storage_menu_format_public" msgid="7464714208010125682">"પોર્ટેબલ તરીકે ફોર્મેટ કરો"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"આંતરિક તરીકે ફોર્મેટ કરો"</string>
-    <string name="storage_menu_migrate" msgid="3969621494238154294">"ડેટાને સ્થાનાંતરિત કરો"</string>
+    <string name="storage_menu_migrate" msgid="3969621494238154294">"ડેટાને ટ્રાન્સફર કરો"</string>
     <string name="storage_menu_forget" msgid="6305824238997983426">"ભૂલી જાઓ"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"સેટ કરો"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"અન્વેષણ કરો"</string>
@@ -1165,9 +1212,9 @@
     <string name="storage_title_usb" msgid="679612779321689418">"USB કમ્પ્યુટર કનેક્શન"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"આ તરીકે કનેક્ટ કરો"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"મીડિયા ઉપકરણ (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"તમને મીડિયા ફાઇલોને Windows પર સ્થાનાંતરિત કરવા દે છે અથવા Mac પર Android ફાઇલ સ્થાનાંતરનો ઉપયોગ કરવા દે છે (www.android.com/filetransfer જુઓ)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"તમને મીડિયા ફાઇલોને Windows પર ટ્રાન્સફર કરવા દે છે અથવા Mac પર Android ફાઇલ સ્થાનાંતરનો ઉપયોગ કરવા દે છે (www.android.com/filetransfer જુઓ)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"કૅમેરો (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7406889433172511530">"તમને કૅમેરા સૉફ્ટવેરની મદદથી ફોટા સ્થાનાંતરિત કરવા દે છે અને MTP નું સમર્થન કરતાં ન હોય તેવા કમ્પ્યુટર્સ પર કોઈપણ ફાઇલોને સ્થાનાંતરિત કરવા દે છે"</string>
+    <string name="usb_ptp_summary" msgid="7406889433172511530">"તમને કૅમેરા સૉફ્ટવેરની મદદથી ફોટો ટ્રાન્સફર કરવા દે છે અને MTP નું સમર્થન કરતાં ન હોય તેવા કમ્પ્યુટર્સ પર કોઈપણ ફાઇલોને ટ્રાન્સફર કરવા દે છે"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"તમારા કમ્પ્યુટર પરના MIDI સોફ્ટવેર વડે MIDI સક્ષમ એપ્લિકેશન્સને USB પર કામ કરવા દે છે."</string>
     <string name="storage_other_users" msgid="808708845102611856">"અન્ય વપરાશકર્તાઓ"</string>
@@ -1187,11 +1234,11 @@
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"આ <xliff:g id="NAME_0">^1</xliff:g> સુરક્ષિતપણે બહાર કાઢવામાં આવ્યું છે, પરંતુ હજી પણ ઉપલબ્ધ છે. \n\nઆ <xliff:g id="NAME_1">^1</xliff:g> નો ઉપયોગ કરવા માટે, પહેલા તમારે તેને માઉન્ટ કરવું પડશે."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"આ <xliff:g id="NAME_0">^1</xliff:g> દૂષિત છે. \n\nઆ <xliff:g id="NAME_1">^1</xliff:g> નો ઉપયોગ કરવા માટે, પહેલા તમારે તેને સેટ કરવું પડશે."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"આ ઉપકરણ આ <xliff:g id="NAME_0">^1</xliff:g> નું સમર્થન કરતું નથી. \n\nઆ ઉપકરણ સાથે આ <xliff:g id="NAME_1">^1</xliff:g> નો ઉપયોગ કરવા માટે, પહેલા તમારે તેને સેટ અપ કરવું પડશે."</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"ફોર્મેટ કર્યા પછી, તમે અન્ય ઉપકરણોમાં આ <xliff:g id="NAME_0">^1</xliff:g> નો ઉપયોગ કરી શકો છો. \n\n<xliff:g id="NAME_1">^1</xliff:g> પરનો તમામ ડેટા કાઢી નાખવામાં આવશે. પહેલા બેક અપ લેવાનો વિચાર કરો. \n\n"<b>"ફોટા અને અન્ય મીડિયાનો બેક અપ લો"</b>" \nઆ ઉપકરણ પર વૈકલ્પિક સંગ્રહ પર તમારી મીડિયા ફાઇલોને ખસેડો અથવા તેમને USB કેબલની મદદથી કમ્પ્યુટરમાં સ્થાનાંતરિત કરો. \n\n"<b>"ઍપ્લિકેશનોનો બેક અપ લો"</b>" \nઆ <xliff:g id="NAME_6">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો અનઇન્સ્ટોલ કરવામાં આવશે અને તેમનો ડેટા કાઢી નાખવામાં આવશે. આ ઍપ્લિકેશનો રાખવા માટે, તેમને આ ઉપકરણ પર વૈકલ્પિક સંગ્રહમાં ખસેડો."</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ફોર્મેટ કર્યા પછી, તમે અન્ય ઉપકરણોમાં આ <xliff:g id="NAME_0">^1</xliff:g> નો ઉપયોગ કરી શકો છો. \n\n<xliff:g id="NAME_1">^1</xliff:g> પરનો તમામ ડેટા કાઢી નાખવામાં આવશે. પહેલા બેક અપ લેવાનો વિચાર કરો. \n\n"<b>"ફોટો અને અન્ય મીડિયાનો બેક અપ લો"</b>" \nઆ ઉપકરણ પર વૈકલ્પિક સંગ્રહ પર તમારી મીડિયા ફાઇલોને ખસેડો અથવા તેમને USB કેબલની મદદથી કમ્પ્યુટરમાં ટ્રાન્સફર કરો. \n\n"<b>"ઍપ્લિકેશનોનો બેક અપ લો"</b>" \nઆ <xliff:g id="NAME_6">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો અનઇન્સ્ટોલ કરવામાં આવશે અને તેમનો ડેટા કાઢી નાખવામાં આવશે. આ ઍપ્લિકેશનો રાખવા માટે, તેમને આ ઉપકરણ પર વૈકલ્પિક સંગ્રહમાં ખસેડો."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"જ્યારે તમે આ <xliff:g id="NAME_0">^1</xliff:g> ને બહાર કાઢો છો, ત્યારે તેના પર સંગ્રહિત ઍપ્લિકેશનો કાર્ય કરવાનું બંધ કરશે અને તેના પર સંગ્રહિત મીડિયા ફાઇલો તે ફરીથી શામેલ કરવામાં આવે ત્યાં સુધી ઉપલબ્ધ રહેશે નહીં."</b>\n\n"આ <xliff:g id="NAME_1">^1</xliff:g> ને તે આ ઉપકરણ પર જ કાર્ય કરે તે માટે ફોર્મેટ કર્યું છે. તે કોઈપણ અન્ય પર કાર્ય કરશે નહીં."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"આ <xliff:g id="NAME">^1</xliff:g> ધરાવે છે, તે ઍપ્લિકેશનો, ફોટા અથવા ડેટાનો ઉપયોગ કરવા માટે, તેને ફરીથી શામેલ કરો. \n\nવૈકલ્પિક રૂપે, જો તમે ઉપકરણ ઉપલબ્ધ ન હોય તો આ સંગ્રહને ભૂલી જવાનું પસંદ કરી શકો છો. \n\nજો તમે ભૂલી જવાનું પસંદ કરો છો, તો ઉપકરણમાં શામેલ તમામ ડેટા કાયમ માટે ગુમ થઈ જશે. \n\nતમે પછીથી ઍપ્લિકેશનોને ફરીથી ઇન્સ્ટોલ કરી શકો છો, પરંતુ આ ઉપકરણ પર સંગ્રહિત તેમનો ડેટા ગુમ થઈ જશે."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"આ <xliff:g id="NAME">^1</xliff:g> ધરાવે છે, તે ઍપ્લિકેશનો, ફોટો અથવા ડેટાનો ઉપયોગ કરવા માટે, તેને ફરીથી શામેલ કરો. \n\nવૈકલ્પિક રૂપે, જો તમે ઉપકરણ ઉપલબ્ધ ન હોય તો આ સંગ્રહને ભૂલી જવાનું પસંદ કરી શકો છો. \n\nજો તમે ભૂલી જવાનું પસંદ કરો છો, તો ઉપકરણમાં શામેલ તમામ ડેટા કાયમ માટે ગુમ થઈ જશે. \n\nતમે પછીથી ઍપ્લિકેશનોને ફરીથી ઇન્સ્ટોલ કરી શકો છો, પરંતુ આ ઉપકરણ પર સંગ્રહિત તેમનો ડેટા ગુમ થઈ જશે."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ભૂલી ગયાં?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"આ <xliff:g id="NAME">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો, ફોટા અને ડેટા કાયમ માટે જતો રહેશે."</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"આ <xliff:g id="NAME">^1</xliff:g> પર સંગ્રહિત તમામ ઍપ્લિકેશનો, ફોટો અને ડેટા કાયમ માટે જતો રહેશે."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"ઍપ્લિકેશનો"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"છબીઓ"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"વિડિઓઝ"</string>
@@ -1200,14 +1247,14 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"અન્ય"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"સિસ્ટમ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> નું અન્વેષણ કરો"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"અન્યમાં ઍપ્લિકેશનો, ફાઇલો દ્વારા સાચવવામાં આવેલ શેર કરેલી ફાઇલો, ઇન્ટરનેટ અથવા Bluetooth માંથી ડાઉનલોડ કરેલી ફાઇલો, Android ફાઇલો અને આના જેવી વધુ શામેલ છે. \n\nઆ <xliff:g id="NAME">^1</xliff:g> ની દૃશ્યક્ષમ સામગ્રીઓ જોવા માટે, અન્વેષણ કરો ટૅપ કરો."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"અન્યમાં ઍપ્લિકેશનો, ફાઇલો દ્વારા સાચવવામાં આવેલ શેર કરેલી ફાઇલો, ઇન્ટરનેટ અથવા બ્લૂટૂથ માંથી ડાઉનલોડ કરેલી ફાઇલો, Android ફાઇલો અને આના જેવી વધુ શામેલ છે. \n\nઆ <xliff:g id="NAME">^1</xliff:g> ની દૃશ્યક્ષમ સામગ્રીઓ જોવા માટે, અન્વેષણ કરો ટૅપ કરો."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"સિસ્ટમમાં Android સંસ્કરણ <xliff:g id="VERSION">%s</xliff:g> ચલાવવા માટે ઉપયોગી ફાઇલોનો સમાવેશ છે"</string>
-    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g>એ <xliff:g id="SIZE">^2</xliff:g> સ્ટોરેજનો ઉપયોગ કરીને ફોટા, સંગીત, ઍપ્લિકેશનો અથવા અન્ય ડેટા સાચવ્યો હોઈ શકે છે.\n\nવિગતો જોવા માટે, <xliff:g id="USER_1">^1</xliff:g> પર સ્વિચ કરો."</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g>એ <xliff:g id="SIZE">^2</xliff:g> સ્ટોરેજનો ઉપયોગ કરીને ફોટો, સંગીત, ઍપ્લિકેશનો અથવા અન્ય ડેટા સાચવ્યો હોઈ શકે છે.\n\nવિગતો જોવા માટે, <xliff:g id="USER_1">^1</xliff:g> પર સ્વિચ કરો."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"તમારું <xliff:g id="NAME">^1</xliff:g> સેટ કરો"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"પોર્ટેબલ સંગ્રહ તરીકે ઉપયોગ કરો"</string>
-    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ઉપકરણો વચ્ચે ફોટા અને અન્ય મીડિયા ખસેડવા માટે."</string>
+    <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ઉપકરણો વચ્ચે ફોટો અને અન્ય મીડિયા ખસેડવા માટે."</string>
     <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"આંતરિક સ્ટોરેજ તરીકે ઉપયોગ કરો"</string>
-    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ઍપ્લિકેશનો અને ફોટા સહિત ફક્ત આ ઉપકરણ પર કંઈપણ સંગ્રહિત કરવા માટે. ફોર્મેટિંગ આવશ્યક છે જે તેને અન્ય ઉપકરણો સાથે કાર્ય કરવાથી અટકાવે છે."</string>
+    <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ઍપ્લિકેશનો અને ફોટો સહિત ફક્ત આ ઉપકરણ પર કંઈપણ સંગ્રહિત કરવા માટે. ફોર્મેટિંગ આવશ્યક છે જે તેને અન્ય ઉપકરણો સાથે કાર્ય કરવાથી અટકાવે છે."</string>
     <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"આંતરિક સ્ટોરેજ તરીકે ફોર્મેટ કરો"</string>
     <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"તેને સુરક્ષિત કરવા આના માટે <xliff:g id="NAME_0">^1</xliff:g> ને ફોર્મેટ કરવું જરૂરી છે. \n\nફોર્મેટ કર્યા પછી, આ <xliff:g id="NAME_1">^1</xliff:g> આ ઉપકરણ પર જ કાર્ય કરશે. \n\n"<b>"ફોર્મેટ કરવું <xliff:g id="NAME_2">^1</xliff:g> પર હાલમાં સંગ્રહિત તમામ ડેટાને કાઢી નાખે છે."</b>" ડેટાને ગુમાવવાનું ટાળવા માટે, તેનું બેક અપ લેવાનું વિચારો."</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"પોર્ટેબલ સંગ્રહ તરીકે ફોર્મેટ કરો"</string>
@@ -1216,7 +1263,7 @@
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ને ફોર્મેટ કરી રહ્યાં છે…"</string>
     <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> ને તે ફોર્મેટ થઈ રહ્યું હોય તે વખતે દૂર કરશો નહીં."</string>
     <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ડેટાને નવા સ્ટોરેજ પર ખસેડો"</string>
-    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"તમે આ નવા <xliff:g id="NAME">^1</xliff:g>.પર તમારા ફોટા, ફાઇલો અને કેટલીક ઍપ્લિકેશનો ખસેડી શકો છો. \n\nખસેડવામાં <xliff:g id="TIME">^2</xliff:g> જેટલો સમય લાગશે. તે <xliff:g id="SIZE">^3</xliff:g> આંતરિક સ્ટોરેજ ખાલી કરશે. થોડી ઍપ્લિકેશનો પ્રક્રિયામાં હોવા પર કાર્ય કરશે નહીં."</string>
+    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"તમે આ નવા <xliff:g id="NAME">^1</xliff:g>.પર તમારા ફોટો, ફાઇલો અને કેટલીક ઍપ્લિકેશનો ખસેડી શકો છો. \n\nખસેડવામાં <xliff:g id="TIME">^2</xliff:g> જેટલો સમય લાગશે. તે <xliff:g id="SIZE">^3</xliff:g> આંતરિક સ્ટોરેજ ખાલી કરશે. થોડી ઍપ્લિકેશનો પ્રક્રિયામાં હોવા પર કાર્ય કરશે નહીં."</string>
     <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"હમણાં ખસેડો"</string>
     <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"પછીથી ખસેડો"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ડેટાને હમણાં ખસેડો"</string>
@@ -1225,8 +1272,8 @@
     <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ડેટાને ખસેડી રહ્યું છે…"</string>
     <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"ખસેડવા દરમિયાન: \n• <xliff:g id="NAME">^1</xliff:g> ને દૂર કરશો નહીં. \n• કેટલીક ઍપ્લિકેશનો ઠીકથી કામ કરશે નહીં. \n• ઉપકરણને ચાર્જ થયેલ રાખો."</string>
     <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> તૈયાર છે"</string>
-    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ફોટા અને અન્ય મીડિયા સાથે ઉપયોગ કરવા માટે તમારું <xliff:g id="NAME">^1</xliff:g> સેટ કરેલ છે."</string>
-    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"તમારું નવું <xliff:g id="NAME">^1</xliff:g> કાર્ય કરી રહ્યું છે. \n\nઆ ઉપકરણ પર ફોટા, ફાઇલો અને ઍપ્લિકેશન ડેટા ખસેડવા માટે, સેટિંગ્સ &gt; સ્ટોરેજ પર જાઓ."</string>
+    <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ફોટો અને અન્ય મીડિયા સાથે ઉપયોગ કરવા માટે તમારું <xliff:g id="NAME">^1</xliff:g> સેટ કરેલ છે."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"તમારું નવું <xliff:g id="NAME">^1</xliff:g> કાર્ય કરી રહ્યું છે. \n\nઆ ઉપકરણ પર ફોટો, ફાઇલો અને ઍપ્લિકેશન ડેટા ખસેડવા માટે, સેટિંગ્સ &gt; સ્ટોરેજ પર જાઓ."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ને ખસેડો"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ને તેના ડેટાને <xliff:g id="NAME_0">^2</xliff:g> પર ખસેડવામાં થોડો જ સમય લાગશે. જ્યાં સુધી ખસેડવાનું પૂર્ણ ન થાય ત્યાં સુધી તમે એપ્લિકેશનનો ઉપયોગ કરી શકશો નહીં. \n\nખસેડવા દરમિયાન <xliff:g id="NAME_1">^2</xliff:g> ને દૂર કરશો નહીં."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ને ખસેડી રહ્યાં છે…"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"તમે હાલમાં નીચેના એકાઉન્ટ્સમાં સાઇન ઇન થયેલાં છો:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"આ ઉપકરણ પર અન્ય વપરાશકર્તા હાજર છે.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"સંગીત"</li>\n<li>"ફોટા"</li>\n<li>"અન્ય વપરાશકર્તા ડેટા"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM પરના કૅરિઅર"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"આનાથી તમારો મોબાઇલ સેવા પ્લાન રદ થશે"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"સંગીત, ચિત્રો અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"USB સંગ્રહ"</b>"ને કાઢી નાખવાની જરૂર છે."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"સંગીત, ચિત્રો અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"SD કાર્ડ"</b>"ને કાઢી નાખવાની જરૂર છે."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB સ્ટોરેજ ભૂસી નાખો"</string>
     <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_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>
@@ -1315,7 +1368,7 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"વૉઇસમેઇલ, કૉલ ફોરવર્ડિંગ, કૉલ પ્રતીક્ષા, કૉલર ID સેટ કરો"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB ટિથરિંગ"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"પોર્ટેબલ હૉટસ્પૉટ"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth ટિથરિંગ"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"બ્લૂટૂથ ટિથરિંગ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ટિથરિંગ"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"હૉટસ્પૉટ અને ટિથરિંગ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"હૉટસ્પૉટ ચાલુ છે, ટિથરિંગ"</string>
@@ -1324,26 +1377,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="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_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="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_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_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>
@@ -1356,7 +1398,7 @@
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"વાઇ-ફાઇ અસિસ્ટન્ટ બદલીએ?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"તમારા નેટવર્ક્સ કનેક્શન્સનું સંચાલન કરવા માટે <xliff:g id="CURRENT_APP">%2$s</xliff:g> ને બદલે <xliff:g id="NEW_APP">%1$s</xliff:g> નો ઉપયોગ કરીએ?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"તમારા નેટવર્ક કનેક્શન્સનું સંચાલન કરવા માટે <xliff:g id="NEW_APP">%s</xliff:g> નો ઉપયોગ કરો?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"અજાણ્યો SIM ઓપરેટર"</string>
+    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"અજાણ્યો સિમ ઓપરેટર"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> પાસે કોઈ જાણીતી જોગવાઈ કરતી વેબસાઇટ નથી"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"કૃપા કરીને સિમ કાર્ડ શામેલ કરો અને પુનઃપ્રારંભ કરો"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"કૃપા કરીને ઇન્ટરનેટ સાથે કનેક્ટ કરો"</string>
@@ -1374,17 +1416,17 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"વધુ બૅટરી ઉપયોગ"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ઓછો બૅટરી ઉપયોગ"</string>
     <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_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="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>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth સ્કેનિંગ"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"કોઈપણ સમયે Bluetooth ઉપકરણોને શોધવા માટે સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi અને મોબાઇલ નેટવર્ક સ્થાન"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"વાઇ-ફાઇ સ્કેનિંગ"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"કોઈપણ સમયે વાઇ-ફાઇ નેટવર્ક્સને શોધવા માટે સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"બ્લૂટૂથ સ્કેનિંગ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"કોઈપણ સમયે બ્લૂટૂથ ઉપકરણોને શોધવા માટે સિસ્ટમ ઍપ્લિકેશનો અને સેવાઓને મંજૂરી આપીને સ્થાન બહેતર બનાવો."</string>
+    <string name="location_network_based" msgid="9134175479520582215">"વાઇ-ફાઇ અને મોબાઇલ નેટવર્ક સ્થાન"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"એપ્લિકેશન્સને તમારા સ્થાનનો વધુ ઝડપથી અંદાજ મેળવવા માટે Google ની સ્થાન સેવાનો ઉપયોગ કરવા દો. અનામી સ્થાન ડેટા એકત્રિત કરીને Google ને મોકલવામાં આવશે."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"સ્થાન Wi‑Fi દ્વારા નિર્ધારિત થયું"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"સ્થાન વાઇ-ફાઇ દ્વારા નિર્ધારિત થયું"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS સેટેલાઇટ્સ"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"તમારા સ્થાનનું નિર્દેશન કરવા માટે એપ્લિકેશન્સને તમારા ટેબ્લેટ પર GPS નો ઉપયોગ કરવા દો"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"તમારા સ્થાનનું નિર્દેશન કરવા માટે એપ્લિકેશન્સને તમારા ફોન પરના GPS નો ઉપયોગ કરવા દો"</string>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1619,7 +1667,7 @@
     <string name="storageuse_settings_title" msgid="5657014373502630403">"સંગ્રહનો ઉપયોગ"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ઍપ્લિકેશન દ્વારા વપરાયેલ સંગ્રહ જુઓ"</string>
     <string name="service_restarting" msgid="2242747937372354306">"પુનઃપ્રારંભ કરી રહ્યું છે"</string>
-    <string name="cached" msgid="1059590879740175019">"કેશ કરેલ પૃષ્ઠભૂમિ પ્રક્રિયા"</string>
+    <string name="cached" msgid="1059590879740175019">"કેશ કરેલ બૅકગ્રાઉન્ડ પ્રક્રિયા"</string>
     <string name="no_running_services" msgid="2059536495597645347">"કંઈ ચાલી રહ્યું નથી."</string>
     <string name="service_started_by_app" msgid="818675099014723551">"ઍપ્લિકેશન દ્વારા પ્રારંભ થયો."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
@@ -1659,6 +1707,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>
@@ -1757,9 +1809,10 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"સ્ક્રીન રીડર, પ્રદર્શન, ક્રિયાપ્રતિક્રિયા સંબંધી નિયંત્રણો"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"વિઝન સેટિંગ્સ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"તમે તમારી જરૂરિયાતો મુજબ આ ઉપકરણને કસ્ટમાઇઝ કરી શકો છો. સેટિંગ્સમાં આ ઍક્સેસિબિલિટી સુવિધાઓ પછીથી બદલી શકાય છે."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ફૉન્ટનુ કદ વધારો"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"સ્ક્રીન રીડર"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ઑડિઓ અને સ્ક્રીન પરની ટેક્સ્ટ"</string>
-    <string name="display_category_title" msgid="685461049938269166">"પ્રદર્શન"</string>
+    <string name="display_category_title" msgid="685461049938269166">"ડિસ્પ્લે"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"ક્રિયાપ્રતિક્રિયાના નિયંત્રણો"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"ડાઉનલોડ કરેલ સેવાઓ"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"પ્રાયોગિક"</string>
@@ -1780,7 +1833,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ઍક્સેસિબિલિટી શોર્ટકટ"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"શૉર્ટકટ સેવા"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"લૉક સ્ક્રીન પરથી મંજૂરી આપો"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"જ્યારે શૉર્ટકટ ચાલુ હોય, ત્યારે ઍક્સેસિબિલિટી સુવિધા શરૂ કરવા માટે તમે બન્ને વૉલ્યૂમ બટનને 3 સેકંડ સુધી દબાવી રાખી શકો છો."</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"જ્યારે શૉર્ટકટ ચાલુ હોય, ત્યારે ઍક્સેસિબિલિટી સુવિધા શરૂ કરવા માટે તમે બન્ને વૉલ્યૂમ બટનને 3 સેકન્ડ સુધી દબાવી રાખી શકો છો."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"ઉચ્ચ કોન્ટ્રાસ્ટ ટેક્સ્ટ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"સ્ક્રીન વિસ્તૃતીકરણ સ્વતઃ અપડેટ કરો"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ઍપ્લિકેશન સંક્રમણો પર સ્ક્રીન વિસ્તૃતીકરણને અપડેટ કરો"</string>
@@ -1827,8 +1880,8 @@
     <string name="captioning_text_size" msgid="6737002449104466028">"ટેક્સ્ટ કદ"</string>
     <string name="captioning_preset" msgid="8939737196538429044">"કૅપ્શન શૈલી"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"કસ્ટમ વિકલ્પો"</string>
-    <string name="captioning_background_color" msgid="9053011212948992570">"પૃષ્ઠભૂમિ રંગ"</string>
-    <string name="captioning_background_opacity" msgid="6029993616419971202">"પૃષ્ઠભૂમિ અસ્પષ્ટતા"</string>
+    <string name="captioning_background_color" msgid="9053011212948992570">"બૅકગ્રાઉન્ડ રંગ"</string>
+    <string name="captioning_background_opacity" msgid="6029993616419971202">"બૅકગ્રાઉન્ડ અસ્પષ્ટતા"</string>
     <string name="captioning_window_color" msgid="6902052743419717394">"કૅપ્શન વિંડો રંગ"</string>
     <string name="captioning_window_opacity" msgid="5041556024849862376">"કૅપ્શન વિંડો અપારદર્શકતા"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"ટેક્સ્ટનો રંગ"</string>
@@ -1867,12 +1920,16 @@
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"કોઈ સેવા પસંદ કરેલી નથી"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"કોઈ વર્ણન પ્રદાન કરવામાં આવેલ નથી."</string>
     <string name="settings_button" msgid="3006713718908152930">"સેટિંગ્સ"</string>
-    <string name="print_settings" msgid="4742428530112487843">"છાપવું"</string>
+    <string name="print_settings" msgid="4742428530112487843">"પ્રિન્ટિંગ"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"બંધ"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
       <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>
@@ -1887,7 +1944,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"સેવા અક્ષમ કરેલ છે"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"પ્રિન્ટ જોબ્સ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"છાપ કાર્ય"</string>
-    <string name="print_restart" msgid="8373999687329384202">"પુનઃપ્રારંભ કરો"</string>
+    <string name="print_restart" msgid="8373999687329384202">"રિસ્ટાર્ટ કરો"</string>
     <string name="print_cancel" msgid="3621199386568672235">"રદ કરો"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> છાપી રહ્યાં છે"</string>
@@ -1906,7 +1963,7 @@
     <string name="background_activity_title" msgid="8618384801540759730">"પૃષ્ઠભૂમિની પ્રવૃત્તિ"</string>
     <string name="background_activity_summary" msgid="8140094430510517362">"ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાની મંજૂરી આપો"</string>
     <string name="background_activity_summary_on" msgid="649282072540085599">"ઍપ્લિકેશન ઉપયોગમાં ન હોય ત્યારે પૃષ્ઠભૂમિમાં ચાલે છે"</string>
-    <string name="background_activity_summary_off" msgid="7666330699090632040">"ઍપ્લિકેશનની પૃષ્ઠભૂમિ પ્રવૃત્તિ ઉપયોગમાં ન હોય ત્યારે મર્યાદિત હોય છે"</string>
+    <string name="background_activity_summary_off" msgid="7666330699090632040">"ઍપ્લિકેશનની બૅકગ્રાઉન્ડ પ્રવૃત્તિ ઉપયોગમાં ન હોય ત્યારે મર્યાદિત હોય છે"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાની મંજૂરી નથી"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"સંપૂર્ણ ચાર્જ કર્યાં પછી સ્ક્રીન વપરાશ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"સ્ક્રીન દ્વારા વપરાશ"</string>
@@ -1925,25 +1982,48 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ચાલુ"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"કૅમેરો ચાલુ"</string>
     <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"ફ્લેશલાઇટ ચાલુ"</string>
-    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"વાઇ-ફાઇ"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"જાગૃત"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"મોબાઇલ નેટવર્ક સિગ્નલ"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"ઉપકરણનો જાગૃત સમય"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ચાલુ સમય"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ચાલુ સમય"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"વાઇ-ફાઇ ચાલુ સમય"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"વાઇ-ફાઇ ચાલુ સમય"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"બૅટરીનો વિગતવાર વપરાશ"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ઇતિહાસ વિગતો"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"બૅટરી વપરાશ"</string>
     <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="4006631636646776488">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખે કરે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\n જો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ટૅબ્લેટને સક્રિય રાખે કરે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\n જો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"તમારું ઉપકરણ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ઉપકરણને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\nજો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો.\n\nજો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ટૅબ્લેટને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો.\n\nજો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"તમારું ઉપકરણ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ઉપકરણને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો.\n\nજો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ઍપ્લિકેશન બંધ કરો"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"બૅકગ્રાઉન્ડ વપરાશ બંધ કરીને ઍપ્લિકેશનને રોકીએ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો અને તેને બૅકગ્રાઉન્ડમાં ચાલવાથી અટકાવી શકો છો."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ટૅબ્લેટને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો અને તેને બૅકગ્રાઉન્ડમાં ચાલવાથી અટકાવી શકો છો."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"તમારું ઉપકરણ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP_0">%1$s</xliff:g> તમારા ઉપકરણને સક્રિય રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે <xliff:g id="APP_1">%1$s</xliff:g>ને બંધ કરી શકો છો અને તેને બૅકગ્રાઉન્ડમાં ચાલવાથી અટકાવી શકો છો."</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="7774807745601479888">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી કારણ કે જ્યારે તમે ઍપ્લિકેશનનો ઉપયોગ ન કરતા હો ત્યારે <xliff:g id="APP">%1$s</xliff:g> તમારા સ્થાનની વિનંતી કરવાનું ચાલુ રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે આ ઍપ્લિકેશન માટે સ્થાન બંધ કરી શકો છો."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે જ્યારે તમે ઍપ્લિકેશનનો ઉપયોગ ન કરતા હો ત્યારે <xliff:g id="APP">%1$s</xliff:g> તમારા સ્થાનની વિનંતી કરવાનું ચાલુ રાખે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે આ ઍપ્લિકેશન માટે સ્થાન બંધ કરી શકો છો."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"તમારું ઉપકરણ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે જ્યારે તમે ઍપ્લિકેશનનો ઉપયોગ ન કરતા હો ત્યારે <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>
-    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
-    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"વાઇ-ફાઇ"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"બ્લૂટૂથ"</string>
     <string name="power_cell" msgid="3392999761958982492">"મોબાઇલ નેટવર્ક સ્ટૅન્ડબાય"</string>
     <string name="power_phone" msgid="5392641106474567277">"વૉઇસ કૉલ્સ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ટેબ્લેટ નિષ્ક્રિય"</string>
@@ -1953,21 +2033,21 @@
     <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>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi ચાલુ છે"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"વાઇ-ફાઇ ચાલુ છે"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"ટેબ્લેટ"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ફોન"</string>
     <string name="usage_type_data_send" msgid="8971710128438365919">"મોબાઇલ પેકેટ્સ મોકલ્યાં"</string>
     <string name="usage_type_data_recv" msgid="5468564329333954445">"મોબાઇલ પૅકેટ્સ પ્રાપ્ત થયા"</string>
     <string name="usage_type_radio_active" msgid="1732647857619420121">"સેલ રેડિયો સક્રિય"</string>
-    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"Wi‑Fi પૅકેટ્સ મોકલ્યાં"</string>
-    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"Wi‑Fi પૅકેટ્સ પ્રાપ્ત થયાં"</string>
+    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"વાઇ-ફાઇ પૅકેટ્સ મોકલ્યાં"</string>
+    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"વાઇ-ફાઇ પૅકેટ્સ પ્રાપ્ત થયાં"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"ઑડિઓ"</string>
-    <string name="usage_type_video" msgid="4295357792078579944">"વિડિઓ"</string>
+    <string name="usage_type_video" msgid="4295357792078579944">"વીડિઓ"</string>
     <string name="usage_type_camera" msgid="8299433109956769757">"કૅમેરો"</string>
     <string name="usage_type_flashlight" msgid="1516392356962208230">"ફ્લેશલાઇટ"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"સમય ચાલુ"</string>
@@ -1979,8 +2059,8 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"ઍપ્લિકેશન માહિતી"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"સ્ક્રીન સેટિંગ્સ"</string>
-    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi સેટિંગ્સ"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth સેટિંગ્સ"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"વાઇ-ફાઇ સેટિંગ્સ"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"બ્લૂટૂથ સેટિંગ્સ"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"વૉઇસ કૉલ્સ દ્વારા વપરાયેલ બૅટરી"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"ટેબ્લેટ નિષ્ક્રિય હોય ત્યારે વપરાયેલ બૅટરી"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ફોન નિષ્ક્રિય હોય ત્યારે વપરાયેલ બૅટરી"</string>
@@ -1990,11 +2070,11 @@
     <string name="battery_desc_camera" msgid="7375389919760613499">"કૅમેરા દ્વારા વપરાયેલ બૅટરી"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"ડિસ્પ્લે અને બેકલાઇટ દ્વારા વપરાયેલ બૅટરી"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"સ્ક્રીનનો ચળકાટ અને/અથવા સ્ક્રીન સમયસમાપ્તિ ઘટાડો"</string>
-    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi‑Fi દ્વારા વપરાયેલ બૅટરી"</string>
-    <string name="battery_sugg_wifi" msgid="7776093125855397043">"ઉપયોગ ન હોવા પર અથવા ઉપલબ્ધ ન હોય ત્યારે Wi‑Fi બંધ કરો"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth દ્વારા વપરાયેલ બૅટરી"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"તમે Bluetooth નો ઉપયોગ કરતા ન હોય ત્યારે તેને બંધ કરો"</string>
-    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"એક અલગ Bluetooth ઉપકરણ સાથે કનેક્ટ કરવાનો પ્રયાસ કરો"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"વાઇ-ફાઇ દ્વારા વપરાયેલ બૅટરી"</string>
+    <string name="battery_sugg_wifi" msgid="7776093125855397043">"ઉપયોગ ન હોવા પર અથવા ઉપલબ્ધ ન હોય ત્યારે વાઇ-ફાઇ બંધ કરો"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"બ્લૂટૂથ દ્વારા વપરાયેલ બૅટરી"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"તમે બ્લૂટૂથ નો ઉપયોગ કરતા ન હોય ત્યારે તેને બંધ કરો"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"એક અલગ બ્લૂટૂથ ઉપકરણ સાથે કનેક્ટ કરવાનો પ્રયાસ કરો"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ઍપ્લિકેશન દ્વારા વપરાયેલ બૅટરી"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"એપ્લિકેશનને બંધ કરો અથવા અનઇન્સ્ટોલ કરો"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"બૅટરી બચત મોડ પસંદ કરો"</string>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"છેલ્લા સંપૂર્ણ ચાર્જ પછીનું વિશ્લેષણ"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"છેલ્લા સંપૂર્ણ ચાર્જનો સમય"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"બાકી બૅટરી સમય અનુમાનિત છે અને વપરાશના આધારે બદલાય શકે છે"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"બૅટરી વપરાશનો ડેટા અનુમાનિત છે અને વપરાશના આધારે બદલાઈ શકે છે"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"સક્રિય ઉપયોગ દરમ્યાન"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"પૃષ્ઠભૂમિમાં હોય ત્યારે"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"બૅટરી વપરાશ"</string>
@@ -2038,7 +2119,7 @@
     <string name="app_memory_use" msgid="7849258480392171939">"મેમરીનો ઉપયોગ"</string>
     <string name="process_stats_total_duration" msgid="7417201400853728029">"પાછલા <xliff:g id="TIMEDURATION">%3$s</xliff:g> થી વધુમાં <xliff:g id="TOTALRAM">%2$s</xliff:g> માંથી <xliff:g id="USEDRAM">%1$s</xliff:g> ઉપયોગમાં લેવાયું"</string>
     <string name="process_stats_total_duration_percentage" msgid="6522457033380025618">"<xliff:g id="TIMEDURATION">%2$s</xliff:g> થી વધુમાં <xliff:g id="PERCENT">%1$s</xliff:g> RAM ઉપયોગમાં લેવાયું"</string>
-    <string name="process_stats_type_background" msgid="3934992858120683459">"પૃષ્ઠભૂમિ"</string>
+    <string name="process_stats_type_background" msgid="3934992858120683459">"બૅકગ્રાઉન્ડ"</string>
     <string name="process_stats_type_foreground" msgid="7713118254089580536">"અગ્રભૂમિ"</string>
     <string name="process_stats_type_cached" msgid="6314925846944806511">"કેશ્ડ"</string>
     <string name="process_stats_os_label" msgid="4813434110442733392">"Android OS"</string>
@@ -2047,7 +2128,7 @@
     <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
     <string name="process_stats_os_cache" msgid="6432533624875078233">"કૅશેસ"</string>
     <string name="process_stats_ram_use" msgid="976912589127397307">"RAM વપરાશ"</string>
-    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM ઉપયોગ (પૃષ્ઠભૂમિ)"</string>
+    <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM ઉપયોગ (બૅકગ્રાઉન્ડ)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"રન ટાઇમ"</string>
     <string name="processes_subtitle" msgid="6827502409379462438">"પ્રક્રિયાઓ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"સેવાઓ"</string>
@@ -2070,7 +2151,7 @@
     <string name="menu_show_percentage" msgid="4717204046118199806">"ટકાવારી બતાવો"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss નો ઉપયોગ કરો"</string>
     <string name="menu_proc_stats_type" msgid="4700209061072120948">"આંકડાનો પ્રકાર"</string>
-    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"પૃષ્ઠભૂમિ"</string>
+    <string name="menu_proc_stats_type_background" msgid="2236161340134898852">"બૅકગ્રાઉન્ડ"</string>
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"અગ્રભૂમિ"</string>
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"કેશ્ડ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"વોઇસ ઇનપુટ અને આઉટપુટ"</string>
@@ -2096,15 +2177,15 @@
     <string name="tts_reset" msgid="2661752909256313270">"ફરીથી સેટ કરો"</string>
     <string name="tts_play" msgid="2628469503798633884">"ચલાવો"</string>
     <string name="gadget_title" msgid="5519037532720577836">"પાવર નિયંત્રણ"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi સેટિંગ અપડેટ કરી રહ્યાં છે"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth સેટિંગ અપડેટ કરી રહ્યું છે"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"વાઇ-ફાઇ સેટિંગ અપડેટ કરી રહ્યાં છે"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"બ્લૂટૂથ સેટિંગ અપડેટ કરી રહ્યું છે"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"ચાલુ"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"બંધ"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"ચાલુ કરી રહ્યું છે"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"બંધ કરી રહ્યું છે"</string>
-    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
-    <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"વાઇ-ફાઇ"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"બ્લૂટૂથ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"સ્થાન"</string>
     <string name="gadget_sync" msgid="858895763714222152">"સમન્વયન"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"તેજ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2130,7 +2211,7 @@
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ફક્ત સોફ્ટવેર"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"આ વપરાશકર્તા માટે ઓળખપત્રો ઉપલબ્ધ નથી"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN અને ઍપ્લિકેશનો માટે ઇન્સ્ટૉલ કરેલ"</string>
-    <string name="credential_for_wifi" msgid="6228425986551591864">"Wi-Fi માટે ઇન્સ્ટૉલ કરેલ"</string>
+    <string name="credential_for_wifi" msgid="6228425986551591864">"વાઇ-ફાઇ માટે ઇન્સ્ટૉલ કરેલ"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"ઓળખપત્ર સ્ટોરેજ માટે પાસવર્ડ લખો."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"હાલનો પાસવર્ડ:"</string>
@@ -2150,17 +2231,17 @@
     <string name="backup_section_title" msgid="7952232291452882740">"બેકઅપ અને પુનર્સ્થાપન"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"વ્યક્તિગત ડેટા"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"મારા ડેટાનો બેક અપ લો"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"ઍપ્લિકેશન ડેટા, Wi-Fi પાસવર્ડ્સ અને અન્ય સેટિંગ્સનો Google સર્વર્સ પર બેક અપ લો"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"ઍપ્લિકેશન ડેટા, વાઇ-ફાઇ પાસવર્ડ્સ અને અન્ય સેટિંગ્સનો Google સર્વર્સ પર બેક અપ લો"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"બેકઅપ એકાઉન્ટ"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"ઍપ્લિકેશન માહિતી શામેલ કરો"</string>
-    <string name="auto_restore_title" msgid="5397528966329126506">"સ્વયંચાલિત પુનઃસ્થાપના"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"ઑટોમૅટિક પુનઃસ્થાપના"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"જ્યારે એક ઍપ્લિકેશન ઇન્સ્ટોલ કરી રહ્યાં હોય, ત્યારે બેકઅપ લીધેલ સેટિંગ્સ અને ડેટા પુનઃસ્થાપિત કરો"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"બૅકઅપ સેવા સક્રિય કરેલી નથી"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"બેકઅપ લેવાયેલ ડેટા અત્યારે કોઇ એકાઉન્ટ સ્ટોર કરી રહ્યું નથી"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Wi-Fi પાસવર્ડ્સ, બુકમાર્ક્સ, અન્ય સેટિંગ્સ અને ઍપ્લિકેશન ડેટાનો બેકઅપ લેવાનું રોકીએ, તેમજ Google સર્વર્સ પરની બધી કૉપિઝને કાઢી નાખીએ?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ઉપકરણ ડેટા (જેમ કે Wi-Fi પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો) નું બેકઅપ લેવાનું રોકીએ, ઉપરાંત રિમોટ સર્વર્સ પરની તમામ કૉપિઝ કાઢી નાખીએ?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"ઉપકરણ ડેટા (જેમ કે Wi-Fi પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી આપમેળે બેક અપ લો.\n\nજ્યારે તમે સ્વચલિત બેકઅપ ચાલુ કરો છો, ત્યારે ઉપકરણ અને ઍપ્લિકેશન ડેટા સમયાંતરે રિમોટલી સચવાય છે. ઍપ્લિકેશન ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ ઍપ્લિકેશને સાચવ્યો હોય (વિકાસકર્તા સેટિંગ્સનાં આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટા જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"વાઇ-ફાઇ પાસવર્ડ્સ, બુકમાર્ક્સ, અન્ય સેટિંગ્સ અને ઍપ્લિકેશન ડેટાનો બેકઅપ લેવાનું રોકીએ, તેમજ Google સર્વર્સ પરની બધી કૉપિઝને કાઢી નાખીએ?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો) નું બેકઅપ લેવાનું રોકીએ, ઉપરાંત રિમોટ સર્વર્સ પરની તમામ કૉપિઝ કાઢી નાખીએ?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"ઉપકરણ ડેટા (જેમ કે વાઇ-ફાઇ પાસવર્ડ્સ અને કૉલ ઇતિહાસ) અને ઍપ્લિકેશન ડેટા (જેમ કે સેટિંગ્સ અને ઍપ્લિકેશનો દ્વારા સંગ્રહિત ફાઇલો)નો રિમોટલી આપમેળે બેક અપ લો.\n\nજ્યારે તમે સ્વચલિત બેકઅપ ચાલુ કરો છો, ત્યારે ઉપકરણ અને ઍપ્લિકેશન ડેટા સમયાંતરે રિમોટલી સચવાય છે. ઍપ્લિકેશન ડેટા એવો કોઈપણ ડેટા હોઈ શકે જેને કોઈ ઍપ્લિકેશને સાચવ્યો હોય (વિકાસકર્તા સેટિંગ્સનાં આધારે) જેમાં સંપર્કો, સંદેશા અને ફોટો જેવા સંભવિતપણે સંવેદનશીલ ડેટાનો સમાવેશ થાય છે."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"ઉપકરણ વ્યવસ્થાપક સેટિંગ્સ"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશન"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"આ ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશનને નિષ્ક્રિય કરો"</string>
@@ -2182,13 +2263,13 @@
     <string name="admin_more_details" msgid="7901420667346456102">"વધુ વિગતો"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"અનામાંકિત"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"સામાન્ય"</string>
-    <string name="notification_log_title" msgid="3766148588239398464">"સૂચના લૉગ"</string>
+    <string name="notification_log_title" msgid="3766148588239398464">"નોટિફિકેશન લૉગ"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"કૉલ રિંગટોન અને વાઇબ્રેટ"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"સિસ્ટમ"</string>
-    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi‑Fi સેટઅપ"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi‑Fi નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરો"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi‑Fi નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરી રહ્યું છે…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi‑Fi નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કર્યું"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"વાઇ-ફાઇ સેટઅપ"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"વાઇ-ફાઇ નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરો"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"વાઇ-ફાઇ નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કરી રહ્યું છે…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"વાઇ-ફાઇ નેટવર્ક <xliff:g id="NETWORK_NAME">%s</xliff:g> સાથે કનેક્ટ કર્યું"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"એક નેટવર્ક ઉમેરો"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"કનેક્ટ થયેલ નથી"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"નેટવર્ક ઉમેરો"</string>
@@ -2210,9 +2291,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"કનેક્ટ થઈ રહ્યું છે…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"આગલા પગલા પર જાઓ"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP સમર્થિત નથી."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"તમે સેટઅપ દરમિયાન EAP Wi‑Fi કનેક્શનને ગોઠવી શકતા નથી. સેટઅપ પછી, તમે તેને સેટિંગ્સ &gt; વાયરલેસ અને નેટવર્ક્સમાં તે કરી શકો છો."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"તમે સેટઅપ દરમિયાન EAP વાઇ-ફાઇ કનેક્શનને ગોઠવી શકતા નથી. સેટઅપ પછી, તમે તેને સેટિંગ્સ &gt; વાયરલેસ અને નેટવર્ક્સમાં તે કરી શકો છો."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"કનેક્ટ કરવામાં થોડો સમય લાગી શકે છે…"</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"સેટઅપ સાથે ચાલુ રાખવા માટે "<b>"આગલું"</b>" ટૅપ કરો.\n\nએક ભિન્ન Wi‑Fi નેટવર્કથી કનેક્ટ થવા માટે "<b>"પાછળ"</b>" ટૅપ કરો."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"સેટઅપ સાથે ચાલુ રાખવા માટે "<b>"આગલું"</b>" ટૅપ કરો.\n\nએક ભિન્ન વાઇ-ફાઇ નેટવર્કથી કનેક્ટ થવા માટે "<b>"પાછળ"</b>" ટૅપ કરો."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"સમન્વયન સક્ષમ"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"સમન્વયન અક્ષમ"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"હવે સમન્વયન કરી રહ્યું છે"</string>
@@ -2224,11 +2305,11 @@
     <string name="add_account_label" msgid="7811707265834013767">"એકાઉન્ટ ઉમેરો"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"કાર્યાલયની પ્રોફાઇલ હજી સુધી ઉપલબ્ધ નથી"</string>
     <string name="work_mode_label" msgid="5794470908668593961">"કાર્ય મોડ"</string>
-    <string name="work_mode_summary" msgid="1620246003886940776">"કાર્ય પ્રોફાઇલને ઍપ્લિકેશનો, પૃષ્ઠભૂમિ સમન્વયન અને સંબંધિત સુવિધાઓ સહિતનું કાર્ય કરવાની મંજૂરી આપો"</string>
+    <string name="work_mode_summary" msgid="1620246003886940776">"કાર્ય પ્રોફાઇલને ઍપ્લિકેશનો, બૅકગ્રાઉન્ડ સમન્વયન અને સંબંધિત સુવિધાઓ સહિતનું કાર્ય કરવાની મંજૂરી આપો"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"કાર્યાલયની પ્રોફાઇલ દૂર કરો"</string>
     <string name="background_data" msgid="5779592891375473817">"બૅકગ્રાઉન્ડ ડેટા"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"ઍપ્લિકેશનો કોઈપણ સમયે ડેટાને સમન્વયિત, મોકલી અને પ્રાપ્ત કરી શકે છે"</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"પૃષ્ઠભૂમિ ડેટાને અક્ષમ કરીએ?"</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરીએ?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"બૅકગ્રાઉન્ડ ડેટાને અક્ષમ કરવું બૅટરીની આવરદા વધારે છે અને ડેટા ઉપયોગને ઓછો કરે છે. કેટલીક ઍપ્લિકેશનો હજી પણ બૅકગ્રાઉન્ડ ડેટા કનેક્શનનો ઉપયોગ કરતી હોઈ શકે છે."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"ઍપ્લિકેશન ડેટાને આપમેળે સિંક કરો"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"સમન્વયન ચાલુ છે"</string>
@@ -2287,14 +2368,14 @@
     <string name="data_usage_cycle" msgid="5652529796195787949">"ડેટા વપરાશ ચક્ર"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"ઍપ્લિકેશન વપરાશ"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"ડેટા રોમિંગ"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"પૃષ્ઠભૂમિ ડેટાને નિયંત્રિત કરો"</string>
-    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"પૃષ્ઠભૂમિ ડેટાને મંજૂરી આપો"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"બૅકગ્રાઉન્ડ ડેટાને નિયંત્રિત કરો"</string>
+    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"બૅકગ્રાઉન્ડ ડેટાને મંજૂરી આપો"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G વપરાશ અલગ કરો"</string>
-    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Wi‑Fi બતાવો"</string>
-    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Wi‑Fi છુપાવો"</string>
+    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"વાઇ-ફાઇ બતાવો"</string>
+    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"વાઇ-ફાઇ છુપાવો"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"ઇથરનેટ વપરાશ બતાવો"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"ઇથરનેટ વપરાશ છુપાવો"</string>
-    <string name="data_usage_menu_metered" msgid="6235119991372755026">"નેટવર્ક નિયંત્રણો"</string>
+    <string name="data_usage_menu_metered" msgid="6235119991372755026">"નેટવર્ક પ્રતિબંધ"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ડેટાને આપમેળે સિંક કરો"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"સિમ કાર્ડ"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"મોબાઇલ નેટવર્કો"</string>
@@ -2306,14 +2387,14 @@
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"ડેટા વપરાશ ચક્ર ફરીથી સેટ કરવા માટે મહિનાનો દિવસ:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"આ સમયગાળા દરમ્યાન કોઈ એપ્લિકેશને ડેટાનો ઉપયોગ કર્યો નથી."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"અગ્રભૂમિ"</string>
-    <string name="data_usage_label_background" msgid="3225844085975764519">"પૃષ્ઠભૂમિ"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"બૅકગ્રાઉન્ડ"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"પ્રતિબંધિત"</string>
     <string name="data_usage_disable_mobile" msgid="8656552431969276305">"મોબાઇલ ડેટા બંધ કરીએ?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"મોબાઇલ ડેટા મર્યાદા સેટ કરો"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G ડેટા મર્યાદા સેટ કરો"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G ડેટા મર્યાદા સેટ કરો"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi‑Fi ડેટા મર્યાદા સેટ કરો"</string>
-    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"વાઇ-ફાઇ ડેટા મર્યાદા સેટ કરો"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"વાઇ-ફાઇ"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"ઇથરનેટ"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"મોબાઇલ"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -2324,20 +2405,20 @@
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G ડેટા"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G ડેટા"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"અગ્રભૂમિ:"</string>
-    <string name="data_usage_background_label" msgid="2722008379947694926">"પૃષ્ઠભૂમિ"</string>
+    <string name="data_usage_background_label" msgid="2722008379947694926">"બૅકગ્રાઉન્ડ"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"ઍપ્લિકેશન સેટિંગ્સ"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"બૅકગ્રાઉન્ડ ડેટા"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"પૃષ્ઠભૂમિમાં મોબાઇલ ડેટાના વપરાશને સક્ષમ કરો"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"આ ઍપ્લિકેશન માટે બૅકગ્રાઉન્ડ ડેટા પ્રતિબંધિત કરવા માટે, પહેલા મોબાઇલ ડેટા મર્યાદા સેટ કરો."</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"પૃષ્ઠભૂમિ ડેટાને નિયંત્રિત કરીએ?"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"બૅકગ્રાઉન્ડ ડેટાને નિયંત્રિત કરીએ?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"આ સુવિધાને કારણે બૅકગ્રાઉન્ડ ડેટા પર આધારિત હોય તે ઍપ્લિકેશન ફક્ત મોબાઇલ નેટવર્કો ઉપલબ્ધ હોય ત્યારે કામ કરતી બંધ થઈ શકે છે.\n\nતમે ઍપ્લિકેશનમાં ઉપલબ્ધ સેટિગ્સમાં વધુ ઉચિત ડેટા વપરાશ નિયંત્રણો મેળવી શકો છો."</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"તમે મોબાઇલ ડેટા મર્યાદા સેટ કરી હોય, માત્ર ત્યારે જ પૃષ્ઠભૂમિ ડેટાને મર્યાદિત કરવું સંભવ છે."</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"તમે મોબાઇલ ડેટા મર્યાદા સેટ કરી હોય, માત્ર ત્યારે જ બૅકગ્રાઉન્ડ ડેટાને મર્યાદિત કરવું સંભવ છે."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ડેટા સ્વતઃસમન્વયિત કરો ચાલુ કરીએ?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"તમે વેબ પર તમારા એકાઉન્ટ્સમાં કરો તે કોઈપણ ફેરફારોને આપમેળે તમારા ફોન પર કૉપિ કરાશે.\n\nકેટલાક એકાઉન્ટ્સ પણ તમે ટેબ્લેટ પર કરો તે ફેરફારોની વેબ પર આપમેળે કૉપિ કરશે. Google એકાઉન્ટ આ પ્રમાણે કાર્ય કરે છે."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"તમે વેબ પર તમારા એકાઉન્ટ્સમાં કરો તે કોઈપણ ફેરફારોને આપમેળે તમારા ફોન પર કૉપિ કરાશે.\n\nકેટલાક એકાઉન્ટ્સ પણ તમે ફોન પર કરો તે ફેરફારોની વેબ પર આપમેળે કૉપિ કરશે. Google એકાઉન્ટ આ પ્રમાણે કાર્ય કરે છે."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ડેટા સ્વતઃસમન્વયિત કરો બંધ કરીએ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"આ ડેટા અને બૅટરી વપરાશ બચાવશે, પરંતુ તમારે તાજેતરની માહિતી એકત્રિત કરવા માટે દરેક એકાઉન્ટને મેન્યુઅલી સમન્વયિત કરવાની જરૂર પડશે. અને જ્યારે અપડેટ્સ આવશે ત્યારે તમે સૂચનાઓ પ્રાપ્ત કરશો નહીં."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"વપરાશ ચક્ર ફરીથી સેટ કરવાની તારીખ"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"વપરાશ સાયકલ ફરીથી સેટ કરવાની તારીખ"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"દર મહિનાની તારીખ:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"સેટ કરો"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ડેટા વપરાશ ચેતવણી સેટ કરો"</string>
@@ -2345,10 +2426,10 @@
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ડેટા ઉપયોગને મર્યાદિત કરવો"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"એકવાર તમારો મોબાઇલ ડેટા તમે સેટ કરેલી મર્યાદા પર પહોંચી જાય, પછી તમારું ટૅબ્લેટ તેને બંધ કરી દેશે.\n\nડેટા ઉપયોગની ગણતરી તમારા ટૅબ્લેટ દ્વારા કરવામાં આવે છે અને તમારા કૅરિઅર ભિન્ન રીતે વપરાશની ગણતરી કરી શકે છે, તેથી અપરિવર્તનશીલ મર્યાદા સેટ કરવાનું વિચારો."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"એકવાર તમારો મોબાઇલ ડેટા તમે સેટ કરેલી મર્યાદા પર પહોંચી જાય, પછી તમારો ફોન તેને બંધ કરી દેશે.\n\nડેટા વપરાશની ગણતરી તમારા ફોન દ્વારા કરવામાં આવે છે અને તમારા કૅરિઅર ભિન્ન રીતે વપરાશની ગણતરી કરી શકે છે, તેથી અપરિવર્તનશીલ મર્યાદા સેટ કરવાનું વિચારો."</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"પૃષ્ઠભૂમિ ડેટાને નિયંત્રિત કરીએ?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"જો તમે પૃષ્ઠભૂમિ મોબાઇલ ડેટાને મર્યાદિત કરશો, તો તમે જ્યાં સુધી Wi-Fi સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશનો અને સેવાઓ કાર્ય નહીં કરે."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"જો તમે પૃષ્ઠભૂમિ મોબાઇલ ડેટા મર્યાદિત કરશો, તો તમે જ્યાં સુધી Wi‑Fi સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશન અને સેવાઓ કાર્ય નહીં કરે.\n\nઆ સેટિંગ આ ટૅબ્લેટ પરના બધા વપરાશકર્તાઓને અસર કરે છે."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"જો તમે પૃષ્ઠભૂમિ મોબાઇલ ડેટાને મર્યાદિત કરશો, તો તમે જ્યાં સુધી Wi-Fi સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશનો અને સેવાઓ કાર્ય નહીં કરે.\n\nઆ સેટિંગ આ ફોન પરના બધા વપરાશકર્તાઓને અસર કરે છે."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"બૅકગ્રાઉન્ડ ડેટાને નિયંત્રિત કરીએ?"</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"જો તમે બૅકગ્રાઉન્ડ મોબાઇલ ડેટાને મર્યાદિત કરશો, તો તમે જ્યાં સુધી વાઇ-ફાઇ સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશનો અને સેવાઓ કાર્ય નહીં કરે."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"જો તમે બૅકગ્રાઉન્ડ મોબાઇલ ડેટા મર્યાદિત કરશો, તો તમે જ્યાં સુધી વાઇ-ફાઇ સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશન અને સેવાઓ કાર્ય નહીં કરે.\n\nઆ સેટિંગ આ ટૅબ્લેટ પરના બધા વપરાશકર્તાઓને અસર કરે છે."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"જો તમે બૅકગ્રાઉન્ડ મોબાઇલ ડેટાને મર્યાદિત કરશો, તો તમે જ્યાં સુધી વાઇ-ફાઇ સાથે કનેક્ટ નહીં થાઓ, ત્યાં સુધી કેટલીક ઍપ્લિકેશનો અને સેવાઓ કાર્ય નહીં કરે.\n\nઆ સેટિંગ આ ફોન પરના બધા વપરાશકર્તાઓને અસર કરે છે."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ચેતવણી"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"મર્યાદા"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"દૂર કરેલી ઍપ્લિકેશનો"</string>
@@ -2357,11 +2438,11 @@
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: લગભગ <xliff:g id="TOTAL">%1$s</xliff:g> વપરાયો"</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: લગભગ <xliff:g id="TOTAL">%1$s</xliff:g> વપરાયા, તમારા ટેબ્લેટ દ્વારા માપ્યાં અનુસાર. તમારા કેરિઅરની ડેટા વપરાશની ગણતરી અલગ હોઈ શકે છે."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: લગભગ <xliff:g id="TOTAL">%1$s</xliff:g> વપરાયા, તમારા ફોન દ્વારા માપ્યાં મુજબ. તમારા કેરિઅરની ડેટા વપરાશ ગણતરી અલગ હોઈ શકે છે."</string>
-    <string name="data_usage_metered_title" msgid="7383175371006596441">"નેટવર્ક નિયંત્રણો"</string>
+    <string name="data_usage_metered_title" msgid="7383175371006596441">"નેટવર્ક પ્રતિબંધ"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"જ્યારે બૅકગ્રાઉન્ડ ડેટા મર્યાદિત હોય, ત્યારે મીટર્ડ નેટવર્કોને મોબાઇલ નેટવર્કોની જેમ ગણવામાં આવે છે. ઍપ્લિકેશનો મોટાં ડાઉનલોડ માટે આ નેટવર્કોનો ઉપયોગ કરતાં પહેલાં ચેતવણી આપી શકે છે."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"મોબાઇલ નેટવર્ક્સ"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"મીટર કરેલ Wi‑Fi નેટવર્ક્સ"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"મીટર કરેલ નેટવર્ક્સ પસંદ કરવા માટે, Wi‑Fi ચાલુ કરો."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"મીટર કરેલ વાઇ-ફાઇ નેટવર્ક્સ"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"મીટર કરેલ નેટવર્ક્સ પસંદ કરવા માટે, વાઇ-ફાઇ ચાલુ કરો."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"કેરિઅર ડેટા એકાઉન્ટિંગ તમારા ઉપકરણથી અલગ હોઈ શકે છે."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"કટોકટીનો કૉલ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"કૉલ પર પાછા ફરો"</string>
@@ -2490,12 +2571,12 @@
     <string name="user_nickname" msgid="5148818000228994488">"ઉપનામ"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"ઉમેરો"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"તમે <xliff:g id="USER_COUNT">%1$d</xliff:g> જેટલા વપરાશકર્તાઓ ઉમેરી શકો છો"</string>
-    <string name="user_add_user_item_summary" msgid="4702776187132008661">"વપરાશકર્તાઓ પાસે તેઓની પોતાની ઍપ્લિકેશનો અને સામગ્રી છે"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"વપરાશકર્તાઓ પાસે તેઓની પોતાની ઍપ્લિકેશનો અને કન્ટેન્ટ છે"</string>
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"તમે તમારા એકાઉન્ટથી ઍપ્લિકેશનો અને સામગ્રીની અ‍ૅક્સેસને નિયંત્રિત કરી શકો છો"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"વપરાશકર્તા"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"પ્રતિબંધિત પ્રોફાઇલ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"નવા વપરાશકર્તાને ઉમેરીએ?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"તમે વધારાના વપરાશકર્તાઓ બનાવીને અન્ય લોકો સાથે આ ઉપકરણને શેર કરી શકો છો. દરેક વપરાશકર્તા પાસે તેનું પોતાનું સ્થાન છે, જેને તેઓ ઍપ્લિકેશનો, વૉલપેપર, વગેરે સાથે કસ્ટમાઇઝ કરી શકે છે. વપરાશકર્તાઓ દરેકને પ્રભાવિત કરતી હોય તેવી ઉપકરણ સેટિંગ્સ જેમ કે Wi‑Fi ને પણ સમાયોજિત કરી શકે છે.\n\nજ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા અન્ય બધા વપરાશકર્તાઓ માટે ઍપ્લિકેશનોને અપડેટ કરી શકે છે."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"તમે વધારાના વપરાશકર્તાઓ બનાવીને અન્ય લોકો સાથે આ ઉપકરણને શેર કરી શકો છો. દરેક વપરાશકર્તા પાસે તેનું પોતાનું સ્થાન છે, જેને તેઓ ઍપ્લિકેશનો, વૉલપેપર, વગેરે સાથે કસ્ટમાઇઝ કરી શકે છે. વપરાશકર્તાઓ દરેકને પ્રભાવિત કરતી હોય તેવી ઉપકરણ સેટિંગ્સ જેમ કે વાઇ-ફાઇ ને પણ સમાયોજિત કરી શકે છે.\n\nજ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા અન્ય બધા વપરાશકર્તાઓ માટે ઍપ્લિકેશનોને અપડેટ કરી શકે છે."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"જ્યારે તમે કોઈ નવા વપરાશકર્તાને ઉમેરો છો, ત્યારે તે વ્યક્તિને તેમનું સ્થાન સેટ કરવાની જરૂર પડે છે.\n\nકોઈપણ વપરાશકર્તા બધા અન્ય વપરાશકર્તાઓ માટે એપ્લિકેશન્સને અપડેટ કરી શકે છે."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"હવે વપરાશકર્તાને સેટ કરીએ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ખાતરી કરો કે વ્યક્તિ ઉપકરણ લેવા અને તેમનું સથાન સેટ કરવા માટે ઉપલબ્ધ છે"</string>
@@ -2564,8 +2645,8 @@
     <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="user_account_title" msgid="1127193807312271167">"સામગ્રી માટે એકાઉન્ટ"</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>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"જીવન અને સંપત્તિના આત્યંતિક જોખમો માટેની ચેતવણીઓ પ્રાપ્ત કરો"</string>
@@ -2586,17 +2667,17 @@
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"વૉઇસ અને સંચારને વિસ્તૃત કરવા માટે LTE ડેટાનો ઉપયોગ કરો (ભલામણપ્રદ)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"પસંદગીનો નેટવર્ક પ્રકાર"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (ભલામણ કરેલ)"</string>
-    <string name="work_sim_title" msgid="4843322164662606891">"કાર્યાલય SIM"</string>
-    <string name="user_restrictions_title" msgid="5794473784343434273">"ઍપ્લિકેશન અને સામગ્રી ઍક્સેસ"</string>
+    <string name="work_sim_title" msgid="4843322164662606891">"કાર્યાલય સિમ"</string>
+    <string name="user_restrictions_title" msgid="5794473784343434273">"ઍપ્લિકેશન અને કન્ટેન્ટ ઍક્સેસ"</string>
     <string name="user_rename" msgid="8523499513614655279">"નામ બદલો"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"ઍપ્લિકેશન પ્રતિબંધો સેટ કરો"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> દ્વારા નિયંત્રિત"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"આ ઍપ્લિકેશન તમારા એકાઉન્ટ્સ નિયંત્રિત કરી શકે છે"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"આ ઍપ્લિકેશન તમારા એકાઉન્ટ્સ ઍક્સેસ કરી શકે છે. <xliff:g id="APP">%1$s</xliff:g> દ્વારા નિયંત્રિત"</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi અને મોબાઇલ"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi અને મોબાઇલ સેટિંગ્સનાં સંશોધનની મંજૂરી આપો"</string>
-    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth જોડીઓ અને સેટિંગ્સનાં સંશોધનની મંજૂરી આપો"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"વાઇ-ફાઇ અને મોબાઇલ"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"વાઇ-ફાઇ અને મોબાઇલ સેટિંગ્સનાં સંશોધનની મંજૂરી આપો"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"બ્લૂટૂથ"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"બ્લૂટૂથ જોડીઓ અને સેટિંગ્સનાં સંશોધનની મંજૂરી આપો"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"જ્યારે આ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> બીજા NFC ઉપકરણને ટચ કરે ત્યારે ડેટા ફેરબદલીની મંજૂરી આપો"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"જ્યારે ટેબ્લેટ બીજા ઉપકરણને ટચ કરે ત્યારે ડેટા વિનિમયની મંજૂરી આપો"</string>
@@ -2607,7 +2688,7 @@
     <string name="wizard_next" msgid="3606212602795100640">"આગલું"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"સમાપ્ત"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ફોટો લો"</string>
-    <string name="user_image_choose_photo" msgid="7940990613897477057">"ગૅલેરીમાંથી ફોટા પસંદ કરો"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"ગૅલેરીમાંથી ફોટો પસંદ કરો"</string>
     <string name="user_image_photo_selector" msgid="5492565707299454873">"ફોટો પસંદ કરો"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
     <string name="sim_setup_wizard_title" msgid="1732682852692274928">"સિમ કાર્ડ"</string>
@@ -2616,27 +2697,27 @@
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"સિમ  કાર્ડ હવે બદલાઈ ગયા છે"</string>
     <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"પ્રવૃત્તિઓ સેટ કરવા માટે ટૅપ કરો"</string>
     <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"મોબાઇલ ડેટા અનુપલબ્ધ છે"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"ડેટા SIM પસંદ કરવા માટે ટૅપ કરો"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"ડેટા સિમ પસંદ કરવા માટે ટૅપ કરો"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"કૉલ્સ માટે આનો ઉપયોગ હંમેશાં કરો"</string>
-    <string name="select_sim_for_data" msgid="2366081042162853044">"ડેટા માટે એક SIM પસંદ કરો"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"ડેટા SIM પર સ્વિચ થઈ રહ્યો છે, આમાં એક મિનિટ લાગી શકે છે..."</string>
+    <string name="select_sim_for_data" msgid="2366081042162853044">"ડેટા માટે એક સિમ પસંદ કરો"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"ડેટા સિમ પર સ્વિચ થઈ રહ્યો છે, આમાં એક મિનિટ લાગી શકે છે..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"આની સાથે કૉલ કરો"</string>
     <string name="sim_select_card" msgid="211285163525563293">"સિમ કાર્ડ પસંદ કરો"</string>
-    <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
-    <string name="sim_slot_empty" msgid="8964505511911854688">"SIM ખાલી છે"</string>
-    <string name="sim_editor_name" msgid="1722945976676142029">"SIM નું નામ"</string>
-    <string name="sim_name_hint" msgid="7038643345238968930">"SIM નું નામ દાખલ કરો"</string>
-    <string name="sim_editor_title" msgid="4034301817366627870">"SIM સ્લોટ %1$d"</string>
+    <string name="sim_card_number_title" msgid="7845379943474336488">"સિમ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
+    <string name="sim_slot_empty" msgid="8964505511911854688">"સિમ ખાલી છે"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"સિમ નું નામ"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"સિમ નું નામ દાખલ કરો"</string>
+    <string name="sim_editor_title" msgid="4034301817366627870">"સિમ સ્લોટ %1$d"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"વાહક"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"નંબર"</string>
-    <string name="sim_editor_color" msgid="2542605938562414355">"SIM નો રંગ"</string>
+    <string name="sim_editor_color" msgid="2542605938562414355">"સિમ નો રંગ"</string>
     <string name="sim_card_select_title" msgid="6668492557519243456">"સિમ કાર્ડ પસંદ કરો"</string>
     <string name="color_orange" msgid="4417567658855022517">"નારંગી"</string>
     <string name="color_purple" msgid="3888532466427762504">"જાંબલી"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"કોઈ સિમ કાર્ડ શામેલ કરેલ નથી"</string>
-    <string name="sim_status_title" msgid="6744870675182447160">"SIM સ્થિતિ"</string>
-    <string name="sim_call_back_title" msgid="5181549885999280334">"ડિફોલ્ટ SIM થી કૉલ બેક કરો"</string>
-    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"આઉટગોઇંગ કૉલ્સ માટે SIM"</string>
+    <string name="sim_status_title" msgid="6744870675182447160">"સિમ સ્થિતિ"</string>
+    <string name="sim_call_back_title" msgid="5181549885999280334">"ડિફોલ્ટ સિમ થી કૉલ બેક કરો"</string>
+    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"આઉટગોઇંગ કૉલ્સ માટે સિમ"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"અન્ય કૉલ સેટિંગ્સ"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"મનપસંદ નેટવર્ક ઑફલોડ"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"નેટવર્ક નામ બ્રોડકાસ્ટ અક્ષમ કરો"</string>
@@ -2645,7 +2726,7 @@
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"સિમ કાર્ડ બદલાયા છે."</string>
     <string name="sim_notification_summary" msgid="8858043655706669772">"સેટ કરવા માટે ટૅપ કરો"</string>
-    <string name="sim_pref_divider" msgid="6778907671867621874">"આ માટે પસંદગીનું SIM"</string>
+    <string name="sim_pref_divider" msgid="6778907671867621874">"આ માટે પસંદગીનું સિમ"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"દર વખતે પૂછો"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"પસંદગી જરૂરી"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"સેટિંગ્સ"</string>
@@ -2654,9 +2735,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">"Bluetooth, કાસ્ટ કરો, NFC"</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>
@@ -2674,7 +2758,7 @@
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"મંદ સ્ક્રીન, ટચસ્ક્રીન, બૅટરી"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"મંદ સ્ક્રીન, ટચસ્ક્રીન, બૅટરી"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"મંદ સ્ક્રીન, રાત્રિ, રંગછટા"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"પૃષ્ઠભૂમિ, વ્યક્તિગત, પ્રદર્શન કસ્ટમાઇઝ કરો"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"બૅકગ્રાઉન્ડ, વ્યક્તિગત, પ્રદર્શન કસ્ટમાઇઝ કરો"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ટેક્સ્ટ કદ"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"પ્રોજેક્ટ, કાસ્ટ કરો"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"સ્થાન, ડિસ્ક, હાર્ડ ડ્રાઇવ, ઉપકરણ વપરાશ"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"અનલૉક કરવા માટે સ્લાઇડ કરો, પાસવર્ડ, પૅટર્ન, પિન"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"કાર્ય પડકાર, કાર્ય, પ્રોફાઇલ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"કાર્યાલયની પ્રોફાઇલ, સંચાલિત પ્રોફાઇલ, એકીકૃત કરો, એકીકરણ, કાર્ય, પ્રોફાઇલ"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"હાવભાવ"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"સંકેતો"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ચુકવણી કરો, ટૅપ કરો, ચુકવણીઓ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"બૅકઅપ, બૅક અપ"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"સંકેત"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"વાઇ-ફાઇ NFC ટૅગ સેટ કરો"</string>
     <string name="write_tag" msgid="8571858602896222537">"લખો"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"લખવા માટે ટેગ પર ટેપ કરો..."</string>
@@ -2723,13 +2808,13 @@
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"રિંગર શાંત પર સેટ કરેલ છે"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"રિંગ વૉલ્યુમ 80% પર છે"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"મીડિયા વૉલ્યૂમ"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"એલાર્મ વોલ્યુમ"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"રિંગ વોલ્યુમ"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"સૂચના વૉલ્યૂમ"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"એલાર્મ વૉલ્યૂમ"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"રિંગ વૉલ્યૂમ"</string>
+    <string name="notification_volume_option_title" msgid="6064656124416882130">"નોટિફિકેશન વૉલ્યૂમ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ફોન રિંગટોન"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"ડિફૉલ્ટ સૂચના માટે ધ્વનિ"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ઍપ્લિકેશને અવાજ પૂરો પાડ્યો"</string>
-    <string name="notification_sound_default" msgid="565135733949733766">"ડિફૉલ્ટ સૂચનાનો ધ્વનિ"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"ડિફૉલ્ટ એલાર્મ ધ્વનિ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"કૉલ્સ માટે પણ વાઇબ્રેટ કરો"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"અન્ય ધ્વનિઓ"</string>
@@ -2748,12 +2833,12 @@
     <string name="boot_sounds_title" msgid="567029107382343709">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"કોઈ આપોઆપ નિયમો ચાલુ કરેલા નથી"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> સ્વચાલિત નિયમ ચાલુ કર્યા છે</item>
+      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> સ્વચાલિત નિયમ ચાલુ કર્યો છે</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> સ્વચાલિત નિયમ ચાલુ કર્યા છે</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"ખલેલ પાડશો નહીં પસંદગીઓ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ફક્ત પ્રાધાન્યતાને મંજૂરી"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"સ્વયંચાલિત નિયમો"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ઑટોમૅટિક નિયમો"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ખલેલ પાડશો નહીં નિયમો સેટ કરો"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"અમુક સમયે ધ્વનિ અને વાઇબ્રેશન મર્યાદિત કરો"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ફક્ત પ્રાધાન્યતા"</string>
@@ -2765,7 +2850,7 @@
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"વ્યક્તિગત પ્રોફાઇલ ધ્વનિઓ વાપરો"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"કાર્ય અને વ્યક્તિગત પ્રોફાઇલો માટે ધ્વનિ સમાન રહે છે"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"કાર્ય ફોન રિંગટોન"</string>
-    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"ડિફૉલ્ટ કાર્ય સૂચના માટે ધ્વનિ"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"કાર્યાલયના નોટિફિકેશન માટે ડિફૉલ્ટ ધ્વનિ"</string>
     <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"ડિફૉલ્ટ કાર્ય એલાર્મ માટે ધ્વનિ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"વ્યક્તિગત પ્રોફાઇલની જેમ જ"</string>
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"ધ્વનિ બદલીએ?"</string>
@@ -2775,24 +2860,25 @@
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"આ ફાઇલની <xliff:g id="FOLDER_NAME">%s</xliff:g> ફોલ્ડરમાં કૉપિ કરવામાં આવશે"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"રિંગટોન"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"અન્ય ધ્વનિ અને વાઇબ્રેશન"</string>
-    <string name="configure_notification_settings" msgid="7616737397127242615">"સૂચનાઓ"</string>
+    <string name="configure_notification_settings" msgid="7616737397127242615">"નોટિફિકેશનો"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"વિગતવાર"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"કાર્યની સૂચનાઓ"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"સૂચના બિંદુઓને મંજૂરી આપો"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"નોટિફિકેશનના ચિહ્નને મંજૂરી આપો"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"લાઇટ ઝબકવી"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"લૉક સ્ક્રીન પર"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"તમામ સૂચના સામગ્રી બતાવો"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"સંવેદનશીલ સૂચના સામગ્રી છુપાવો"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"સૂચનાઓ બિલકુલ દર્શાવશો નહીં"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"જ્યારે તમારું ઉપકરણ લૉક કરેલું હોય, ત્યારે તમે સૂચનાઓને કેવી રીતે દર્શાવવામાં આવે તેમ ઇચ્છો છો?"</string>
-    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"સૂચનાઓ"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"તમામ કાર્ય સૂચના સામગ્રી બતાવો"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"સંવેદનશીલ કાર્ય સૂચના સામગ્રી છુપાવો"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"તમામ નોટિફિકેશન કન્ટેન્ટ બતાવો"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"સંવેદનશીલ નોટિફિકેશન કન્ટેન્ટ છુપાવો"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"નોટિફિકેશનો બિલકુલ બતાવશો નહીં"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"જ્યારે તમારું ઉપકરણ લૉક કરેલું હોય, ત્યારે તમે નોટિફિકેશનો કેવી રીતે બતાવવા માગો છો?"</string>
+    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"નોટિફિકેશનો"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"કાર્યાલયનું તમામ નોટિફિકેશન કન્ટેન્ટ બતાવો"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"સંવેદનશીલ કાર્ય નોટિફિકેશન કન્ટેન્ટ છુપાવો"</string>
     <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_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="notification_channel_title" msgid="2260666541030178452">"સૂચના શ્રેણી"</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>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"સૂચનાઓ ક્યારેય બતાવશો નહીં"</string>
@@ -2806,18 +2892,22 @@
     <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="default_notification_assistant" msgid="7631945224761430146">"સૂચના સહાયક"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"સૂચના ઍક્સેસ"</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>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ઍપ્લિકેશનો સૂચનાઓ વાંચી શકતી નથી"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d ઍપ્લિકેશનો સૂચનાઓ વાંચી શકે છે</item>
       <item quantity="other">%d ઍપ્લિકેશનો સૂચનાઓ વાંચી શકે છે</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"કોઈ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સે સૂચના ઍક્સેસની વિનંતી કરી નથી."</string>
-    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> માટે સૂચના ઍક્સેસની મંજૂરી આપીએ?"</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"કોઈ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સે નોટિફિકેશન ઍક્સેસની વિનંતી કરી નથી."</string>
+    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> માટે નોટિફિકેશન ઍક્સેસની મંજૂરી આપીએ?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, સંપર્ક નામ અને તમને મળતા સંદેશાની ટેક્સ્ટ જેવી વ્યક્તિગત માહિતી સહિત તમામ સૂચનાઓ વાંચવામાં સમર્થ હશે. તે આ સૂચનાઓને છોડી દેવા અથવા તેમાં રહેલા ક્રિયા બટનોને શરૂ કરવામાં પણ સમર્થ હશે. \n\nઆ ઍપ્લિકેશનને ખલેલ પાડશો નહીંને ચાલુ કે બંધ કરવાની તથા સંબંધિત સેટિંગ્સ બદલવાની ક્ષમતા પણ આપશે."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"જો તમે <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> માટે સૂચના ઍક્સેસને બંધ કરો છો, તો ખલેલ પાડશો નહીં ઍક્સેસ પણ બંધ કરવામાં આવી શકે છે."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"જો તમે <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> માટે નોટિફિકેશન ઍક્સેસને બંધ કરો છો, તો ખલેલ પાડશો નહીં ઍક્સેસ પણ બંધ કરવામાં આવી શકે છે."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"બંધ કરો"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"રદ કરો"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR સહાયક સેવાઓ"</string>
@@ -2832,14 +2922,12 @@
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"ચિત્ર-માં-ચિત્રમાં ચિત્ર"</string>
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ચિત્ર-માં-ચિત્ર"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"ચિત્રમાં-ચિત્રને મંજૂરી આપો"</string>
-    <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="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"આ ઍપ્લિકેશનને જ્યારે ઍપ્લિકેશન ખુલ્લી હોય અથવા તમે તેને છોડી દીધી હોય (ઉદાહરણ તરીકે, વીડિઓ જોવા માટે), ત્યારે ચિત્રમાં-ચિત્ર વિંડો બનાવવાની મંજૂરી આપો. આ વિંડો તમે ઉપયોગમાં લો છો તે અન્ય ઍપ્લિકેશનોની ટોચે પ્રદર્શિત થાય છે."</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>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"આ ઍપ્લિકેશનની સૂચના આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"આ કૅટેગરીની સૂચના આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"આ ઍપ્લિકેશનની નોટિફિકેશન આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"આ કૅટેગરીની નોટિફિકેશન આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
     <string name="notification_channels" msgid="5346841743182627500">"કૅટેગરીઓ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"અન્ય"</string>
     <string name="no_channels" msgid="3077375508177744586">"આ ઍપ્લિએક્શને કોઈ સૂચનાઓ પોસ્ટ કરી નથી"</string>
@@ -2859,7 +2947,7 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"આ સૂચનાઓ ક્યારેય બતાવશો નહીં"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"સૂચનાઓ બતાવો"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"સૂચનાઓ ક્યારેય શૅડમાં અથવા પેરિફેરલ ઉપકરણો પર બતાવશો નહીં"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"નોટિફિકેશન માટેનું ચિહ્નને મંજૂરી આપો"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"નોટિફિકેશન માટેના ચિહ્નને મંજૂરી આપો"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"નોટિફિકેશન માટેનું ચિહ્ન બતાવો"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ખલેલ પાડશો નહીં ને ઓવરરાઇડ કરો"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"જયારે ખલેલ પાડશો નહીં ને માત્ર પ્રાધાન્યતા પર સેટ કરેલું હોય ત્યારે આ સૂચનાઓને દખલગીરી કરવા દો"</string>
@@ -2918,7 +3006,8 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ફક્ત તારાંકિત સંપર્કોના"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"કોઈ નહીં"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"એલાર્મ્સ"</string>
-    <string name="zen_mode_reminders" msgid="5458502056440485730">"સ્મૃતિપત્રો"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"અલાર્મ હંમેશા પ્રાધાન્યતા હોય છે અને અવાજ કરે છે"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"રિમાઇન્ડર"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ઇવેન્ટ્સ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"બધા કૉલર્સ"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"પસંદ કરેલ કૉલર્સ"</string>
@@ -2943,10 +3032,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"એલાર્મ્સ પર ફક્ત <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> સુધી બદલો"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"હંમેશાં ખલેલ પાડો પર બદલો"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"જ્યારે સ્ક્રીન ચાલુ હોય ત્યારે બ્લૉક કરો"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"ખલેલ પાડશો નહીં દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને સ્ક્રીન પર ઝબકતી અથવા દેખાતી અટકાવો"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"ખલેલ પાડશો નહીં દ્વારા શાંત કરવામાં આવેલ નોટિફિકેશનોને સ્ક્રીન પર ઝબકાવતા અથવા બતાવતા અટકાવો"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"જ્યારે સ્ક્રીન બંધ હોય ત્યારે બ્લૉક કરો"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"ખલેલ પાડશો નહીં દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને સ્ક્રીનને ચાલુ કરવા અથવા સૂચના લાઇટને ધબકતી અટકાવો"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"ખલેલ પાડશો નહિ દ્વારા શાંત કરવામાં આવેલ સૂચનાઓને સ્ક્રીન ચાલુ કરતાં અટકાવો"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"ખલેલ પાડશો નહીં દ્વારા શાંત કરવામાં આવેલ નોટિફિકેશનોને સ્ક્રીનને ચાલુ કરવા અથવા નોટિફિકેશન લાઇટને ઝબકાવતા અટકાવો"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"ખલેલ પાડશો નહિ દ્વારા શાંત કરવામાં આવેલ નોટિફિકેશનોને સ્ક્રીન ચાલુ કરતાં અટકાવો"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"બંધ"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"જ્યારે સ્ક્રીન ચાલુ હોય"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"જ્યારે સ્ક્રીન બંધ હોય"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3009,7 +3093,7 @@
     <string name="notifications_disabled" msgid="334416731283131597">"બધી બંધ કરી"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g>માંથી <xliff:g id="COUNT_0">%1$d</xliff:g> કૅટેગરી બંધ કરી"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"શાંત કરી"</string>
-    <string name="notifications_redacted" msgid="4493588975742803160">"સંવેદનશીલ સામગ્રી લોક સ્ક્રીન પર નથી"</string>
+    <string name="notifications_redacted" msgid="4493588975742803160">"સંવેદનશીલ કન્ટેન્ટ લોક સ્ક્રીન પર નથી"</string>
     <string name="notifications_hidden" msgid="3619610536038757468">"લૉક સ્ક્રીન પર નથી"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"ખલેલ પાડશો નહીં ઓવરરાઇડ કર્યું"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
@@ -3075,7 +3159,7 @@
     <string name="default_app" msgid="6864503001385843060">"(ડિફોલ્ટ)"</string>
     <string name="system_app" msgid="9068313769550747372">"(સિસ્ટમ)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(સિસ્ટમ ડિફોલ્ટ)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"ઍપ્લિકેશનો સ્ટોરેજ"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ઍપ સ્ટોરેજ"</string>
     <string name="usage_access" msgid="5479504953931038165">"વપરાશ ઍક્સેસ"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"વપરાશ અ‍ૅક્સેસની મંજૂરી આપો"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"ઍપ્લિકેશન વપરાશ પસંદગીઓ"</string>
@@ -3095,6 +3179,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>
@@ -3119,21 +3212,21 @@
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"બસ આ ઉપકરણને ચાર્જ કરો"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"પાવર સપ્લાય"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"કનેક્ટ કરેલ ઉપકરણને ચાર્જ કરો. USB ચાર્જિંગનું સમર્થન કરતાં ઉપકરણો સાથે જ કાર્ય કરે છે."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ફાઇલો સ્થાનાંતરિત કરો"</string>
-    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ફાઇલોને બીજા ઉપકરણ પર સ્થાનાંતરિત કરો"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ફોટા ટ્રાન્સફર કરો (PTP)"</string>
-    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"જો MTP સમર્થિત ન હોય તો ફોટા અથવા ફાઇલો સ્થાનાંતરિત કરો (PTP)"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ફાઇલો ટ્રાન્સફર કરો"</string>
+    <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ફાઇલોને બીજા ઉપકરણ પર ટ્રાન્સફર કરો"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ફોટો ટ્રાન્સફર કરો (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"જો MTP સમર્થિત ન હોય તો ફોટો અથવા ફાઇલો ટ્રાન્સફર કરો (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI તરીકે ઉપકરણનો ઉપયોગ કરો"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"MIDI તરીકે આ ઉપકરણનો ઉપયોગ કરો"</string>
     <string name="usb_use" msgid="3256040963685055320">"આના માટે USB નો ઉપયોગ કરો"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"આ ઉપકરણને ચાર્જ કરવું"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"પાવર પૂરો પાડવો"</string>
-    <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ફાઇલો સ્થાનાંતરિત કરવી"</string>
-    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ફોટા સ્થાનાંતરિત કરવા (PTP)"</string>
+    <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ફાઇલો ટ્રાન્સફર કરવી"</string>
+    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ફોટો ટ્રાન્સફર કરવા (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"ઉપકરણનો MIDI તરીકે ઉપયોગ કરવો"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"બૅૅકગ્રાઉન્ડ ચેક"</string>
-    <string name="background_check_title" msgid="4534254315824525593">"પૂર્ણ પૃષ્ઠભૂમિ ઍક્સેસ"</string>
+    <string name="background_check_title" msgid="4534254315824525593">"પૂર્ણ બૅકગ્રાઉન્ડ ઍક્સેસ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"સ્ક્રીન પરની ટેક્સ્ટનો ઉપયોગ કરો"</string>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"સ્ક્રીન સામગ્રીઓને ટેક્સ્ટ તરીકે ઍક્સેસ કરવા માટે મદદ એપ્લિકેશનને મંજૂરી આપો"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"સ્ક્રીનશોટનો ઉપયોગ કરો"</string>
@@ -3164,7 +3257,7 @@
     <string name="no_data_usage" msgid="9131454024293628063">"કોઈ ડેટાનો ઉપયોગ કર્યો નથી"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> માટે ખલેલ પાડશો નહીં ઍક્સેસની મંજૂરી આપીએ?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"ઍપ્લિકેશન ખલેલ પાડશો નહીં ચાલુ/બંધ કરી શકશે અને સંબંધિત સેટિંગ્સમાં ફેરફારો કરી શકશે."</string>
-    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"ચાલુ રહેવું આવશ્યક છે કારણ કે સૂચના ઍક્સેસ ચાલુ છે"</string>
+    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"ચાલુ રહેવું આવશ્યક છે કારણ કે નોટિફિકેશન ઍક્સેસ ચાલુ છે"</string>
     <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> માટે ખલેલ પહોંચાડશો નહિ ની એક્સેસ રદબાતલ કરીએ?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"આ ઍપ્લિકેશન દ્વારા બનાવાયેલ તમામ ખલેલ પહોંચાડશો નહિ નિયમો દૂર કરવામાં આવશે."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ઓપ્ટિમાઇઝ કરશો નહીં"</string>
@@ -3187,8 +3280,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>
@@ -3207,7 +3300,7 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"તમારા કાંડાને બે વાર મરડીને કૅમેરા ઍપ્લિકેશન ખોલો"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"કૅમેરા માટે બે વખત પાવર બટન દબાવો"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"તમારી સ્ક્રીન અનલૉક કર્યાં વગર ઝડપથી કૅમેરો ખોલો"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"પ્રદર્શન કદ"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"ડિસ્પ્લે કદ"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"સ્ક્રીન પરની આઇટમ્સને મોટી અથવા નાની કરો"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"પ્રદર્શન ઘનતા, સ્ક્રીન ઝૂમ, સ્કેલ, સ્કેલિંગ"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"તમારી સ્ક્રીન પરની આઇટમ્સને નાની અથવા મોટી કરો. તમારી સ્ક્રીન પરની કેટલીક ઍપ્લિકેશનો સ્થિતિ બદલી શકે છે."</string>
@@ -3264,20 +3357,29 @@
     <string name="condition_hotspot_title" msgid="7778958849468560027">"હૉટસ્પૉટ ચાલુ છે"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"પોર્ટેબલ વાઇ-ફાઇ હૉટસ્પૉટ <xliff:g id="ID_1">%1$s</xliff:g> સક્રિય છે, આ ઉપકરણ માટે વાઇ-ફાઇ બંધ કરેલ છે."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"એરપ્લેન મોડ ચાલુ છે"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth અને મોબાઇલ નેટવર્ક બંધ કરેલ છે. તમે ફોન કૉલ કે ઇન્ટરનેટ સાથે કનેક્ટ કરી શકતા નથી."</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"વાઇ-ફાઇ, બ્લૂટૂથ અને મોબાઇલ નેટવર્ક બંધ કરેલ છે. તમે ફોન કૉલ કે ઇન્ટરનેટ સાથે કનેક્ટ કરી શકતા નથી."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"ખલેલ પાડશો નહીં ચાલુ છે (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"બૅટરી સેવર ચાલુ છે"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"પ્રદર્શનમાં ઘટાડો થયો છે. સ્થાન સેવાઓ અને બૅકગ્રાઉન્ડ ડેટા બંધ કરેલા છે."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"મોબાઇલ ડેટા બંધ છે"</string>
-    <string name="condition_cellular_summary" msgid="1818046558419658463">"ઇન્ટરનેટ માત્ર Wi-Fi મારફતે ઉપલબ્ધ છે"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"ઇન્ટરનેટ માત્ર વાઇ-ફાઇ મારફતે ઉપલબ્ધ છે"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"ડેટા સેવર ચાલુ છે"</string>
     <string name="condition_bg_data_summary" msgid="656957852895282228">"બૅકગ્રાઉન્ડ ડેટા માત્ર વાઇ-ફાઇ મારફતે ઉપલબ્ધ છે. જ્યારે વાઇ-ફાઇ ઉપલબ્ધ ન હોય ત્યારે આ થોડી ઍપ્લિકેશનો અથવા સેવાઓને પ્રભાવિત કરી શકે છે."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"કાર્યાલયની પ્રોફાઇલ બંધ છે"</string>
-    <string name="condition_work_summary" msgid="7543202177571590378">"તમારી કાર્ય પ્રોફાઇલને સંબંધિત ઍપ્લિકેશનો, પૃષ્ઠભૂમિ સમન્વયન અને અન્ય સુવિધાઓ બંધ છે."</string>
+    <string name="condition_work_summary" msgid="7543202177571590378">"તમારી કાર્ય પ્રોફાઇલને સંબંધિત ઍપ્લિકેશનો, બૅકગ્રાઉન્ડ સમન્વયન અને અન્ય સુવિધાઓ બંધ છે."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"રાત્રિ પ્રકાશ ચાલુ છે"</string>
     <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>
@@ -3286,19 +3388,18 @@
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"સ્વચાલિત સિસ્ટમ અપડેટ્સ"</string>
     <string name="usage" msgid="2977875522080448986">"વપરાશ"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"મોબાઇલ ડેટા વપરાશ"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi ડેટા વપરાશ"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"વાઇ-ફાઇ ડેટા વપરાશ"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ઇથરનેટ ડેટા વપરાશ"</string>
-    <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
+    <string name="wifi" msgid="1081550856200013637">"વાઇ-ફાઇ"</string>
     <string name="ethernet" msgid="6600095783781389720">"ઇથરનેટ"</string>
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> મોબાઇલ ડેટા"</string>
-    <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi ડેટા"</string>
+    <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> વાઇ-ફાઇ ડેટા"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ઇથરનેટ ડેટા"</string>
     <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="network_restrictions" msgid="8234695294536675380">"નેટવર્ક નિયંત્રણો"</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>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> પ્રતિબંધ</item>
@@ -3317,7 +3418,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>
@@ -3379,10 +3480,9 @@
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager દરને મર્યાદિત કરવાનું ફરીથી સેટ કરો"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager દરને મર્યાદિત કરવાનું ફરીથી સેટ કરવામાં આવ્યું"</string>
     <string name="notification_suggestion_title" msgid="4506524937307816475">"લૉક સ્ક્રીન સૂચનાઓ નિયંત્રિત કરો"</string>
-    <string name="notification_suggestion_summary" msgid="8521159741445416875">"સૂચના સામગ્રી બતાવો અથવા છુપાવો"</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>
@@ -3429,8 +3529,8 @@
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> મિનિટ</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="3876307354560025025">
-      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> સેકંડ</item>
-      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> સેકંડ</item>
+      <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> સેકન્ડ</item>
+      <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> સેકન્ડ</item>
     </plurals>
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> રાહ જુઓ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"કમ્પ્યુટર"</string>
@@ -3439,10 +3539,10 @@
     <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"ઇમેજિંગ"</string>
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"હેડફોન"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ઇનપુટ પેરિફેરલ"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"Bluetooth"</string>
+    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"બ્લૂટૂથ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"સ્ટોરેજનું સંચાલન કરો"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"સ્ટોરેજ સ્થાન ખાલી કરવામાં સહાય માટે, સ્ટોરેજ સંંચાલક તમારા ઉપકરણમાંથી બેક અપ લીધેલા ફોટા અને વિડિઓઝને દૂર કરો."</string>
-    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ફોટા અને વિડિઓઝ દૂર કરો"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"સ્ટોરેજ સ્થાન ખાલી કરવામાં સહાય માટે, સ્ટોરેજ સંંચાલક તમારા ઉપકરણમાંથી બેક અપ લીધેલા ફોટો અને વિડિઓઝને દૂર કરો."</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ફોટો અને વિડિઓઝ દૂર કરો"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"સ્ટોરેજ સંચાલક"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"સ્વચાલિત"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"મેન્યુઅલ"</string>
@@ -3453,25 +3553,32 @@
     <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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"સૂચનાઓ માટે સંદર્ભ ફાઇલને સ્વાઇપ કરો"</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="assist_gesture_title" msgid="7746563137898655539">"સહાય હાવભાવ"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"સંવેદિતા"</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="gesture_setting_on" msgid="3455094265233870280">"ચાલુ"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"બંધ"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"બૂટલોડર પહેલાંથી અનલૉક કરેલ છે"</string>
@@ -3490,8 +3597,11 @@
     <string name="auto_sync_account_title" msgid="898796354710116383">"ડેટાનું આપમેળે સમન્વયન કરો"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"વ્યક્તિગત ડેટાનું આપમેળે સમન્વયન કરો"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"કાર્ય ડેટાનું આપમેળે સમન્વયન કરો"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"ઍપ્લિકેશનોને ડેટા આપમેળે તાજો કરવા દો"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"ઍપને આપમેળે ડેટાને રિફ્રેશ કરવા દો"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"એકાઉન્ટ સમન્વયન"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> માંથી <xliff:g id="ID_1">%1$d</xliff:g> આઇટમ માટે સમન્વયન ચાલુ છે"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"બધી આઇટમ માટે સમન્વયન ચાલુ છે"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"બધી આઇટમ માટે સમન્વયન બંધ છે"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"સંચાલિત ઉપકરણની માહિતી"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"ફેરફારો અને સેટિંગ્સ તમારી સંસ્થા દ્વારા સંચાલિત કરવામાં આવે છે"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"ફેરફારો અને સેટિંગ્સ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા સંચાલિત કરવામાં આવે છે"</string>
@@ -3560,7 +3670,7 @@
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
-    <string name="storage_photos_videos" msgid="319854636702241898">"ફોટા અને વિડિઓ"</string>
+    <string name="storage_photos_videos" msgid="319854636702241898">"ફોટો અને વીડિઓ"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"સંગીત અને ઑડિઓ"</string>
     <string name="storage_games" msgid="7703159201697117621">"રમતો"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"અન્ય ઍપ્લિકેશનો"</string>
@@ -3572,6 +3682,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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ચાલુ"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"ઝટપટ ઍપ્લિકેશન"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"સ્ટોરેજ સંચાલકને બંધ કરીએ?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"મૂવી અને TV ઍપ્લિકેશનો"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"જગ્યા વપરાઈ"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"મૂવી અને ટીવી ઍપ્લિકેશનો"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"કૅરિઅર જોગવાઈ માહિતી"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"કૅરિઅર જોગવાઈ ટ્રિગર કરો"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"નવું અને રોમાંચક શું છે?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ટોચની 5 સુવિધાઓ તપાસો"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS રજિસ્ટ્રેશનની સ્થિતિ"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"રજિસ્ટર કરેલ"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"રજિસ્ટર કરેલ નથી"</string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index e4d53f44aee263595ed418cf2a04f70a8a4d54ec..881f4ffaf6c9d639264edd152bf287d05757069d 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -70,7 +70,7 @@
     <item msgid="8934131797783724664">"स्‍कैन कर रहा है…"</item>
     <item msgid="8513729475867537913">"कनेक्ट हो रहा है..."</item>
     <item msgid="515055375277271756">"प्रमाणीकरण कर रहा है…"</item>
-    <item msgid="1943354004029184381">"IP पता प्राप्त कर रहा है…"</item>
+    <item msgid="1943354004029184381">"आईपी पता ले रहा है…"</item>
     <item msgid="4221763391123233270">"कनेक्ट किया गया"</item>
     <item msgid="624838831631122137">"निलंबित"</item>
     <item msgid="7979680559596111948">"डिस्‍कनेक्‍ट हो रहा है..."</item>
@@ -84,7 +84,7 @@
     <item msgid="8878186979715711006">"स्‍कैन कर रहा है…"</item>
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्‍ट कर रहा है…"</item>
     <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> के साथ प्रमाणीकरण कर रहा है…"</item>
-    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से IP पता प्राप्त कर रहा है…"</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से आईपी पता ले रहा है..."</item>
     <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्‍ट किया गया"</item>
     <item msgid="1330262655415760617">"निलंबित"</item>
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से डिस्‍कनेक्‍ट कर रहा है…"</item>
@@ -136,7 +136,7 @@
     <item msgid="8151962652413645395">"2 मिनट"</item>
     <item msgid="8675215713017289017">"5 मिनट"</item>
     <item msgid="477015974247590543">"1 घंटा"</item>
-    <item msgid="5198271470953124739">"कभी समयबाह्य नहीं"</item>
+    <item msgid="5198271470953124739">"कभी टाइम आउट नहीं होगा"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"कमज़ोर"</item>
@@ -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>
@@ -240,17 +230,17 @@
     <item msgid="4498124044785815005">"सिस्‍टम को निर्धारित करने दें"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"स्थान"</item>
+    <item msgid="6358963769537892925">"जगह"</item>
     <item msgid="255608127647030286">"व्यक्तिगत"</item>
     <item msgid="4588829735729884491">"संदेश सेवा"</item>
     <item msgid="886742181977884584">"मीडिया"</item>
     <item msgid="7924928667052300589">"डिवाइस"</item>
   </string-array>
   <string-array name="app_ops_summaries">
-    <item msgid="4979188868761515915">"अस्पष्ट स्थान"</item>
-    <item msgid="5789673140227507995">"सटीक स्थान"</item>
+    <item msgid="4979188868761515915">"अस्पष्ट जगह"</item>
+    <item msgid="5789673140227507995">"सटीक जगह"</item>
     <item msgid="1061584358377390581">"GPS"</item>
-    <item msgid="5387405117297558954">"कंपन"</item>
+    <item msgid="5387405117297558954">"कंपन (वाइब्रेशन)"</item>
     <item msgid="3434165993711230924">"संपर्क पढ़ें"</item>
     <item msgid="616161687718081936">"संपर्कों को बदलें"</item>
     <item msgid="7638002295329050091">"कॉल लॉग पढ़ें"</item>
@@ -258,21 +248,21 @@
     <item msgid="446877710771379667">"कैलेंडर पढ़ें"</item>
     <item msgid="7674458294386319722">"कैलेंडर बदलें"</item>
     <item msgid="8281201165558093009">"वाई-फ़ाई स्कैन"</item>
-    <item msgid="8694611243479480497">"नोटिफ़िकेशन"</item>
+    <item msgid="8694611243479480497">"सूचना"</item>
     <item msgid="7776439107987345446">"सेल स्कैन"</item>
     <item msgid="514615766544675057">"फ़ोन पर कॉल करें"</item>
-    <item msgid="8181415497109310680">"SMS पढ़ें"</item>
-    <item msgid="6816551144382117307">"SMS लिखें"</item>
-    <item msgid="4600463921908905030">"SMS प्राप्त करें"</item>
-    <item msgid="5958926493289432745">"आपातकालीन SMS प्राप्त करें"</item>
-    <item msgid="4945269495221089540">"MMS प्राप्त करें"</item>
+    <item msgid="8181415497109310680">"मैसेज (एसएमएस) पढ़ें"</item>
+    <item msgid="6816551144382117307">"मैसेज (एसएमएस) लिखें"</item>
+    <item msgid="4600463921908905030">"मैसेज (एसएमएस) पाएं"</item>
+    <item msgid="5958926493289432745">"आपातकालीन मैसेज (एसएमएस) पाएं"</item>
+    <item msgid="4945269495221089540">"मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
     <item msgid="5570472453573929087">"WAP पुश प्राप्त करें"</item>
-    <item msgid="7125408150230860501">"SMS भेजें"</item>
-    <item msgid="7080337936612188061">"ICC SMS पढ़ें"</item>
-    <item msgid="587124103118495063">"ICC SMS लिखें"</item>
+    <item msgid="7125408150230860501">"मैसेज (एसएमएस) भेजें"</item>
+    <item msgid="7080337936612188061">"ICC मैसेज (एसएमएस) पढ़ें"</item>
+    <item msgid="587124103118495063">"ICC मैसेज (एसएमएस) लिखें"</item>
     <item msgid="2320577158869025503">"सेटिंग बदलें"</item>
     <item msgid="1545733463471924009">"ऊपर बनाएं"</item>
-    <item msgid="3609046903962454582">"नोटिफ़िकेशन को एक्सेस करें"</item>
+    <item msgid="3609046903962454582">"सूचना पाएं"</item>
     <item msgid="4671646036128214513">"कैमरा"</item>
     <item msgid="1097324338692486211">"ऑडियो रिकॉर्ड करें"</item>
     <item msgid="5031552983987798163">"ऑडियो चलाएं"</item>
@@ -285,11 +275,11 @@
     <item msgid="4270236897655923007">"रिंग आवाज़"</item>
     <item msgid="6325739889222559394">"मीडिया वॉल्‍यूम"</item>
     <item msgid="5762123934816216821">"अलार्म वॉल्‍यूम"</item>
-    <item msgid="785049718065337473">"नोटिफ़िकेशन वॉल्‍यूम"</item>
+    <item msgid="785049718065337473">"सूचना की आवाज़"</item>
     <item msgid="6700305533746877052">"bluetooth आवाज़"</item>
     <item msgid="2029227495214047094">"सचेत रखें"</item>
-    <item msgid="26109888160231211">"मॉनिटर का स्थान"</item>
-    <item msgid="5753382310468855812">"उच्च पावर वाले स्थान की निगरानी करें"</item>
+    <item msgid="26109888160231211">"जगह की निगरानी करें"</item>
+    <item msgid="5753382310468855812">"उच्च पावर वाली जगह की निगरानी करें"</item>
     <item msgid="3356591542543137332">"उपयोग के आंकड़े प्राप्त करें"</item>
     <item msgid="3073734345226842233">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
     <item msgid="2111767435887685265">"टोस्ट दिखाएं"</item>
@@ -301,45 +291,45 @@
     <item msgid="8582699692765917557">"फ़ोन स्‍थिति पढ़ें"</item>
     <item msgid="1474039653814954902">"वॉइसमेल जोड़ें"</item>
     <item msgid="7222837656938871633">"सिप का उपयोग करें"</item>
-    <item msgid="6108267038969274380">"आउटगोइंग कॉल संसाधित करें"</item>
+    <item msgid="6108267038969274380">"कॉल करें"</item>
     <item msgid="4823402479973873358">"फ़िंगरप्रिंट"</item>
     <item msgid="5895843015407713543">"शरीर संवेदक"</item>
-    <item msgid="1436446526955010826">"सेल प्रसारण पढ़ें"</item>
-    <item msgid="884172201575690484">"कृत्रिम स्थान"</item>
+    <item msgid="1436446526955010826">"सेल ब्रॉडकास्ट (CBC) पढ़ें"</item>
+    <item msgid="884172201575690484">"नकली जगह"</item>
     <item msgid="3591971310048485247">"मेमोरी पढ़ें"</item>
     <item msgid="4041187808621866119">"मेमोरी लिखें"</item>
     <item msgid="6628873315024166197">"स्क्रीन चालू करें"</item>
     <item msgid="3253368931113490863">"खाते प्राप्त करें"</item>
     <item msgid="780392378084812901">"पृष्ठभूमि में चलाएं"</item>
-    <item msgid="2629748510881309577">"एक्सेस-योग्यता वॉल्यूम"</item>
+    <item msgid="2629748510881309577">"सुलभता सुविधाओं के लिए वॉल्यूम"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"स्थान"</item>
-    <item msgid="8677040780775113033">"स्थान"</item>
-    <item msgid="1660743989948992916">"स्थान"</item>
-    <item msgid="8791172739860195290">"कंपन"</item>
+    <item msgid="6602854600289714121">"जगह"</item>
+    <item msgid="8677040780775113033">"जगह"</item>
+    <item msgid="1660743989948992916">"जगह"</item>
+    <item msgid="8791172739860195290">"कंपन (वाइब्रेशन)"</item>
     <item msgid="383413555642128046">"संपर्क पढ़ें"</item>
     <item msgid="3654594895269697313">"संपर्कों को बदलें"</item>
     <item msgid="7928393476362362538">"कॉल लॉग पढ़ें"</item>
     <item msgid="6248591205254641116">"कॉल लॉग बदलें"</item>
     <item msgid="6093344633066170692">"कैलेंडर पढ़ें"</item>
     <item msgid="1334886368750347692">"कैलेंडर बदलें"</item>
-    <item msgid="1638204101698708656">"स्थान"</item>
-    <item msgid="2154671955760380322">"नोटिफ़िकेशन पोस्ट करें"</item>
-    <item msgid="4282477730595931828">"स्थान"</item>
+    <item msgid="1638204101698708656">"जगह"</item>
+    <item msgid="2154671955760380322">"सूचना पोस्ट करें"</item>
+    <item msgid="4282477730595931828">"जगह"</item>
     <item msgid="4891423912898525905">"फ़ोन पर कॉल करें"</item>
-    <item msgid="2623604824935968113">"SMS/MMS पढ़ें"</item>
-    <item msgid="4420177125221176306">"SMS/MMS लिखें"</item>
-    <item msgid="3986142739951490025">"SMS/MMS प्राप्त करें"</item>
-    <item msgid="3984213795861739778">"SMS/MMS प्राप्त करें"</item>
-    <item msgid="3656243523752472788">"SMS/MMS प्राप्त करें"</item>
-    <item msgid="8105802370238551510">"SMS/MMS प्राप्त करें"</item>
-    <item msgid="1407766984645388488">"SMS/MMS भेजें"</item>
-    <item msgid="3527273606643794973">"SMS/MMS पढ़ें"</item>
-    <item msgid="4370895547001583812">"SMS/MMS लिखें"</item>
+    <item msgid="2623604824935968113">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पढ़ें"</item>
+    <item msgid="4420177125221176306">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) लिखें"</item>
+    <item msgid="3986142739951490025">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="3984213795861739778">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="3656243523752472788">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="8105802370238551510">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पाएं"</item>
+    <item msgid="1407766984645388488">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) भेजें"</item>
+    <item msgid="3527273606643794973">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) पढ़ें"</item>
+    <item msgid="4370895547001583812">"मैसेज (एसएमएस)/मल्टीमीडिया मैसेज (एमएमएस) लिखें"</item>
     <item msgid="4218544235221631789">"सेटिंग बदलें"</item>
     <item msgid="736541391767350377">"ऊपर बनाएं"</item>
-    <item msgid="5530815681721654194">"नोटिफ़िकेशन को एक्सेस करें"</item>
+    <item msgid="5530815681721654194">"सूचना पाएं"</item>
     <item msgid="781213371706962767">"कैमरा"</item>
     <item msgid="1720492593061838172">"ऑडियो रिकॉर्ड करें"</item>
     <item msgid="3493046322001257041">"ऑडियो चलाएं"</item>
@@ -352,11 +342,11 @@
     <item msgid="7983336752371254444">"रिंग आवाज़"</item>
     <item msgid="7878027809189330917">"मीडिया वॉल्‍यूम"</item>
     <item msgid="7260546305036218513">"अलार्म वॉल्‍यूम"</item>
-    <item msgid="9103719301075748925">"नोटिफ़िकेशन वॉल्‍यूम"</item>
+    <item msgid="9103719301075748925">"सूचना की आवाज़"</item>
     <item msgid="7025966722295861512">"ब्लूटूथ वॉल्‍यूम"</item>
     <item msgid="4665183401128289653">"सचेत रखें"</item>
-    <item msgid="8584357129746649222">"स्थान"</item>
-    <item msgid="7669257279311110599">"स्थान"</item>
+    <item msgid="8584357129746649222">"जगह"</item>
+    <item msgid="7669257279311110599">"जगह"</item>
     <item msgid="3459320345690097795">"उपयोग के आंकड़े प्राप्त करें"</item>
     <item msgid="1312534577834048535">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
     <item msgid="427580389823724225">"टोस्ट दिखाएं"</item>
@@ -368,17 +358,17 @@
     <item msgid="8571369610363539266">"फ़ोन स्‍थिति पढ़ें"</item>
     <item msgid="4542463358215230845">"वॉइसमेल जोड़ें"</item>
     <item msgid="864565065016166003">"सिप का उपयोग करें"</item>
-    <item msgid="1958009349883195116">"आउटगोइंग कॉल संसाधित करें"</item>
+    <item msgid="1958009349883195116">"कॉल करें"</item>
     <item msgid="8526563410140613458">"फ़िंगरप्रिंट"</item>
     <item msgid="7864822459293570891">"शरीर संवेदक"</item>
-    <item msgid="6798698496904810960">"सेल प्रसारण पढ़ें"</item>
-    <item msgid="5242052845700875820">"कृत्रिम स्थान"</item>
+    <item msgid="6798698496904810960">"सेल ब्रॉडकास्ट (CBC) पढ़ें"</item>
+    <item msgid="5242052845700875820">"नकली जगह"</item>
     <item msgid="1246296877820358565">"मेमोरी पढ़ें"</item>
     <item msgid="2404067308793740341">"मेमोरी लिखें"</item>
     <item msgid="5832543806893763620">"स्क्रीन चालू करें"</item>
     <item msgid="5258373962467495905">"खाते प्राप्त करें"</item>
     <item msgid="334625385979270703">"पृष्ठभूमि में चलाएं"</item>
-    <item msgid="9039213578110332702">"एक्सेस-योग्यता वॉल्यूम"</item>
+    <item msgid="9039213578110332702">"सुलभता सुविधाओं के लिए वॉल्यूम"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
@@ -438,7 +428,7 @@
     <item msgid="6692305604213080515">"आरंभ हो रहा है..."</item>
     <item msgid="8001704909356800092">"कनेक्ट हो रहा है..."</item>
     <item msgid="4039737283841672166">"कनेक्ट किया गया"</item>
-    <item msgid="4042143101664725090">"समयबाह्य"</item>
+    <item msgid="4042143101664725090">"कोई काम खत्म होने से पहले का समय अंतर (टाइम आउट)"</item>
     <item msgid="7664124146786465092">"विफल"</item>
   </string-array>
   <string-array name="security_settings_premium_sms_values">
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fa5317393c92fd4fa8b550ea6e3498ae49faafff..f618aee522ebe7878624e6f198b58730ca20a6b5 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -30,17 +30,19 @@
     </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>
     <string name="header_category_personal" msgid="3310195187905720823">"व्यक्तिगत"</string>
     <string name="header_category_access" msgid="7580499097416970962">"एक्सेस करें"</string>
     <string name="header_category_system" msgid="2816866961183068977">"सिस्‍टम"</string>
-    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटा कनेक्शन सक्षम करें"</string>
+    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटा कनेक्शन चालू करें"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"डेटा कनेक्शन अक्षम करें"</string>
     <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>
@@ -76,8 +78,8 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD कार्ड अनमाउंट करें"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB मेमोरी मिटाएं"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD कार्ड मिटाएं"</string>
-    <string name="preview_pager_content_description" msgid="8926235999291761243">"पूर्वावलोकन"</string>
-    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"पूर्वावलोकन, पेज <xliff:g id="NUM_PAGES">%2$d</xliff:g> में से <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"झलक"</string>
+    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"पेज <xliff:g id="NUM_PAGES">%2$d</xliff:g> में से <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> की झलक"</string>
     <string name="font_size_summary" msgid="1690992332887488183">"स्क्रीन पर स्थित लेख को छोटा या बड़ा करें."</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"छोटा करें"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"बड़ा करें"</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>
@@ -118,10 +127,10 @@
     <string name="bluetooth_device" msgid="5291950341750186887">"अनामित ब्लूटूथ डिवाइस"</string>
     <string name="progress_scanning" msgid="192587958424295789">"खोजना"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"आस-पास कोई ब्लूटूथ डिवाइस नहीं मिला."</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"ब्लूटूथ से जोड़ने का अनुरोध"</string>
-    <string name="bluetooth_notif_title" msgid="2485175521845371514">"दूसरे डिवाइस से जोड़ना का अनुरोध"</string>
+    <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>
@@ -149,21 +158,24 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ब्लूटूथ कनेक्शन अनुरोध"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करने के लिए टैप करें."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"क्या आप \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करना चाहते हैं?"</string>
-    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"फ़ोन बुक एक्सेस अनुरोध"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपके संपर्क और कॉल इतिहास एक्सेस करना चाहता है. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> को एक्सेस दें?"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"फ़ोन बुक का इस्तेमाल करने का अनुरोध"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> आपके संपर्क और कॉल इतिहास तक पहुंचना चाहता है. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> को पहुंचने दें?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"फिर से न पूछें"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"फिर से न पूछें"</string>
-    <string name="bluetooth_map_request" msgid="4595727689513143902">"संदेश एक्सेस अनुरोध"</string>
-    <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_map_request" msgid="4595727689513143902">"मैसेज तक पहुंच पाने का अनुरोध किया गया"</string>
+    <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> आपके SIM कार्ड को ऐक्सेस करना चाहता है. SIM कार्ड की ऐक्सेस देने से कनेक्शन की अवधि तक आपके डिवाइस पर डेटा कनेक्टिविटी अक्षम हो जाएगी. <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g> को ऐक्सेस दें"</string>
-    <string name="date_and_time" msgid="9062980487860757694">"दिनांक और समय"</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) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"<xliff:g id="BROADCAST">broadcast</xliff:g> भेजें"</string>
     <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
-    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> प्रारंभ करें"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> शुरू करें"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"खाता:"</string>
     <string name="proxy_settings_title" msgid="9049437837600320881">"प्रॉक्सी"</string>
@@ -171,22 +183,22 @@
     <string name="proxy_port_label" msgid="5655276502233453400">"प्रॉक्सी पोर्ट"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"इसके लिए प्रॉक्‍सी का उपयोग न करें"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"डिफ़ॉल्ट पुनर्स्थापित करें"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"पूर्ण"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"हो गया"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"प्रॉक्सी होस्‍टनाम"</string>
     <string name="proxy_error" msgid="8926675299638611451">"ध्यान दें"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ठीक है"</string>
     <string name="proxy_error_invalid_host" msgid="6865850167802455230">"आपके द्वारा लिखा गया होस्‍टनाम मान्‍य नहीं है."</string>
-    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"आपके द्वारा लिखी गई बहिष्करण सूची ठीक से प्रारूपित नहीं है. बहिष्‍कृत डोमेन की अल्‍पविराम द्वारा पृथक सूची लिखें."</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"अलग किये गए डोमेन (वो डोमेन जिन्हें सर्च में शामिल नहीं किया जाएगा) की जो सूची आपने टाइप की है वो सही फ़ॉर्मेट में नहीं है. डोमेन की बीच में कॉमा लगाकर बनाई गई सूची टाइप करें।"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"आपको पोर्ट फ़ील्‍ड पूर्ण करना होगा."</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"यदि होस्‍ट फ़ील्‍ड खाली है तो पोर्ट फ़ील्‍ड को खाली होना ही चाहिए."</string>
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"आपके द्वारा लिखा गया पोर्ट मान्‍य नहीं है."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य ऐप्स द्वारा उपयोग नहीं किया जा सकता."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
-    <string name="radio_info_signal_location_label" msgid="3242990404410530456">"सेल स्थान की जानकारी (बहिष्कृत):"</string>
+    <string name="proxy_url_title" msgid="7185282894936042359">"PAC यूआरएल: "</string>
+    <string name="radio_info_signal_location_label" msgid="3242990404410530456">"मोबाइल की जगह की जानकारी (रोकी गयी है):"</string>
     <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"आस-पास के सेल की जानकारी (बहिष्कृत):"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"सेल जानकारी रीफ्रेश दर:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"सेल माप की सभी जानकारी:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"डेटा कनेक्शन की रीयल-टाइम जानकारी:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"डेटा कनेक्शन की मौजूदा जानकारी:"</string>
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"डेटा सेवा:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिंग:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
@@ -209,17 +221,17 @@
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"HTTP क्लाइंट परीक्षण:"</string>
     <string name="ping_test_label" msgid="579228584343892613">"पिंग परीक्षण चलाएं"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
-    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"नई जानकारी"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"अपडेट करें"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"रीफ़्रेश करें"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS जांच टॉगल करें"</string>
-    <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-विशिष्ट जानकारी/सेटिंग"</string>
+    <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-खास जानकारी/सेटिंग"</string>
     <string name="band_mode_title" msgid="4071411679019296568">"रेडियो बैंड मोड सेट करें"</string>
     <string name="band_mode_loading" msgid="3555063585133586152">"बैंड सूची लोड कर रहा है..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"सेट करें"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"असफल"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"सफल"</string>
     <string name="sdcard_changes_instructions" msgid="4482324130377280131">"USB केबल पुन: कनेक्‍ट किए जाने पर परिवर्तन लागू हो जाते हैं."</string>
-    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB विशाल मेमोरी सक्षम करें"</string>
+    <string name="sdcard_settings_screen_mass_storage_text" msgid="3741220147296482474">"USB अतिरिक्त मेमोरी चालू करें"</string>
     <string name="sdcard_settings_total_bytes_label" msgid="9184160745785062144">"कुल बाइट:"</string>
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB मेमोरी माउंट नहीं है."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"कोई SD कार्ड नहीं."</string>
@@ -257,15 +269,15 @@
     <string name="activity_picker_label" msgid="6295660302548177109">"गतिविधि चुनें"</string>
     <string name="device_info_label" msgid="6551553813651711205">"डिवाइस जानकारी"</string>
     <string name="display_label" msgid="8074070940506840792">"स्क्रीन"</string>
-    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"टेबलेट जानकारी"</string>
-    <string name="phone_info_label" product="default" msgid="2127552523124277664">"फ़ोन जानकारी"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"टैबलेट की जानकारी देखें"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"फ़ोन की जानकारी देखें"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB मेमोरी"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD कार्ड"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"प्रॉक्सी सेटिंग"</string>
-    <string name="cancel" msgid="6859253417269739139">"अभी नहीं"</string>
-    <string name="okay" msgid="1997666393121016642">"ठीक"</string>
+    <string name="cancel" msgid="6859253417269739139">"रद्द करें"</string>
+    <string name="okay" msgid="1997666393121016642">"ठीक है"</string>
     <string name="forget" msgid="1400428660472591263">"भूल जाएं"</string>
-    <string name="save" msgid="879993180139353333">"सहेजें"</string>
+    <string name="save" msgid="879993180139353333">"सेव करें"</string>
     <string name="done" msgid="6942539184162713160">"हो गया"</string>
     <string name="settings_label" msgid="1626402585530130914">"सेटिंग"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग"</string>
@@ -277,7 +289,7 @@
     <string name="radio_controls_summary" msgid="1838624369870907268">"वाई-फ़ाई , ब्लूटूथ, हवाई जहाज़ मोड, मोबाइल नेटवर्क और VPN प्रबंधित करें"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"मोबाइल डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कॉल"</string>
-    <string name="sms_messages_title" msgid="1778636286080572535">"SMS संदेश"</string>
+    <string name="sms_messages_title" msgid="1778636286080572535">"मैसेज (एसएमएस)"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"मोबाइल नेटवर्क पर डेटा खर्च की अनुमति"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"रोमिंग में डेटा खर्च करने की अनुमति दें"</string>
     <string name="roaming" msgid="3596055926335478572">"रोमिंग डेटा"</string>
@@ -285,16 +297,16 @@
     <string name="roaming_disable" msgid="1295279574370898378">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"आपने डेटा कनेक्टिविटी खो दी है क्योंकि आपने डेटा रोमिंग बंद रखकर अपना होम नेटवर्क छोड़ दिया."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"इसे चालू करें"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"आपको बहुत अधिक शुल्‍क देना पड़ सकता है."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको अधिक रोमिंग शुल्क लगे!\n\nयह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"आपको बहुत ज़्यादा शुल्‍क देना पड़ सकता है."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको अधिक रोमिंग शुल्क लगे!\n\nयह सेटिंग इस टैबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"जब आप डेटा रोमिंग की अनुमति देते हैं, तो हो सकता है कि आपको अधिक रोमिंग शुल्क लगे!\n\nयह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"डेटा रोमिंग की अनुमति दें?"</string>
     <string name="networks" msgid="6333316876545927039">"ऑपरेटर चयन"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"कोई नेटवर्क ऑपरेटर चुनें"</string>
-    <string name="date_and_time_settings_title" msgid="3350640463596716780">"दिनांक और समय"</string>
+    <string name="date_and_time_settings_title" msgid="3350640463596716780">"तारीख और समय"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"दिनांक और समय सेट करें"</string>
-    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"दिनांक, समय, समय क्षेत्र और प्रारूप सेट करें"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"ऑटोमैटिक दिनांक और समय"</string>
+    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"तारीख, समय, समय क्षेत्र और प्रारूप सेट करें"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"ऑटोमैटिक तारीख और समय"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"नेटवर्क-प्रदत्त समय का उपयोग करें"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"नेटवर्क-प्रदत्त समय का उपयोग करें"</string>
     <string name="zone_auto" msgid="334783869352026648">"ऑटोमैटिक समय क्षेत्र"</string>
@@ -306,11 +318,11 @@
     <string name="date_time_set_time" msgid="5716856602742530696">"समय सेट करें"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"समय क्षेत्र"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"समय क्षेत्र को चुनें"</string>
-    <string name="date_time_set_date_title" msgid="6928286765325608604">"दिनांक"</string>
+    <string name="date_time_set_date_title" msgid="6928286765325608604">"तारीख"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"दिनांक सेट करें"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"वर्णानुक्रम में क्रमित करें"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"समय क्षेत्र द्वारा क्रमित करें"</string>
-    <string name="date_picker_title" msgid="1338210036394128512">"तिथि"</string>
+    <string name="date_picker_title" msgid="1338210036394128512">"तारीख"</string>
     <string name="time_picker_title" msgid="483460752287255019">"समय"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"अपने आप लॉक करें"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> निष्क्रियता के बाद"</string>
@@ -318,24 +330,24 @@
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> के अनलॉक रखे जाने के अलावा, कम बैटरी मोड में होने के बाद <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"लॉक स्‍क्रीन पर अपनी जानकारी दिखाएं"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"लॉक स्‍क्रीन संदेश"</string>
-    <string name="security_enable_widgets_title" msgid="2754833397070967846">"शॉर्टकट सक्षम करें"</string>
+    <string name="security_enable_widgets_title" msgid="2754833397070967846">"शॉर्टकट चालू करें"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"व्यवस्थापक ने अक्षम किया है"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"कोई नहीं"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"उदा., जो का Android."</string>
-    <string name="user_info_settings_title" msgid="1195015434996724736">"उपयोगकर्ता जानकारी"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"उदाहरण, जो का Android."</string>
+    <string name="user_info_settings_title" msgid="1195015434996724736">"उपयोगकर्ता की जानकारी"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"लॉक स्क्रीन पर प्रोफ़ाइल की जानकारी दिखाएं"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफ़ाइल की जानकारी"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाते"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</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="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>
+    <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>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"लॉक स्क्रीन प्राथमिकताएं"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"मेरी जगह, स्‍क्रीन का लॉक खोलना, सिम कार्ड लॉक, क्रेडेंशियल स्टोरेज लॉक सेट करें"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, क्रेडेंशियल स्टोरेज लॉक सेट करें"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"निजता"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"व्यवस्थापक ने अक्षम किया है"</string>
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षा स्थिति"</string>
@@ -354,47 +366,46 @@
     <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_cancel" msgid="3199351118385606526">"अभी नहीं"</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_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_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="2068961812439460133">"सेंसर को छुएं"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"अपनी उंगली सेंसर पर रखें और कंपन (वाइब्रेशन) महसूस होने पर उठा लें"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"इसे बाद में करें"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फ़िंगरप्रिंट सेटअप छोड़ें?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपने अपने फ़ोन को अनलॉक करने के एक तरीके के रूप में अपने फ़िंगरप्रिंट का उपयोग करने का चयन किया है. यदि आप इसे अभी छोड़ते हैं, तो आपको इसे बाद में सेट करना होगा. सेटअप में लगभग एक मिनट लगता है."</string>
     <string name="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_title" msgid="1863561601428695160">"ओह हो, वह सेंसर नहीं है"</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>
-    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"कोई अन्‍य जोड़ें"</string>
+    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"कोई और जोड़ें"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"आगे"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"अपना फ़ोन अनलॉक करने के साथ ही, खरीदी और ऐप ऐक्‍सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"और जानें"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" स्क्रीन लॉक विकल्प अक्षम है. अधिक जानने के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें. "<annotation id="admin_details">"अधिक विवरण"</annotation>\n\n"आप खरीदारी और ऐप्लिकेशन एक्सेस अधिकृत करने के लिए अभी भी अपने फ़िंगरप्रिंट का उपयोग कर सकते हैं. "<annotation id="url">"अधिक जानें"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"अपना फ़ोन अनलॉक करने के साथ-साथ, खरीदारी और ऐप ऐक्‍सेस को अधिकृत करने के लिए आप अपनी फ़िंगरप्रिंट का भी उपयोग कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" स्क्रीन लॉक विकल्प बंद है. ज़्यादा जानने के लिए, अपने संगठन के एडमिन से संपर्क करें. "<annotation id="admin_details">"ज़्यादा जानकारी{"</annotation>\n\n"आप खरीदारी और ऐप एक्सेस की अनुमति देने के लिए अभी भी अपने फ़िंगरप्रिंट का इस्तेमाल कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"उंगली उठाएं और सेंसर को फिर छूएं"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"आप <xliff:g id="COUNT">%d</xliff:g> फ़िंगरप्रिंट तक जोड़ सकते हैं"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"आप अधिकतम संख्या में फ़िंगरप्रिंट जोड़ चुके हैं"</string>
@@ -404,37 +415,37 @@
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"आप अपनी कार्य प्रोफ़ाइल अनलॉक करने, खरीदारी अधिकृत करने या अपने कार्य ऐप्लिकेशन में प्रवेश करने के लिए अपने फ़िंगरप्रिंट का उपयोग नहीं कर सकेंगे."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"हां, निकालें"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"जारी रखने के लिए अपने फ़िंगरप्रिंट का उपयोग करें."</string>
-    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एन्‍क्रिप्‍शन"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"सुरक्षित करना"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टैबलेट सुरक्षित करें"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फ़ोन सुरक्षित करें"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एन्‍िक्रप्ट किया गया"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप और उनका डेटा, मीडिया और अन्य फ़ाइलें एन्क्रिप्ट कर सकते हैं. अपना फ़ोन एन्क्रिप्ट करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (जैसे पैटर्न या पिन या पासवर्ड) सेट कर लिया है, आपको हर बार अपना फ़ोन चालू करते समय इसे डीक्रिप्ट करने के लिए स्क्रीन को अनलॉक करना होगा. आप फ़ैक्ट्री डेटा रीसेट करके भी फ़ोन को डीक्रिप्ट कर सकते हैं. \n\nएन्क्रिप्शन में एक घंटा या इससे ज़्यादा समय लग सकता है. आप जब एन्क्रिप्शन शुरू करें तो बैटरी को पूरी चार्ज रखें और पूरी प्रक्रिया के दौरान अपने फ़ोन को चार्जिंग पर रखें. अगर एन्क्रिप्शन के दौरान कोई रुकावट आती है, तो आप अपना थोड़ा या सारा डेटा खो सकते हैं."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप और उनका डेटा, मीडिया और अन्य फ़ाइलें एन्क्रिप्ट कर सकते हैं. अपना फ़ोन एन्क्रिप्ट करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (जैसे पैटर्न या पिन या पासवर्ड) सेट कर लिया है, आपको हर बार अपना फ़ोन चालू करते समय इसे डीक्रिप्ट करने के लिए स्क्रीन को अनलॉक करना होगा. आप फ़ैक्ट्री डेटा रीसेट करके भी फ़ोन को डीक्रिप्ट कर सकते हैं. \n\nएन्क्रिप्शन में एक घंटा या इससे ज़्यादा समय लग सकता है. आप जब एन्क्रिप्शन शुरू करें तो बैटरी को पूरी चार्ज रखें और पूरी प्रक्रिया के दौरान अपने फ़ोन को चार्जिंग पर रखें. अगर एन्क्रिप्शन के दौरान कोई रुकावट आती है, तो आप अपना थोड़ा या सारा डेटा खो सकते हैं."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप और उनका डेटा, मीडिया और अन्य फ़ाइलें सुरक्षित कर सकते हैं. अपना टैबलेट सुरक्षित करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (जैसे पैटर्न या पिन या पासवर्ड) सेट कर लिया है, आपको हर बार अपना टैबलेट चालू करते समय इसे सबकी पहुंच में लाने के लिए स्क्रीन के लॉक को खोलना होगा. आप फ़ैक्ट्री डेटा रीसेट करके भी टैबलेट को सबकी पहुंच में ला सकते हैं. \n\nसुरक्षित करने में एक घंटा या इससे ज़्यादा समय लग सकता है. आप जब सुरक्षित करना शुरू करें तो बैटरी को पूरी तरह चार्ज रखें और पूरी प्रक्रिया के दौरान अपने टैबलेट को चार्जिंग पर रखें. अगर सुरक्षित करने के दौरान कोई रुकावट आती है, तो आपका थोड़ा या सारा डेटा खो सकता है."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप और उनका डेटा, मीडिया और अन्य फ़ाइलें सुरक्षित कर सकते हैं. अपना फ़ोन सुरक्षित करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (जैसे पैटर्न या पिन या पासवर्ड) सेट कर लिया है, आपको हर बार अपना फ़ोन चालू करते समय इसे सबकी पहुंच में लाने के लिए स्क्रीन के लॉक को खोलना होगा. आप फ़ैक्ट्री डेटा रीसेट करके भी फ़ोन को सबकी पहुंच में ला सकते हैं. \n\nसुरक्षित करने में एक घंटा या इससे ज़्यादा समय लग सकता है. आप जब सुरक्षित करना शुरू करें तो बैटरी को पूरी तरह चार्ज रखें और पूरी प्रक्रिया के दौरान अपने फ़ोन को चार्जिंग पर रखें. अगर सुरक्षित करने के दौरान कोई रुकावट आती है, तो आपका थोड़ा या सारा डेटा खो सकता है."</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टैबलेट सुरक्षित करें"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फ़ोन सुरक्षित करें"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"अपनी बैटरी चार्ज करें और पुन: प्रयास करें."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"अपना चार्जर प्लग में लगाएं और पुन: प्रयास करें."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोई लॉक स्‍क्रीन पिन या पासवर्ड नहीं"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"एन्‍क्रिप्‍शन प्रारंभ करने से पहले आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
-    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एन्‍क्रिप्‍ट करें?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"एन्‍क्रिप्शन कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान टेबलेट कई बार पुन: प्रारंभ होगा."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"सुरक्षित करने का कार्यवाही पूर्ववत नहीं की जा सकती है और यदि आप इसमें बाधा डालते हैं, तो आप डेटा खो देंगे. एन्‍क्रिप्‍शन में एक घंटा या अधिक लग सकता है, इस दौरान फ़ोन कई बार पुन: प्रारंभ होगा."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"सुरक्षित करने से पहले आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"सुरक्षित करें?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"सुरक्षित करने का काम एक बार शुरू करने के बाद इसे वापस बदला नहीं जा सकता और अगर आप इसे बीच में रोकते हैं, तो आप डेटा खो देंगे. सुरक्षित करने में एक घंटा या उससे ज़्यादा समय लग सकता है, इस दौरान टैबलेट कई बार रिस्टार्ट होगा."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"सुरक्षित करने का काम एक बार शुरू करने के बाद इसे वापस बदला नहीं जा सकता और अगर आप इसे बीच में रोकते हैं, तो आप डेटा खो देंगे. सुरक्षित करने में एक घंटा या उससे ज़्यादा समय लग सकता है, इस दौरान फ़ोन कई बार रिस्टार्ट होगा."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"एन्‍क्रिप्‍ट करना"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"अपना टेबलेट एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"अपना टैबलेट एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"अपना फ़ोन एन्‍क्रिप्‍ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"जब तक आपका टेबलेट एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"जब तक आपका टैबलेट एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"जब तक आपका फ़ोन एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"अपना टैबलेट अनलॉक करने के लिए, उसे बंद करें फिर चालू करें."</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"अपना फ़ोन अनलॉक करने के लिए, उसे बंद करें फिर चालू करें."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावनी: अनलॉक किए जाने के <xliff:g id="COUNT">^1</xliff:g> और विफल प्रयासों के बाद आपका डिवाइस हटा दिया जाएगा!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"अपना पासवर्ड लिखें"</string>
-    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एन्क्रिप्‍शन विफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"एन्‍क्रिप्‍शन बाधित किया था और पूर्ण नहीं हो सकता. परिणामस्‍वरूप, आपके टेबलेट का डेटा अब पहुंच योग्‍य नहीं है. \n\n अपने टेबलेट का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टेबलेट सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"एन्‍क्रिप्‍शन बाधित था और पूर्ण नहीं हो सकता. इसके परिणामस्‍वरूप, आपके फ़ोन का डेटा अब पहुंच योग्‍य नहीं है. \n\nअपने फ़ोन का उपयोग फिर से शुरू करने के लिए, आपको फ़ैक्‍टरी रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करते हैं, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को पुनर्स्थापित कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"सुरक्षित नहीं किया जा सका"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"सुरक्षित करने में रुकावट हुई और यह काम पूरा नहीं किया जा सका. इसलिए अब आपके टैबलेट के डेटा तक नहीं पहुंचा जा सकता. \n\nअपने टैबलेट का इस्तेमाल फिर से शुरू करने के लिए, आपको फ़ैक्‍ट्री रीसेट करना होगा. जब आप रीसेट करने के बाद अपना टैबलेट सेट करेंगे, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को बहाल कर सकेंगे."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"सुरक्षित करने में रुकावट हुई और यह काम पूरा नहीं किया जा सका. इसलिए अब आपके फ़ोन के डेटा तक नहीं पहुंचा जा सकता. \n\nअपने फ़ोन का इस्तेमाल फिर से शुरू करने के लिए, आपको फ़ैक्‍ट्री रीसेट करना होगा. जब आप रीसेट करने के बाद अपना फ़ोन सेट करेंगे, तो आप अपने Google खाते पर बैकअप लिए गए किसी भी डेटा को बहाल कर सकेंगे."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"डीक्रिप्‍शन असफल"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"आपके द्वारा डाला गया पासवर्ड सही है, लेकिन दुर्भाग्‍य से आपका डेटा दूषित है. \n\nअपने टैबलेट का उपयोग फिर से शुरू करने के लिए आपको फ़ैक्टरी रीसेट करना होगा. जब आप रीसेट के बाद अपना टैबलेट रीसेट करते हैं, तो आपके पास अपने Google खाते में बैकअप लिए गए किसी भी डेटा को पुन: स्‍थापित करने का अवसर होगा."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"आपके द्वारा डाला गया पासवर्ड सही है, लेकिन दुर्भाग्‍य से आपका डेटा दूषित है. \n\nअपने फ़ोन का उपयोग फिर से शुरू करने के लिए आपको फ़ैक्टरी रीसेट करना होगा. जब आप रीसेट के बाद अपना फ़ोन सेट करते हैं, तो आपके पास अपने Google खाते में बैकअप किए गए किसी भी डेटा को पुन: स्‍थापित करने का अवसर होगा."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धति‍ स्विच करें"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट का तरीका बदलें"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"स्‍क्रीन लॉक सेट करना"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"अपने डिवाइस की सुरक्षा करें"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"फ़िंगरप्रिंट का उपयोग करना"</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>
@@ -466,14 +479,14 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"मध्‍यम से उच्‍च सुरक्षा"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"पासवर्ड"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"उच्च सुरक्षा"</string>
-    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"अभी नहीं"</string>
+    <string name="unlock_set_do_later_title" msgid="4894767558414979243">"रद्द करें"</string>
     <string name="current_screen_lock" msgid="4104091715420072219">"वर्तमान स्क्रीन लॉक"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"फ़िंगरप्रिंट + पैटर्न"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"फ़िंगरप्रिंट + पिन"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"फ़िंगरप्रिंट + पासवर्ड"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"फ़िंगरप्रिंट के बिना जारी रखें"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"आप अपने फ़िंगरप्रिंट का उपयोग करके अपना फ़ोन अनलॉक कर सकते हैं. सुरक्षा के लिए, इस विकल्प के लिए बैकअप स्क्रीन लॉक आवश्यक है."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"एडमिन, एन्क्रिप्शन नीति या क्रेडेंशियल स्टोरेज ने बंद किया है"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"एडमिन, सुरक्षित करने की नीति या क्रेडेंशियल स्टोरेज ने बंद किया है"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"कोई नहीं"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्वाइप करें"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"आकार"</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="1688030823464420974">"अगर आप अगली कोशिश में गलत पैटर्न डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"अगर आप अगली कोशिश में गलत पिन डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"अगर आप अगली कोशिश में गलत पासवर्ड डालते हैं, तो इस डिवाइस का डेटा हटा दिया जाएगा"</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="5047439819181833824">"बहुत सारी गलत कोशिशें की गई हैं. इस डिवाइस का डेटा हटा दिया जाएगा."</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>
@@ -564,15 +585,15 @@
     <string name="lockpassword_password_recently_used" msgid="942665351220525547">"डिवाइस व्यवस्थापक हाल ही के पासवर्ड का उपयोग करने की अनुमति नहीं देता"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"अंकों के बढ़ते, घटते या दोहराए जाने वाले क्रम की अनुमति नहीं है"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक है"</string>
-    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"अभी नहीं"</string>
-    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"अभी नहीं"</string>
+    <string name="lockpassword_cancel_label" msgid="8818529276331121899">"रद्द करें"</string>
+    <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"रद्द करें"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"आगे"</string>
     <string name="lock_setup" msgid="3355847066343753943">"सेटअप पूरा हुआ."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"डिवाइस व्यवस्थापक ऐप्लिकेशन"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"डिवाइस एडमिन ऐप"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"कोई भी सक्रिय ऐप्लिकेशन नहीं है"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय ऐप्लिकेशन</item>
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय ऐप्लिकेशन</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय ऐप</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय ऐप</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"ट्रस्ट एजेंट"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"उपयोग करने के लिए, सबसे पहले स्क्रीन लॉक सेट करें"</string>
@@ -585,7 +606,7 @@
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ब्लूटूथ चालू करें"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"ब्लूटूथ"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"ब्लूटूथ"</string>
-    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"कनेक्‍शन प्रबंधित करें, डिवाइस नाम और खोज योग्‍यता सेट करें"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"कनेक्‍शन प्रबंधित करें, डिवाइस का नाम सेट करें और उसे खोजने लायक बनाएं"</string>
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से जोड़ें?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"ब्‍लूटूथ से जोड़ने वाला कोड"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"दूसरे डिवाइस से जोड़ना वाला कोड लिखें और फिर Return या Enter दबाएं"</string>
@@ -602,7 +623,7 @@
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से कनेक्‍ट नहीं किया जा सका."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"डिवाइस के लिए स्‍कैन"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"रीफ्रेश करें"</string>
-    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"खोज रहा है…"</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"सर्च कर रहा है…"</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"डिवाइस सेटिंग"</string>
     <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"युग्मित डिवाइस"</string>
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"नाम"</string>
@@ -611,9 +632,9 @@
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"संपर्क और कॉल इतिहास"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"इस डिवाइस से जोड़ें?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"फ़ोन बुक साझा करें?"</string>
-    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपके संपर्कों और कॉल इतिहास को एक्सेस करना चाहता है."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ से युग्मित होना चाहता है. कनेक्ट होने पर, उसके पास आपके संपर्कों और कॉल इतिहास के लिए एक्सेस होगी."</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"युग्‍मित डिवाइस"</string>
+    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपके संपर्कों और कॉल इतिहास तक पहुंचना चाहता है."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth से जुड़ना चाहता है. कनेक्ट होने पर, वो आपके संपर्कों और कॉल इतिहास को देख सकेगा."</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"जोड़े गए डिवाइस"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"उपलब्ध डिवाइस"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"कोई डिवाइस उपलब्ध नहीं"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"जोड़ दें"</string>
@@ -623,15 +644,23 @@
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"डिस्‍कनेक्‍ट करें और जुड़ा हुआ डिवाइस हटाएं"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"विकल्प…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"बेहतर सेटिंग"</string>
-    <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_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>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"इनपुट डिवाइस से <xliff:g id="DEVICE_NAME">%1$s</xliff:g> को डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारा इंटरनेट पहुंच को डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस टेबलेट का इंटरनेट कनेक्‍शन शेयर करने से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस टैबलेट का इंटरनेट कनेक्‍शन शेयर करने से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को इस फ़ोन का इंटरनेट कनेक्‍शन शेयर करने से डिस्‍कनेक्‍ट कर दिया जाएगा."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"युग्‍मि‍त ब्लूटूथ डिवाइस"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"जोड़ दें"</string>
@@ -647,7 +676,7 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत और मीडिया के लिए"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग याद रखें"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्ट करें"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"बिना वायर के स्क्रीन दिखाना (वायरलेस डिसप्ले) सक्षम करें"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"बिना वायर के स्क्रीन दिखाना (वायरलेस डिसप्ले) चालू करें"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"आस-पास कोई भी डिवाइस नहीं मिला."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट कर रहा है"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट किया गया"</string>
@@ -664,16 +693,16 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को चालू करना चाहता है"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> वाई-फ़ाई को बंद करना चाहता है"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"आस-पास के उपकरणों से संपर्क (एन एफ सी)"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"जब टेबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"जब टैबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"जब फ़ोन अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC चालू करें"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC इस डिवाइस और आस-पास के अन्य डिवाइस या लक्ष्यों के बीच डेटा का आदान-प्रदान करता है, जैसे कि भुगतान टर्मिनल, एक्सेस रीडर और सहभागी विज्ञापन या टैग."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android बीम"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC के माध्यम से ऐप्स सामग्री प्रसारित करने के लिए तैयार"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC के माध्यम से ऐप सामग्री प्रसारित करने के लिए तैयार"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"बंद"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"अनुपलब्‍ध है क्‍योंकि NFC बंद है"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android बीम"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"इस सुविधा के चालू होने पर, आप ऐप्लिकेशन की सामग्री को किसी दूसरे NFC-सक्षम डिवाइस पर बीम कर सकते हैं, जिसके लिए आपको दोनों डिवाइस पास-पास पकड़कर रखने होंगे. उदाहरण के लिए, आप वेब पेज, YouTube वीडियो, संपर्कों आदि को बीम कर सकते हैं.\n\nबस दोनों डिवाइस साथ लाएं (आमतौर एक के पीछे एक) और फिर अपनी स्क्रीन टैप करें. ऐप्लिकेशन पता लगा लेता है कि कौन सी चीज़ बीम हो रही है."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"इस सुविधा के चालू होने पर, आप ऐप्लिकेशन की सामग्री को किसी ऐसे दूसरे डिवाइस पर बीम कर सकते हैं जिपर NFC की तकनीक काम करती हो. इसके लिए आपको दोनों डिवाइस पास-पास पकड़कर रखने होंगे. जैसे, आप वेब पेज, YouTube वीडियो, संपर्कों आदि को बीम कर सकते हैं.\n\nबस दोनों डिवाइस साथ लाएं (आमतौर एक के पीछे एक) और फिर अपनी स्क्रीन टैप करें. ऐप पता लगा लेता है कि कौन सी चीज़ बीम हो रही है."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"वाई-फ़ाई"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"वाई-फ़ाई  चालू करें"</string>
     <string name="wifi_settings" msgid="29722149822540994">"वाई-फ़ाई"</string>
@@ -686,19 +715,22 @@
     <string name="wifi_error" msgid="3207971103917128179">"गड़बड़ी"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz बैंड इस देश में उपलब्‍ध नहीं है"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"हवाई जहाज़ मोड में"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"खुले नेटवर्क का नोटिफ़िकेशन"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"ओपन नेटवर्क की सूचना"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"बढ़िया इंटरनेट देने वाला सार्वजनिक नेटवर्क मिलने पर बताएं"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"वाई-फ़ाई अपने आप चालू करें"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"वाई-फ़ाई बढ़िया इंटरनेट देने वाले सहेजे गए नेटवर्क के पास होने पर अपने आप चालू  हो जाएगा, जैसे कि आपके घर का नेटवर्क"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"अनुपलब्ध है क्योंकि वाई-फ़ाई स्कैनिंग बंद कर दी गई है"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"उपयोग करने के लिए, कोई नेटवर्क रेटिंग प्रदाता चुनें"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्‍शन से बचें"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"जब तक वाई-फ़ाई  नेटवर्क में अच्छा इंटरनेट कनेक्‍शन न हो, तब तक उसका उपयोग न करें"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"उन्हीं नेटवर्क का उपयोग करें जिनमें अच्छा इंटरनेट कनेक्शन है"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"खुले नेटवर्क से कनेक्ट करें"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"अच्छा इंटरनेट देने वाले सार्वजनिक नेटवर्क से अपने आप कनेक्ट करें"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"उपयोग करने के लिए, कोई नेटवर्क रेटिंग प्रदाता चुनें"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"उपयोग करने के लिए, कोई संगत नेटवर्क रेटिंग प्रदाता चुनें"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्र इंस्टाल करें"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"स्‍थान सटीकता को बेहतर बनाने के लिए, सिस्‍टम ऐप्‍स और सेवाएं अभी भी वाई-फ़ाई नेटवर्कों का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
-    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"स्थान सटीकता को बेहतर बनाने के लिए, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कैनिंग सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में वाई-फ़ाई स्कैनिंग चालू करें."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"जगह की और सटीक जानकारी देने के लिए, सिस्‍टम ऐप और सेवाएं अभी भी वाई-फ़ाई नेटवर्क का पता लगा सकती हैं. आप इसे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्‍कैन करने की सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में बदल सकते हैं."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"जगह की सटीकता को बेहतर बनाने के लिए, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कैनिंग सेटिंग<xliff:g id="LINK_END_1">LINK_END</xliff:g> में वाई-फ़ाई स्कैनिंग चालू करें."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"फिर से न दिखाएं"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"प्रयोग में नहीं रहने के दौरान वाई-फ़ाई चालू रखें"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"सुलाएं मोड में वाई-फ़ाई चालू"</string>
@@ -707,17 +739,17 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"वाई-फ़ाई  ऑप्टिमाइज़ेशन"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"वाई-फ़ाई  के चालू रहने पर बैटरी उपयोग को न्यूनतम करें"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"वाई-फ़ाई का बैटरी उपयोग कम करें"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"अगर वाई-फ़ाई, इंटरनेट एक्सेस खो देता है, तो मोबाइल डेटा पर स्विच करें."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"अगर वाई-फ़ाई नहीं चल रहा हो, तो मोबाइल डेटा पर स्विच करें."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"मोबाइल डेटा पर अपने आप स्विच करें"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"जब वाई-फ़ाई से इंटरनेट एक्सेस ना हो तो मोबाइल डेटा का उपयोग करें. डेटा शुल्क लागू हो सकता है."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"जब वाई-फ़ाई के ज़रिये इंटरनेट की सुविधा ना हो तो मोबाइल डेटा का इस्तेमाल करें. डेटा शुल्क लागू हो सकता है."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"नेटवर्क जोड़ें"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"वाई-फ़ाई संबंधी प्राथमिकताएं"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"वाई-फ़ाई अपने आप वापस चालू हो जाता है"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"वाई-फ़ाई अपने आप वापस चालू नहीं होता"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"वाई-फ़ाई  नेटवर्क"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS पुश बटन"</string>
-    <string name="wifi_menu_more_options" msgid="2448097861752719396">"अधिक विकल्प"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टि"</string>
+    <string name="wifi_menu_more_options" msgid="2448097861752719396">"ज़्यादा विकल्प"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन एंट्री"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाई-फ़ाई डायरेक्ट"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"बेहतर सेटिंग"</string>
@@ -728,13 +760,13 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क बदलें"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC टैग पर लिखें"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"उपलब्‍ध नेटवर्क देखने के लिए, वाई-फ़ाई  चालू करें."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"वाई-फ़ाई  नेटवर्क की खोज जारी है…"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"वाई-फ़ाई नेटवर्क की सर्च जारी है…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"आपको वाई-फ़ाई नेटवर्क बदलने की अनुमति नहीं है."</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"बेहतर विकल्प"</string>
-    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ड्रॉप डाउन सूची उन्नत विकल्प. संक्षिप्त करने के लिए डबल टैप करें."</string>
-    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ड्रॉप डाउन सूची उन्नत विकल्प. विस्तृत करने के लिए डबल टैप करें."</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ड्रॉप डाउन सूची के बेहतर विकल्प. छोटा करने के लिए दो बार छूएं."</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ड्रॉप डाउन सूची के बेहतर विकल्प. बड़ा करने के लिए दो बार छूएं."</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"वाई-फ़ाई  सुरक्षित सेटअप"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
     <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"अपने राउटर पर वाई-फ़ाई सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इस प्रतीक से चिह्नित हो सकता है:"</string>
@@ -755,7 +787,7 @@
     <string name="wifi_status" msgid="4824568012414605414">"स्थिति"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"लिंक गति"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"आवृत्ति"</string>
-    <string name="wifi_ip_address" msgid="1440054061044402918">"IP पता"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"आईपी पता"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"के द्वारा सहेजा गया"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> प्रमाणिकता"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP विधि"</string>
@@ -779,16 +811,17 @@
     <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>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"अपना नेटवर्क पासवर्ड डालें"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान की सटीकता को बेहतर बनाने और अन्य प्रयोजनों के लिए, वाई-फ़ाई  बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्कैनिंग को चालू करना चाहता है.\n\nइसकी अनुमति उन सभी ऐप्स  के लिए दें जो स्कैन करना चाहते हैं?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"जगह की सटीकता को बेहतर बनाने और दुसरे कामों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क को स्कैन करना चालू करना चाहता है.\n\nउन सभी ऐप को इसकी अनुमति दें जो स्कैन करना चाहते हैं?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"इसे बंद करने के लिए, ओवरफ़्लो मेन्यू में बेहतर पर जाएं."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"अस्वीकार करें"</string>
-    <string name="wifi_hotspot_title" msgid="7726205804813286950">"कनेक्ट करने के लिए प्रवेश करें?"</string>
-    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> के लिए आवश्यक है कि नेटवर्क से कनेक्ट करने से पहले ऑनलाइन प्रवेश करें."</string>
+    <string name="wifi_hotspot_title" msgid="7726205804813286950">"कनेक्ट करने के लिए साइन इन करें?"</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> के लिए नेटवर्क से कनेक्ट करने से पहले साइन करें."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"कनेक्ट करें"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"इस नेटवर्क में कोई इंटरनेट ऐक्‍सेस नहीं है. कनेक्‍ट रहें?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"इस नेटवर्क के लिए फिर से ना पूछें"</string>
@@ -803,25 +836,24 @@
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"नेटवर्क भूलने में विफल रहा"</string>
     <string name="wifi_save" msgid="3331121567988522826">"जोड़ें"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"नेटवर्क सहेजने में विफल रहा"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"अभी नहीं"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"रद्द करें"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"सहेजे गए नेटवर्क"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
       <item quantity="one">%d नेटवर्क</item>
       <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_advanced_ip_address_title" msgid="6215297094363164846">"आईपी पता"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 पते"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"सहेजे गए नेटवर्क"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP सेटिंग"</string>
-    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"वाई-फ़ाई की उन्नत सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"वाई-फ़ाई की बेहतर सेटिंग इस उपयोगकर्ता के लिए मौजूद नहीं हैं"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"जोड़ें"</string>
-    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"अभी नहीं"</string>
-    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"मान्‍य IP पता लिखें."</string>
+    <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"रद्द करें"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"सही आईपी पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"कोई मान्‍य गेटवे पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"कोई मान्‍य DNS पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"0 और 32 के बीच की लंबाई का नेटवर्क उपसर्ग लिखें."</string>
@@ -830,10 +862,10 @@
     <string name="wifi_gateway" msgid="163914742461092086">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"नेटवर्क उपसर्ग लंबाई"</string>
     <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"वाई-फ़ाई डायरेक्ट"</string>
-    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"डिवाइस जानकारी"</string>
+    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"डिवाइस की जानकारी"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"यह कनेक्‍शन याद रखें"</string>
-    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"डिवाइस खोजें"</string>
-    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"खोज रहा है…"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"डिवाइस सर्च करें"</string>
+    <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"खोज रहा है..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"डिवाइस का नाम बदलें"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"पीयर डिवाइस"</string>
     <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"याद रखे गए समूह"</string>
@@ -847,9 +879,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,21 +935,22 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाई-फ़ाई कॉलिंग चालू होने पर, आपका फ़ोन वाई-फ़ाई या मोबाइल और इंटरनेट सेवा देने वाली कंपनी के नेटवर्क के ज़रिए कॉल भेज सकता है. एेसा आपकी पसंद और सिग्‍नल की मज़बूती के आधार पर होता है. इस सुविधा को चालू करने से पहले, शुल्‍क और अन्‍य जानकारी के बारे में अपनी मोबाइल और इंटरनेट सेवा देने वाली कंपनी से बात करें."</string>
+    <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="emergency_address_summary" msgid="306028701568728126">"जब आप वाई-फ़ाई का इस्तेमाल करके 911 पर कॉल करते है तब आपातकालीन सेवाओं के ज़रिये आपकी जगह के तौर पर इस्तेमाल किया जाने वाला पता"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
-    <string name="sound_settings" msgid="5534671337768745343">"ध्वनि"</string>
+    <string name="sound_settings" msgid="5534671337768745343">"आवाज़"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज़"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"संगीत प्रभाव"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"रिंग वॉल्यूम"</string>
-    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string>
-    <string name="notification_sound_title" msgid="5137483249425507572">"साधारण नोटिफ़िकेशन ध्वनी"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"शांत होने पर कंपन (वाइब्रेशन) करे"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"सूचना की डिफ़ॉल्ट आवाज़"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string>
-    <string name="notification_volume_title" msgid="2012640760341080408">"नोटिफ़िकेशन"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"सूचना की आवाज़"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"सूचना के लिए आने वाले कॉल (इनकमिंग) की आवाज़ का इस्तेमाल करें"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"कार्य प्रोफ़ाइल का समर्थन नहीं करता है"</string>
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"साधारण नोटिफ़िकेशन ध्वनी"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"सूचना की डिफ़ॉल्ट आवाज़"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"मीडिया"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"संगीत और वीडियो के लिए वॉल्‍यूम सेट करें"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"अलार्म"</string>
@@ -917,42 +958,43 @@
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"कॉल करते समय ध्वनी सुने"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"ध्वनियां टैप करें"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"स्‍क्रीन लॉक ध्‍वनि"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"टैप करने पर कंपन करें"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"छूने पर कंपन (वाइब्रेशन) करें"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"शोर रद्दीकरण"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"संगीत, वीडियो,गेमऔर अन्‍य मीडिया"</string>
-    <string name="volume_ring_description" msgid="5936851631698298989">"रिंगटोन और नोटिफ़िकेशन"</string>
-    <string name="volume_notification_description" msgid="5810902320215328321">"नोटिफ़िकेशन"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"रिंगटोन और सूचनाएं"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"सूचनाएं"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"अलार्म"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन और नोटिफ़िकेशन म्‍यूट करें"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन और सूचनाएं म्‍यूट करें"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"संगीत और अन्‍य मीडिया म्‍यूट करें"</string>
-    <string name="volume_notification_mute" msgid="7955193480006444159">"नोटिफ़िकेशन म्‍यूट करें"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"सूचनाओं को म्‍यूट करें"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म म्‍यूट करें"</string>
     <string name="dock_settings" msgid="1820107306693002541">"डॉक"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"डॉक सेटिंग"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"ऑडियो"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"संलग्‍न डेस्‍कटॉप डॉक के लिए सेटिंग"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"संलग्‍न कार डॉक के लिए सेटिंग"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"टेबलेट डॉक नहीं किया गया"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"टैबलेट डॉक नहीं किया गया"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"फ़ोन डॉक नहीं किया गया"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"संलग्‍न किए गए डॉक के लिए सेटिंग"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"डॉक नहीं मिला"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"डॉक ऑडियो सेट करने से पहले आपको टेबलेट को डॉक करना होगा."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"डॉक ऑडियो सेट करने से पहले आपको टैबलेट को डॉक करना होगा."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"डॉक ऑडियो सेट करने से पहले आपको फ़ोन को डॉक करना होगा."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"डॉक इंसर्ट ध्‍वनि"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"डॉक में टेबलेट सम्‍मिलित करते समय या निकालते समय ध्‍वनि चलाएं"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"डॉक में टैबलेट सम्‍मिलित करते समय या निकालते समय ध्‍वनि चलाएं"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"डॉक में फ़ोन लगाते या निकालते समय ध्‍वनि चलाएं"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डॉक में टेबलेट सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डॉक में टैबलेट सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"डॉक में फ़ोन सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
     <string name="account_settings" msgid="6403589284618783461">"खाते"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"कार्य प्रोफ़ाइल खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"व्‍यक्‍तिगत प्रोफ़ाइल खाते"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"कार्यस्‍थल खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"व्‍यक्‍तिगत खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="1910951467596035063">"खोज"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"खोज सेटिंग और इतिहास प्रबंधित करें"</string>
+    <string name="search_settings" msgid="1910951467596035063">"सर्च"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"सर्च सेटिंग और इतिहास प्रबंधित करें"</string>
     <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>
@@ -980,31 +1022,30 @@
     <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_start_time_title" msgid="8918016772613689584">"प्रारंभ समय"</string>
-    <string name="night_display_end_time_title" msgid="8286061578083519350">"समाप्ति समय"</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="screen_timeout" msgid="4351334843529712571">"उपयोग में नहीं"</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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"डिफ़ॉल्ट"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"कस्टम"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"वॉलपेपर बदलें"</string>
-    <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"अपनी स्क्रीन को वैयक्तिकृत करें"</string>
+    <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"अपनी स्क्रीन को अपने मुताबिक बनाएं"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यहां से वॉलपेपर चुनें:"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"स्क्रीन सेवर"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"चार्ज होते समय या डॉक किए होने पर"</string>
@@ -1020,8 +1061,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="doze_summary" msgid="3846219936142814032">"आपको नोटिफ़िकेशन मिलने पर स्‍क्रीन सक्रिय करें"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"हमेशा चालू स्क्रीन दिखाएं"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"हमेशा चालू / बढ़ा हुआ बैटरी उपयोग"</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="6978257596231155345">"समय, नोटिफ़िकेशन आइकॉन और अन्य जानकारी दिखाएं. इसमें ज़्यादा बैटरी का इस्तेमाल होगा."</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>
@@ -1030,9 +1077,9 @@
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"लॉक है"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"सिम कार्ड लॉक"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"सिम कार्ड लॉक करें"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"टेबलेट के उपयोग के लिए पिन आवश्‍यक"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"टैबलेट के उपयोग के लिए पिन आवश्‍यक"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"फ़ोन का उपयोग करने के लिए पिन आवश्‍यक"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"टेबलेट के उपयोग के लिए पिन आवश्‍यक"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"टैबलेट के उपयोग के लिए पिन आवश्‍यक"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"फ़ोन का उपयोग करने के लिए पिन आवश्‍यक"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"सिम पिन बदलें"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"सिम पिन"</string>
@@ -1043,25 +1090,25 @@
     <string name="sim_reenter_new" msgid="6523819386793546888">"नया पिन पुन: लिखें"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"सिम पिन"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"गलत पिन"</string>
-    <string name="sim_pins_dont_match" msgid="1695021563878890574">"पिनों का मिलान नहीं होता"</string>
+    <string name="sim_pins_dont_match" msgid="1695021563878890574">"पिन मेल नहीं खाते"</string>
     <string name="sim_change_failed" msgid="3602072380172511475">"पिन नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"सिम पिन सफलतापूर्वक बदला गया"</string>
     <string name="sim_lock_failed" msgid="2489611099235575984">"सिम कार्ड लॉक स्‍थिति नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ठीक है"</string>
-    <string name="sim_enter_cancel" msgid="6240422158517208036">"अभी नहीं"</string>
+    <string name="sim_enter_cancel" msgid="6240422158517208036">"रद्द करें"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"एकाधिक सिम मिलीं"</string>
     <string name="sim_multi_sims_summary" msgid="2698176447067691396">"मोबाइल डेटा के लिए अपना पसंदीदा सिम चुनें."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"डेटा सिम बदलें?"</string>
     <string name="sim_change_data_message" msgid="5854582807996717811">"मोबाइल डेटा के लिए <xliff:g id="OLD_SIM">%2$s</xliff:g> के बजाय <xliff:g id="NEW_SIM">%1$s</xliff:g> का उपयोग करना चाहते हैं?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"पसंदीदा सिम कार्ड अपडेट करें?"</string>
-    <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> आपके डिवाइस में मौजूद अकेला SIM है. क्या आप इस SIM का उपयोग मोबाइल डेटा, कॉल और SMS संदेशों के लिए करना चाहते हैं?"</string>
+    <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> आपके डिवाइस में मौजूद अकेला सिम है. क्या आप मोबाइल डेटा, कॉल और मैसेज (एसएमएस) के लिए इस सिम का इस्तेमाल करना चाहते हैं?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"गलत सिम पिन कोड, अपने डिवाइस को अनलॉक करने के लिए अब आपको अपनी मोबाइल और इंटरनेट सेवा देने वाली कंपनी से संपर्क करना होगा."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
       <item quantity="one">गलत सिम पिन कोड, आप <xliff:g id="NUMBER_1">%d</xliff:g> बार और कोशिश कर सकते हैं.</item>
       <item quantity="other">गलत सिम पिन कोड, आप <xliff:g id="NUMBER_1">%d</xliff:g> बार और कोशिश कर सकते हैं.</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"सिम PIN की कार्यवाही विफल रही!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"टेबलेट स्‍थिति"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"टैबलेट स्‍थिति"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"फ़ोन स्‍थिति"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"सिस्‍टम के बारे में नई जानकारी"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
@@ -1093,7 +1140,7 @@
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"मोबाइल नेटवर्क प्रकार"</string>
-    <string name="status_latest_area_info" msgid="7222470836568238054">"ऑपरेटर जानकारी"</string>
+    <string name="status_latest_area_info" msgid="7222470836568238054">"ऑपरेटर की जानकारी"</string>
     <string name="status_data_state" msgid="5503181397066522950">"मोबाइल नेटवर्क की स्‍थिति"</string>
     <string name="status_service_state" msgid="2323931627519429503">"सेवा स्‍थिति"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"सिग्‍नल शक्ति"</string>
@@ -1148,8 +1195,8 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD कार्ड अनमाउंट कर दिया जाएगा."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"अनमाउंट कर रहा है"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"अनमाउंट प्रगति में है"</string>
-    <string name="storage_low_title" msgid="1388569749716225155">"मेमोरी स्‍थान समाप्‍त हो रहा है"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"हो सकता है कुछ सिस्‍टम फ़ंक्‍शन, जैसे समन्‍वयन, ठीक से कार्य न करें. ऐप्स  या मीडिया सामग्री जैसे आइटम को हटाकर या अनपिन करके स्थान खाली करके देखें."</string>
+    <string name="storage_low_title" msgid="1388569749716225155">"मेमोरी में जगह खत्म हो रही है"</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"हो सकता है कुछ सिस्टम के कुछ फ़ंक्‍शन, जैसे सिंक करना, ठीक से काम न करें. ऐप या मीडिया सामग्री जैसे आइटम को हटाकर या अनपिन करके जगह खाली करने की कोशिश करें."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"नाम बदलें"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"माउंट करें"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"निकालें"</string>
@@ -1160,7 +1207,7 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"भूल जाएं"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"सेट करें"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"एक्सप्लोर करें"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"स्थान खाली करें"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"जगह खाली करें"</string>
     <string name="storage_menu_manage" msgid="5914482953856430780">"मेमोरी प्रबंधित करें"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB कंप्‍यूटर कनेक्‍शन"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"इस रूप में कनेक्ट करें"</string>
@@ -1192,7 +1239,7 @@
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"इस <xliff:g id="NAME">^1</xliff:g> में मौजूद ऐप्‍स, फ़ोटो या डेटा का उपयोग करने के लिए, उसे पुन: लगाएं. \n\nवैकल्‍पिक रूप से, यदि डिवाइस उपलब्‍ध नहीं हो तो आप इस मेमोरी को भूल जाना चुन सकते हैं. \n\nयदि आप भूल जाना चुनते हैं, तो डिवाइस में मौजूद सभी डेटा हमेशा के लिए खो जाएगा. \n\nआप बाद में ऐप्‍स पुन: इंस्‍टॉल कर सकते हैं, लेकिन इस डिवाइस पर संग्रहित किया गया उनका डेटा खो जाएगा."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> को भूल जाएं?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"इस <xliff:g id="NAME">^1</xliff:g> पर संग्रहित सभी ऐप्‍स, फ़ोटो और डेटा हमेशा के लिए खो जाएंगे."</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"ऐप्स"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"ऐप"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"चित्र"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"वीडियो"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडियो"</string>
@@ -1216,11 +1263,11 @@
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट किया जा रहा है…"</string>
     <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट करते समय ना निकालें."</string>
     <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा को नई मेमोरी में ले जाएं"</string>
-    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"आप अपनी फ़ोटो, फ़ाइलें और कुछ ऐप्‍स इस नए <xliff:g id="NAME">^1</xliff:g> पर ले जा सकते हैं. \n\nले जाने में लगभग <xliff:g id="TIME">^2</xliff:g> का समय लगता है और इससे आंतरिक मेमोरी पर <xliff:g id="SIZE">^3</xliff:g> स्‍थान खाली हो जाएगा. इस प्रक्रिया के दौरान कुछ ऐप्‍स काम नहीं करेंगे."</string>
+    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"आप अपनी फ़ोटो, फ़ाइलें और कुछ ऐप इस नए <xliff:g id="NAME">^1</xliff:g> पर ले जा सकते हैं. \n\nले जाने में लगभग <xliff:g id="TIME">^2</xliff:g>का समय लगता है और इससे डिवाइस की मेमोरी पर <xliff:g id="SIZE">^3</xliff:g> जगह खाली हो जाएगी. इस दौरान कुछ ऐप काम नहीं करेंगे."</string>
     <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"अभी ले जाएं"</string>
     <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"बाद में ले जाएं"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"अभी डेटा ले जाएं"</string>
-    <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"ले जाने में लगभग <xliff:g id="TIME">^1</xliff:g> का समय लगता है. इससे <xliff:g id="NAME">^3</xliff:g> पर <xliff:g id="SIZE">^2</xliff:g> स्‍थान खाली हो जाएगा."</b></string>
+    <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"ले जाने में लगभग <xliff:g id="TIME">^1</xliff:g> का समय लगता है. इससे <xliff:g id="NAME">^3</xliff:g> पर <xliff:g id="SIZE">^2</xliff:g> जगह खाली हो जाएगी."</b></string>
     <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ले जाएं"</string>
     <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"डेटा ले जाया जा रहा है…"</string>
     <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"ले जाने के दौरान: \n• <xliff:g id="NAME">^1</xliff:g> को ना निकालें. \n• कुछ ऐप्स सही ढंग से काम नहीं करेंगे. \n• डिवाइस को चार्ज करके रखें."</string>
@@ -1232,11 +1279,11 @@
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> को ले जाया जा रहा है…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ले जाने के दौरान <xliff:g id="NAME">^1</xliff:g> को ना निकालें. \n\nइस डिवाइस में मौजूद <xliff:g id="APP">^2</xliff:g> ले जाने का काम पूर्ण होने तक ऐप उपलब्ध नहीं रहेगा."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ले जाना रोकें"</string>
-    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"यह <xliff:g id="NAME_0">^1</xliff:g> धीमा प्रतीत हो रहा है. \n\nआप जारी रख सकते हैं, लेकिन इस स्थान पर लाए गए ऐप्स अटक सकते हैं और डेटा ट्रांसफर में अधिक समय लग सकता है. \n\nबेहतर प्रदर्शन के लिए अधिक तेज़ <xliff:g id="NAME_1">^1</xliff:g> का उपयोग करने का विचार करें."</string>
+    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"यह <xliff:g id="NAME_0">^1</xliff:g> ज़्यादा वक्त ले रहा है. \n\nआप जारी रख सकते हैं, लेकिन इस जगह पर लाए गए ऐप अटक सकते हैं और डेटा ट्रांसफर में ज़्यादा समय लग सकता है. \n\nबेहतर प्रदर्शन के लिए आप और तेज़ <xliff:g id="NAME_1">^1</xliff:g> का इस्तेमाल कर सकते हैं."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"बैटरी स्‍थिति"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"बैटरी स्‍तर"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"पहुंच बिंदु संपादित करें"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"एक्सेस बिंदु में बदलाव करें"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"सेट नहीं है"</string>
     <string name="apn_name" msgid="4115580098369824123">"नाम"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -1246,8 +1293,8 @@
     <string name="apn_password" msgid="5412301994998250968">"पासवर्ड"</string>
     <string name="apn_server" msgid="2436185314756372858">"सर्वर"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
-    <string name="apn_mms_proxy" msgid="5374082621073999275">"MMS प्रॉक्‍सी"</string>
-    <string name="apn_mms_port" msgid="4074188088199243040">"MMS पोर्ट"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"मल्टीमीडिया मैसेज (एमएमएस) प्रॉक्‍सी"</string>
+    <string name="apn_mms_port" msgid="4074188088199243040">"मल्टीमीडिया मैसेज (एमएमएस) पोर्ट"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
     <string name="apn_auth_type" msgid="6167205395676037015">"प्रमाणीकरण प्रकार"</string>
@@ -1258,21 +1305,22 @@
     <string name="apn_type" msgid="469613123902220544">"APN प्रकार"</string>
     <string name="apn_protocol" msgid="3272222921649348640">"APN प्रोटोकॉल"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN रोमिंग प्रोटोकॉल"</string>
-    <string name="carrier_enabled" msgid="407655861175280806">"APN सक्षम/अक्षम करें"</string>
+    <string name="carrier_enabled" msgid="407655861175280806">"APN चालू/बंद करें"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN सक्षम"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN अक्षम"</string>
     <string name="bearer" msgid="594270280031923558">"धारक"</string>
     <string name="mvno_type" msgid="2543253857818336421">"MVNO प्रकार"</string>
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO मान"</string>
-    <string name="menu_delete" msgid="6981294422841124659">"APN हटाएं"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"APN मिटाएं"</string>
     <string name="menu_new" msgid="3014205883303921729">"नया APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"सुरक्षित करें"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"अभी नहीं"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"रद्द करें"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"नाम फ़ील्‍ड खाली मत छोड़िए."</string>
     <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>
@@ -1283,7 +1331,7 @@
     <string name="reset_network_final_desc" msgid="6388371121099245116">"सभी नेटवर्क सेटिंग रीसेट करें? आप इस कार्रवाई को वापस नहीं ला सकते!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिंग रीसेट करें"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करें?"</string>
-    <string name="network_reset_not_available" msgid="7188610385577164676">"इस उपयोगकर्ता के लिए नेटवर्क रीसेट उपलब्ध नहीं है"</string>
+    <string name="network_reset_not_available" msgid="7188610385577164676">"इस उपयोगकर्ता के लिए नेटवर्क रीसेट मौजूद नहीं है"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"नेटवर्क सेटिंग रीसेट कर दी गई हैं"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"फ़ैक्टरी डेटा रीसेट"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
@@ -1291,112 +1339,106 @@
       <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> खाते रीसेट किए जाएंगे</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"डिवाइस की मेमोरी और सभी डेटा रीसेट कर दिया जाएगा"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"इससे आपके टेबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"इससे आपके टैबलेट के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"इससे आपके फ़ोन के "<b>"मोबाइल मेमोरी"</b>" से सभी डेटा मिट जाएगा, जिसमें शामिल है:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम और ऐप्स डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आप वर्तमान में निम्‍न खातों में प्रवेश किए हुए हैं:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"इस डिवाइस पर अन्‍य उपयोगकर्ता मौजूद हैं.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्‍य उपयोगकर्ता डेटा"</li></string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB मेमोरी"</b>" मिटाना होगा."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, चित्र और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM पर मौजूद मोबाइल और इंटरनेट सेवा देने वाली कंपनियां"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"इससे आपकी मोबाइल सेवा योजना रद्द नहीं होगी."</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, तस्वीर और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB मैमोरी"</b>" मिटाना होगा."</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, तस्वीर और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB मेमोरी मिटाएं"</string>
     <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="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टेबलेट रीसेट करें"</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>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"आपकी सभी निजी जानकारी और डाउनलोड किए गए ऐप मिटाएं? आप इस कार्रवाई को पहले जैसा नहीं कर सकते!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"सब कुछ मिटाएं"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करें?"</string>
-    <string name="master_clear_not_available" msgid="1000370707967468909">"इस उपयोगकर्ता के लिए फ़ैक्टरी रीसेट उपलब्ध नहीं है"</string>
+    <string name="master_clear_not_available" msgid="1000370707967468909">"इस उपयोगकर्ता के लिए फ़ैक्ट्री रीसेट उपलब्ध नहीं है"</string>
     <string name="master_clear_progress_title" msgid="5194793778701994634">"मिटाया जा रहा है"</string>
     <string name="master_clear_progress_text" msgid="6559096229480527510">"कृपया प्रतीक्षा करें..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"कॉल सेटिंग"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"वॉइसमेल, कॉल को दूसरे नंबर पर भेजना, कॉल वेटिंग (कॉल के दौरान आ रहा दूसरा कॉल), कॉलर आईडी सेट करें"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB टेदरिंग"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB से इंटरनेट पर शेयर करें"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"पोर्टेबल हॉटस्‍पॉट"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटूथ टेदरिंग"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटूथ से इंटरनेट पर शेयर करें."</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टेदरिंग"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"हॉटस्पॉट और टेदरिंग"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"हॉटस्पॉट और इंटरनेट पर शेयर करें"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"हॉटस्पॉट चालू है, टेदर हो रहा है"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"हॉटस्पॉट चालू है"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"टेदर हो रहा है"</string>
     <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="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="usb_tethering_button_text" msgid="585829947108007917">"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_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>
-    <string name="sms_application_title" msgid="4903928270533250448">"SMS ऐप"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS ऐप्लिकेशन बदलें?"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"क्या आप <xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय SMS ऐप्स के रूप में <xliff:g id="NEW_APP">%1$s</xliff:g> का उपयोग करना चाहेंगे?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"आपके SMS ऐप्स के रूप में <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
-    <string name="network_scorer_picker_title" msgid="6383879578279046456">"नेटवर्क रेटिंग प्रदाता"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"मैसेज (एसएमएस) ऐप"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"मैसेज (एसएमएस) ऐप बदलें?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय <xliff:g id="NEW_APP">%1$s</xliff:g> को अपने मैसेज (एसएमएस) ऐप के तौर पर इस्तेमाल करें?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> को अपने मैसेज (एसएमएस) ऐप के तौर पर इस्तेमाल करें?"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"नेटवर्क रेटिंग देने वाला"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"कोई नहीं"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"वाई-फ़ाई सहायक बदलें?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"आपके नेटवर्क कनेक्शन प्रबंधित करने के लिए <xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय <xliff:g id="NEW_APP">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"आपके नेटवर्क कनेक्शन प्रबंधित करने के लिए <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"अज्ञात सिम ऑपरेटर"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> की कोई भी ज्ञात प्रावधान वेबसाइट नहीं है"</string>
-    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया सिम कार्ड डालें और पुन: प्रारंभ करें"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया सिम कार्ड डालें और फिर से शुरू करें"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"कृपया इंटरनेट से कनेक्ट करें"</string>
-    <string name="location_title" msgid="1029961368397484576">"मेरा स्थान"</string>
-    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"कार्य प्रोफ़ाइल का स्‍थान"</string>
+    <string name="location_title" msgid="1029961368397484576">"मेरी जगह"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"वर्क प्रोफ़ाइल की जगह"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"बहुत ज़्यादा सही"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बैटरी की बचत"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"केवल डिवाइस"</string>
-    <string name="location_mode_location_off_title" msgid="2829713015012529465">"स्थान बंद"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"जगह की जानकारी बंद"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ऐप्लिकेशन-स्तरीय अनुमतियां"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हाल ही के स्थान अनुरोध"</string>
-    <string name="location_no_recent_apps" msgid="2800907699722178041">"किसी भी ऐप्स  ने हाल ही में स्थान का अनुरोध नहीं किया है"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"स्‍थान सेवा"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"हाल में किये गए जगह (लोकेशन) के अनुरोध"</string>
+    <string name="location_no_recent_apps" msgid="2800907699722178041">"किसी भी ऐप ने हाल में जगह का अनुरोध नहीं किया है"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"जगह की जानकारी"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"अधिक बैटरी उपयोग"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"कम बैटरी उपयोग"</string>
-    <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_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="7247994752324805202">"जगह का पता करने के लिए जीपीएस और डिवाइस के सेंसर का इस्तेमाल करें"</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>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"सिस्‍टम ऐप और सेवाओं को किसी भी समय वाई-फ़ाई नेटवर्कों का पता लगाने की अनुमति देकर जगह की बेहतर जानकारी पाएं."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्‍लूटूथ स्‍कैन करना"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"सिस्‍टम ऐप्‍स और सेवाओं को किसी भी समय ब्‍लूटूथ डिवाइसों का पता लगाने देकर स्‍थान को बेहतर बनाएं."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"वाई-फ़ाई  और मोबाइल नेटवर्क स्थान"</string>
-    <string name="location_neighborhood_level" msgid="5141318121229984788">"आपके स्थान का तेज़ अनुमान लगाने के लिए, ऐप्स को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाई-फ़ाई  द्वारा निर्धारित किया गया स्‍थान"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"सिस्‍टम ऐप और सेवाओं को किसी भी समय ब्‍लूटूथ डिवाइसों का पता लगाने की अनुमति देकर जगह की बेहतर जानकारी पाएं."</string>
+    <string name="location_network_based" msgid="9134175479520582215">"वाई-फ़ाई और मोबाइल नेटवर्क जगह"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"आपकी जगह का तेज़ी से अनुमान लगाने के लिए, ऐप को Google की जगह की जानकारी का इस्तेमाल करने दें. अनजान जगह का डेटा इकट्ठा करके Google को भेजा जाएगा."</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"यह जगह वाई-फ़ाई ने तय की है"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS उपग्रह"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"आपके स्थान का पता लगाने के लिए, ऐप्स  को आपके टेबलेट पर GPS का उपयोग करने दें"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"आपके स्थान का पता लगाने के लिए, ऐप्स  को आपके फ़ोन पर GPS का उपयोग करने दें"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"आपकी जगह का पता लगाने के लिए, ऐप को आपके टैबलेट पर जीपीएस का इस्तेमाल करने दें"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"आपकी जगह का पता लगाने के लिए, ऐप को आपके फ़ोन पर जीपीएस का इस्तेमाल करने दें"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"सहायता प्राप्त GPS का उपयोग करें"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS की सहायता के लिए सर्वर का उपयोग करें (नेटवर्क उपयोग कम करने के लिए अनचेक करें)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS की सहायता के लिए सर्वर का उपयोग करें (GPS निष्‍पादन बेहतर बनाने के लिए अनचेक करें)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"स्‍थान और Google खोज"</string>
-    <string name="use_location_summary" msgid="3978805802386162520">"खोज परिणामों और अन्‍य सेवाओं में सुधार के लिए Google को आपके स्‍थान का उपयोग करने दें"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"मेरे स्थान पर एक्सेस"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"आप अपनी उन ऐप्स  को स्थान जानकारी का उपयोग करने दें, जिन्होंने आपकी अनुमति मांगी है."</string>
+    <string name="use_location_title" msgid="5206937465504979977">"जगह और Google सर्च"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"सर्च नतीजों और अन्‍य सेवाओं में सुधार के लिए Google को आपकी जगह का इस्तेमाल करने दें"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"मेरी जगह को एक्सेस करें"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"जिन ऐप ने आपसे अनुमति मांगी है उन्हें अपने जगह की जानकारी का इस्तेमाल करने दें"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"स्‍थानीय स्रोत"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"टेबलेट के बारे में"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"टैबलेट के बारे में"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"फ़ोन के बारे में"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"एम्युलेट किए गए डिवाइस के बारे में"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"क़ानूनी जानकारी, स्‍थिति, सॉफ़्टवेयर वर्शन देखें"</string>
@@ -1416,19 +1458,22 @@
     <string name="settings_license_activity_title" msgid="8525014571806471216">"तृतीय-पक्ष लाइसेंस"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"लाइसेंस लोड करने में एक समस्‍या है."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"लोड हो रहा है..."</string>
-    <string name="settings_safetylegal_title" msgid="1289483965535937431">"सुरक्षा जानकारी"</string>
-    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"सुरक्षा जानकारी"</string>
+    <string name="settings_safetylegal_title" msgid="1289483965535937431">"सुरक्षा की जानकारी"</string>
+    <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"सुरक्षा की जानकारी"</string>
     <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>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"पासवर्ड मेल नहीं खाते"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"पिन मेल नहीं खाते"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"अनलॉक चयन"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"अनलॉक करने के लिए चुनें"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"पासवर्ड सेट कर दिया गया है"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"पिन सेट कर दिया गया है"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"आकार सेट कर दिया गया है"</string>
@@ -1450,12 +1495,12 @@
     <string name="lock_settings_title" msgid="4213839087748988686">"डिवाइस सुरक्षा"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"अनलॉक आकार बदलें"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"अनलॉक पिन बदलें"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"अनलॉक आकार आरेखित करें"</string>
-    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"सहायता के लिए मेनू दबाएं."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"पूर्ण होने पर अंगुली हटा लें"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"अनलॉक आकार बनाएं"</string>
+    <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"सहायता के लिए मेन्यू दबाएं."</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"पूरा होने पर अंगुली हटा लें"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"कम से कम <xliff:g id="NUMBER">%d</xliff:g> बिंदुओं को कनेक्‍ट करें. पुन: प्रयास करें:"</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"आकार रिकॉर्ड किया गया"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"पुष्टि के लिए आकार को पुन: बनाएं"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"पुष्टि के लिए आकार को फिर से बनाएं"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"आपका नया अनलॉक आकार"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"दोबारा पूछें"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"पुन: आरेखित करें"</string>
@@ -1466,9 +1511,9 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"अनलॉक करने के लिए आकार आरेखित करना होगा"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"पैटर्न दिखाई दे"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"प्रोफ़ाइल पैटर्न को दृश्यमान बनाएं"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"टैप करने पर कंपन करें"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"छूने पर कंपन (वाइब्रेशन) करें"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"पॉवर बटन तुरंत लॉक होता है"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> के द्वारा अनलॉक रखे जाने पर छोड़कर"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> के ज़रिए अनलॉक रखे जाने पर छोड़कर"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"अनलॉक आकार सेट करें"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"अनलॉक आकार बदलें"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"अनलॉक आकार कैसे आरेखित करें"</string>
@@ -1491,11 +1536,14 @@
     <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>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"अधिक सेटिंग विकल्‍प सक्षम करें"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"ऐप्स की जानकारी"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"और सेटिंग विकल्‍प चालू करें"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"ऐप की जानकारी"</string>
     <string name="storage_label" msgid="8700867073480107253">"स्टोरेज"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"डिफ़ॉल्ट रूप से खोलें"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"डिफ़ॉल्‍ट"</string>
@@ -1521,9 +1569,9 @@
     <string name="uninstall_all_users_text" msgid="851857393177950340">"सभी उपयोगकर्ताओं के लिए अनइंस्टॉल करें"</string>
     <string name="install_text" msgid="884360662922471113">"इंस्टॉल करें"</string>
     <string name="disable_text" msgid="6544054052049395202">"अक्षम करें"</string>
-    <string name="enable_text" msgid="9217362512327828987">"सक्षम करें"</string>
+    <string name="enable_text" msgid="9217362512327828987">"चालू करें"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"डेटा साफ़ करें"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"नई जानकारी हटाएं"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"अपडेट अनइंस्टॉल करें"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"आपने कुछ क्रियाओं के लिए इस ऐप्स को डिफ़ॉल्‍ट रूप से लॉन्‍च करना चुना है."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"आपने इस ऐप्स को शॉर्टकट बनाने और उनके डेटा पर पहुंचने की अनुमति देना चुना है."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"कोई डिफ़ॉल्‍ट सेट नहीं है."</string>
@@ -1537,11 +1585,11 @@
     <string name="show_running_services" msgid="5736278767975544570">"चल रही सेवाएं दिखाएं"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"कैश की गई प्रक्रियाएं दिखाएं"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"आपातकालीन ऐप"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"ऐप्स प्राथमिकताएं रीसेट करें"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"ऐप्स प्राथमिकताएं रीसेट करें?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"इससे निम्न की सभी प्राथमिकताएं रीसेट हो जाएंगी:\n\n "<li>"अक्षम ऐप्स "</li>\n" "<li>"अक्षम ऐप्स  नोटिफ़िकेशन"</li>\n" "<li>"कार्यवाहियों के लिए डिफ़ॉल्ट ऐप्स "</li>\n" "<li>"ऐप्स  के लिए पृष्ठभूमि डेटा प्रतिबंध"</li>\n" "<li>"अनुमति के कोई भी प्रतिबंध"</li>\n\n" आपका सभी ऐप्स  डेटा बना रहेगा."</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"ऐप प्राथमिकताएं रीसेट करें"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"ऐप प्राथमिकताएं रीसेट करें?"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"इससे इन सबकी प्राथमिकताएं रीसेट हो जाएंगी:\n\n "<li>"बंद की गई ऐप "</li>\n" "<li>"बंद की गई ऐप सूचनाएं"</li>\n" "<li>"कार्रवाइयों के लिए डिफ़ॉल्ट एप"</li>\n" "<li>"एप के लिए बैकग्राउंड डेटा पर रोक"</li>\n" "<li>" किसी भी अनुमति पर रोक"</li>\n\n" आपका सभी ऐप डेटा बना रहेगा."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"ऐप्स  रीसेट करें"</string>
-    <string name="manage_space_text" msgid="8852711522447794676">"स्‍थान प्रबंधित करें"</string>
+    <string name="manage_space_text" msgid="8852711522447794676">"जगह प्रबंधित करें"</string>
     <string name="filter" msgid="2018011724373033887">"फ़िल्टर"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"फ़िल्‍टर विकल्‍प चुनें"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"सभी ऐप"</string>
@@ -1558,18 +1606,18 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB मेमोरी"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD कार्ड मेमोरी"</string>
     <string name="recompute_size" msgid="7722567982831691718">"आकार पुन: परिकलित कर रहा है…"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"ऐप्स डेटा हटाएं?"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"एप्‍लिकेशन डेटा हटाएं?"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"इस ऐप्स का सभी डेटा स्‍थायी रूप से हटा दिया जाएगा. इसमें सभी फ़ाइलें, सेटिंग, खाते, डेटाबेस आदि शामिल हैं."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ठीक है"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"अभी नहीं"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"रद्द करें"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"इंस्‍टॉल किए गए ऐप्स की सूची में ऐप्स नहीं मिला."</string>
     <string name="clear_data_failed" msgid="7214074331627422248">"ऐप्स डेटा साफ़ नहीं कर सका."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"डेटा साफ़ करें"</string>
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"ऐप्स के लिए डेटा साफ़ नहीं कर सका."</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"यह ऐप्स आपके टेबलेट पर निम्‍न में पहुंच सकता है:"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"यह ऐप्स आपके टैबलेट पर निम्‍न में पहुंच सकता है:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"यह ऐप्स आपके फ़ोन पर निम्‍न पर पहुंच सकता है:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"यह ऐप्स आपके टेबलेट पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"यह ऐप्स आपके टैबलेट पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"यह ऐप्स आपके फ़ोन पर इन पर पहुंच सकता है. निष्‍पादन को बेहतर बनाने और स्‍मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्‍ध हैं क्‍योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> और <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
@@ -1577,41 +1625,41 @@
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
     <string name="security_settings_billing_desc" msgid="8061019011821282358">"यह ऐप्स  आपसे शुल्क ले सकता है:"</string>
-    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रीमियम SMS भेजें?"</string>
+    <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रीमियम मैसेज (एसएमएस) भेजें"</string>
     <string name="computing_size" msgid="1599186977475211186">"गणना कर रहा है…"</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"पैकेज आकार की गणना नहीं की जा सकी."</string>
     <string name="empty_list_msg" msgid="3552095537348807772">"आपके पास कोई भी तृतीय-पक्ष ऐप्स इंस्‍टॉल नहीं है."</string>
     <string name="version_text" msgid="9189073826278676425">"वर्शन <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"ले जाएं"</string>
-    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"टेबलेट पर ले जाएं"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"टैबलेट पर ले जाएं"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"फ़ोन पर ले जाएं"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB मेमोरी में ले जाएं"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD कार्ड में ले जाएं"</string>
     <string name="moving" msgid="6431016143218876491">"ले जा रहा है"</string>
-    <string name="another_migration_already_in_progress" msgid="7817354268848365487">"एक अन्य माइग्रेशन पहले से चल रहा है."</string>
-    <string name="insufficient_storage" msgid="481763122991093080">"पर्याप्त मेमोरी स्‍थान नहीं."</string>
+    <string name="another_migration_already_in_progress" msgid="7817354268848365487">"कोई और डेटा दूसरी जगह भेजा जा रहा है."</string>
+    <string name="insufficient_storage" msgid="481763122991093080">"मेमोरी में ज़रुरत के मोताबिक जगह नहीं बची है"</string>
     <string name="does_not_exist" msgid="1501243985586067053">"ऐप्स मौजूद नहीं है."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"ऐप्स की प्रति नहीं बनाई जा सकती."</string>
-    <string name="invalid_location" msgid="4354595459063675191">"इंस्‍टॉल स्‍थान मान्‍य नहीं है."</string>
-    <string name="system_package" msgid="1352722848400644991">"सिस्‍टम के बारे में नई जानकारी बाहरी मीडिया से नहीं हटाया जा सकता."</string>
+    <string name="invalid_location" msgid="4354595459063675191">"इंस्‍टॉल करने की जगह गलत है."</string>
+    <string name="system_package" msgid="1352722848400644991">"सिस्‍टम अपडेट बाहरी मीडिया में इंस्टॉल नहीं किये जा सकते"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"डिवाइस व्यवस्थापक ऐप्लिकेशन को बाहरी मीडिया पर इंस्टॉल नहीं किया जा सकता"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"ज़बरदस्ती रोकें?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"अगर आप किसी ऐप को बलपूर्वक रोकते हैं, तो यह गलत व्यवहार कर सकता है."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ऐप्स  नहीं ले जाया जा सका. <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <string name="app_install_location_title" msgid="2068975150026852168">"पसंदीदा इंस्‍टॉल स्‍थान"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"नए ऐप्स के लिए पसंदीदा इंस्‍टॉलेशन स्‍थान बदलें"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"इंस्टॉल करने की पसंदीदा जगह"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"नए ऐप के लिए इंस्टॉल करने की पसंदीदा जगह बदलें"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"अंतर्निहित ऐप्स अक्षम करें?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"ऐप को अक्षम करें"</string>
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"अगर आप इस ऐप्लिकेशन को अक्षम करते हैं, तो हो सकता है कि Android और दूसरे ऐप्लिकेशन अपेक्षित रूप से काम ना कर पाएं."</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा हटाएं और ऐप्स  को अक्षम करें?"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा मिटाएं और ऐप को बंद करें?"</string>
     <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"यदि आप इस ऐप्लिकेशन को अक्षम करते हैं, तो हो सकता है कि दूसरे ऐप्लिकेशन अपेक्षित रूप से काम ना कर पाएं. आपका डेटा भी हटा दिया जाएगा."</string>
-    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"नोटिफ़िकेशन बंद करें?"</string>
-    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"यदि आप इस ऐप्स के लिए नोटिफ़िकेशन बंद करते हैं, तो आप महत्‍वपूर्ण अलर्ट और नई जानकारी खो देंगे."</string>
+    <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"सूचनाएं मिलनी बंद करें?"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"अगर आप इस ऐप के लिए सूचना बंद करते हैं, तो आपको ज़रूरी अलर्ट और अपडेट नहीं मिल पाएंगी."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"स्टोर"</string>
-    <string name="app_install_details_title" msgid="6905279702654975207">"ऐप्लिकेशन का विवरण"</string>
+    <string name="app_install_details_title" msgid="6905279702654975207">"ऐप का विवरण"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> से इंस्टॉल किया गया ऐप्लिकेशन"</string>
-    <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> के बारे में अधिक जानकारी"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> के बारे में और जानकारी"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"ऐप्स  संचालन"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"चल रहा है"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(कभी उपयोग नहीं किया)"</string>
@@ -1638,7 +1686,7 @@
     <string name="running_processes_header_title" msgid="6588371727640789560">"डिवाइस की मेमोरी"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"ऐप्स RAM उपयोग"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"सिस्‍टम"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"ऐप्स"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"ऐप"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"खाली"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"उपयोग की गई"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"संचित"</string>
@@ -1657,12 +1705,16 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"सेवा <xliff:g id="COMP_NAME">%1$s</xliff:g> उपयोग में हैं."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"प्रदाता <xliff:g id="COMP_NAME">%1$s</xliff:g> उपयोग में है."</string>
     <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="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>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"कीबोर्ड और इनपुट पद्धति"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"कीबोर्ड और इनपुट के तरीके"</string>
     <string name="phone_language" msgid="7116581601133118044">"भाषाएं"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"स्‍वत: प्रतिस्‍थापन"</string>
@@ -1673,8 +1725,8 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"भौतिक कीबोर्ड सेटिंग"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" सम्‍मिलित करने के लिए Space कुंजी दो बार दबाएं"</string>
     <string name="show_password" msgid="4837897357002495384">"पासवर्ड दिखाएं"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"आपके लिखने के दौरान वर्ण प्रदर्शित करें"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह वर्तनी परीक्षण व्‍यक्तिगत डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर सहित आपके द्वारा लिखे जाने वाले सभी लेख एकत्रित कर सकता है. यह ऐप्स <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस वर्तनी परीक्षण का उपयोग करें?"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"लिखते समय वर्ण दिखाएं"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"यह स्पेलिंग जांचने वाला निजी डेटा, जैसे पासवर्ड और क्रेडिट कार्ड नंबर के साथ आपके लिखे सभी लेख इकट्ठा कर सकता है. यह एप्‍लिकेशन <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> से आता है. इस स्पेलिंग जांचने वाले का इस्तेमाल करें?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"सेटिंग"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"भाषा"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"कीबोर्ड और इनपुट"</string>
@@ -1691,7 +1743,7 @@
     <string name="pointer_speed" msgid="1221342330217861616">"सूचक गति"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"गेमनियंत्रक"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"कंपनकर्ता का उपयोग करें"</string>
-    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"कनेक्ट होने पर कंपनकर्ता कोगेमनियंत्रक पर रीडायरेक्ट करें."</string>
+    <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"कनेक्ट होने पर कम्पन करने वाले (वाइब्रेटर) को गेम कंट्रोलर के वेबलिंक पर भेजें."</string>
     <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"कीबोर्ड लेआउट चुनें"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"कीबोर्ड लेआउट सेट करें"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"स्‍विच करने के लिए, Control-Spacebar दबाएं"</string>
@@ -1702,7 +1754,7 @@
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"जोड़ें"</string>
     <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"शब्‍दकोश में जोड़ें"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"वाक्यांश"</string>
-    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"अधिक विकल्प"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ज़्यादा विकल्प"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"कम विकल्‍प"</string>
     <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"ठीक है"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"शब्द:"</string>
@@ -1710,23 +1762,23 @@
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"भाषा:"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"कोई शब्द लिखें"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"वैकल्पिक शॉर्टकट"</string>
-    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"शब्‍द संपादित करें"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"संपादित करें"</string>
-    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"हटाएं"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"आपके पास उपयोगकर्ता शब्दकोश में कोई भी शब्द नहीं है. कोई शब्द जोड़ने के लिए, जोड़ें (+) बटन टैप करें."</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"शब्‍द बदलें"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"बदलाव करें"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"मिटाएं"</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"आपके पास उपयोगकर्ता डिक्शनरी में कोई भी शब्द नहीं है. कोई शब्द जोड़ने के लिए, जोड़ें (+) बटन छूएं."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"सभी भाषाओं के लिए"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"अधिक भाषाएं…"</string>
     <string name="testing" msgid="6584352735303604146">"परीक्षण"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"टेबलेट जानकारी"</string>
-    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"फ़ोन जानकारी"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"टैबलेट से जुड़ी जानकारी"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"फ़ोन से जुड़ी जानकारी"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"लेख इनपुट"</string>
     <string name="input_method" msgid="5434026103176856164">"इनपुट विधि"</string>
     <string name="current_input_method" msgid="2636466029213488159">"वर्तमान कीबोर्ड"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"इनपुट पद्धति चयनकर्ता"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"इनपुट का तरीका चुनने वाला"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"स्वचालित"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"हमेशा दिखाएं"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"हमेशा छुपाएं"</string>
-    <string name="configure_input_method" msgid="1317429869771850228">"इनपुट पद्धति सेट करें"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"इनपुट का तरीका सेट करें"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"सेटिंग"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"सेटिंग"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> सेटिंग"</string>
@@ -1754,35 +1806,36 @@
     <string name="usage_time_label" msgid="295954901452833058">"उपयोग समय"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"सरल उपयोग"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"सरल उपयोग सेटिंग"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, प्रदर्शन, इंटरैक्शन नियंत्रण"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, डिसप्ले, इंटरैक्शन नियंत्रण"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृश्य संबंधी सेटिंग"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"आप इस डिवाइस में अपनी जरूरतों के हिसाब से बदलाव ला सकते हैं. ये सुलभता सुविधाएं बाद में सेटिंग में बदली जा सकती हैं."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"फ़ॉन्ट का आकार बढ़ाएं"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"स्क्रीन रीडर"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ऑडियो और ऑन-स्क्रीन लेख"</string>
-    <string name="display_category_title" msgid="685461049938269166">"प्रदर्शन"</string>
+    <string name="display_category_title" msgid="685461049938269166">"डिसप्ले"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"इंटरैक्शन नियंत्रण"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"डाउनलोड की गई सेवाएं"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"प्रयोगात्मक"</string>
     <string name="talkback_title" msgid="7912059827205988080">"टॉकबैक"</string>
-    <string name="talkback_summary" msgid="8331244650729024963">"स्क्रीन रीडर प्राथमिक रूप से दृष्टिहीन और कमज़ोर दृष्टि वाले लोगों के लिए है"</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"स्क्रीन रीडर खास तौर पर दृष्टिहीन और कमज़ोर नज़र वाले लोगों के लिए है"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"अपनी स्क्रीन पर दिए गए आइटम तेज़ आवाज़ में सुनने के लिए उन्हें टैप करें"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"कैप्शन"</string>
-    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"आवर्धन"</string>
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"बड़ा करें"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"ट्रिपल-टैप के ज़रिए आवर्धित करें"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"बटन के ज़रिए आवर्धित करें"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"बटन और ट्रिपल-टैप के ज़रिए आवर्धित करें"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"स्क्रीन पर ज़ूम इन करें"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ज़ूम करने के लिए 3 बार टैप करें"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ज़ूम करने के लिए किसी बटन पर टैप करें"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ज़ूम करने के लिए"</b>", स्क्रीन पर 3 बार जल्दी-जल्दी टैप करें.\n"<ul><li>"स्क्रॉल करने के लिए 2 या उससे ज़्यादा अंगुलियां खींचें"</li>\n<li>"ज़ूम एडजस्ट करने के लिए 2 या उससे ज़्यादा अंगुलियों से पिंच करें"</li></ul>\n\n<b>"थोड़ी देर तक ज़ूम करने के लिए"</b>", स्क्रीन पर 3 बार जल्दी-जल्दी टैप करें और तीसरे टैप पर अपनी अंगुली दबाए रखें.\n"<ul><li>"स्क्रीन पर यहां-वहां ले जाने के लिए खींचें"</li>\n<li>"ज़ूम आउट करने के लिए अपनी अंगुली उठा लें"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार पर ज़ूम इन नहीं कर सकते हैं."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ज़ूम करने के लिए"</b>", स्क्रीन पर 3 बार जल्दी-जल्दी टैप करें.\n"<ul><li>"स्क्रोल करने के लिए 2 या उससे ज़्यादा उंगलियां खींचें"</li>\n<li>"ज़ूम एडजस्ट करने के लिए 2 या उससे ज़्यादा उंगलियों से पिंच करें"</li></ul>\n\n<b>"थोड़ी देर तक ज़ूम करने के लिए"</b>", स्क्रीन पर 3 बार जल्दी-जल्दी टैप करें और तीसरे टैप पर अपनी उंगली दबाए रखें.\n"<ul><li>"स्क्रीन पर यहां-वहां ले जाने के लिए खींचें"</li>\n<li>"ज़ूम आउट करने के लिए अपनी उंगली उठा लें"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार पर ज़ूम इन नहीं कर सकते हैं."</string>
     <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"बड़ा करने की सुविधा चालू होने पर, फटाफट बड़ा करने के लिए स्क्रीन के नीचे दिए गए सुलभता बटन का इस्तेमाल करें.\n\n"<b>"ज़ूम करने के लिए"</b>", सुलभता बटन पर टैप करें, फिर स्क्रीन पर कहीं भी टैप करें.\n"<ul><li>"स्क्रोल करने के लिए 2 या उससे ज़्यादा अंगुलियां खींचें"</li>\n<li>"ज़ूम को कम या ज़्यादा करने के लिए 2 या उससे ज़्यादा अंगुलियों से पिंच करें"</li></ul>\n\n<b>"थोड़े समय तक ज़ूम करने के लिए"</b>", सुलभता बटन पर टैप करें, फिर स्क्रीन पर कहीं भी छुएं और दबाकर रखें.\n"<ul><li>"स्क्रीन पर इधर-उधर ले जाने के लिए खींचें"</li>\n<li>"ज़ूम आउट करने के लिए अंगुली उठाएं"</li></ul>\n\n"आप कीबोर्ड या नेविगेशन बार पर ज़ूम इन नहीं कर सकते."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"सुलभता बटन <xliff:g id="SERVICE">%1$s</xliff:g> पर सेट है. बड़ा करने के लिए, सुलभता बटन को दबाकर रखें, फिर बड़ा करना चुनें."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"सरल उपयोग शॉर्टकट"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"शॉर्टकट सेवा"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"लॉक स्क्रीन से अनुमति दें"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"शॉर्टकट चालू होने पर, दोनों वॉल्यूम बटनों को 3 सेकंड तक दबाए रखकर आप किसी एक्सेस-योग्यता सेवा को चालू कर सकते हैं."</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"शॉर्टकट चालू होने पर, दोनों वॉल्यूम बटनों को 3 सेकंड तक दबाए रखकर आप किसी सुलभता सेवा को चालू कर सकते हैं."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"उच्च कंट्रास्ट लेख"</string>
-    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रीन आवर्धन का नई जानकारी अपने आप पाएं"</string>
+    <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रीन को बड़ा करने की सुविधा को अपने आप अपडेट करें"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"एेप ट्रांज़िशन पर स्क्रीन को बड़ा दिखाना अपडेट करें"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"पावर बटन कॉल बंद करता है"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"बड़ा माउस सूचक"</string>
@@ -1790,8 +1843,8 @@
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ऑडियो चलाते समय चैनल संयोजित करें"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"स्‍पर्श करके रखने पर विलंब"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"रंग को पलटें"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"प्रदर्शन प्रभावित हो सकता है"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर रुकने के बाद क्लिक करें"</string>
+    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"डिसप्ले पर असर पड़ सकता है"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"पॉइंटर के रुकने के बाद क्लिक करें"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"क्लिक करने से पहले का विलंब"</string>
     <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"चालू"</string>
@@ -1821,12 +1874,12 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"सेटिंग"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"चालू"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"बंद"</string>
-    <string name="captioning_preview_title" msgid="1234015253497016890">"पूर्वावलोकन"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"झलक"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"मानक विकल्प"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"भाषा"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"लेख का आकार"</string>
     <string name="captioning_preset" msgid="8939737196538429044">"कैप्शन की शैली"</string>
-    <string name="captioning_custom_options_title" msgid="5067500939930322405">"कस्‍टम विकल्प"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"आपके मुताबिक विकल्प"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"पृष्ठभूमि का रंग"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"पृष्ठभूमि पारदर्शिता"</string>
     <string name="captioning_window_color" msgid="6902052743419717394">"कैप्शन विंडो का रंग"</string>
@@ -1835,7 +1888,7 @@
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"लेख पारदर्शिता"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"किनारे का रंग"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"किनारे का प्रकार"</string>
-    <string name="captioning_typeface" msgid="1826169240566563259">"फ़ॉन्ट परिवार"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"फ़ॉन्ट फ़ैमिली"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"कैप्‍शन इस तरह दिखाई देंगे"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"सामान्य"</string>
@@ -1853,14 +1906,14 @@
     <string name="color_magenta" msgid="5059212823607815549">"मैजेंटा"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए यह आवश्यक है:"</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"चूंकि एक ऐप अनुमति के अनुरोध को अस्पष्ट बना रहा है, इसलिए सेटिंग आपके प्रतिसाद को सत्यापित नहीं कर पा रही हैं."</string>
-    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"यदि आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
-    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"क्योंकि आपने सरल उपयोग सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा एन्क्रिप्शन को एन्हांस करने के लिए आपके स्क्रीन लॉक का उपयोग नहीं करेगा."</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"क्यूंकि ऐप की वजह से अनुमति के अनुरोध को समझने में दिक्कत हो रही है, इसलिए सेटिंग से आपके जवाब की पुष्टि नहीं हो पा रही हैं."</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"अगर आप <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करते हैं, तो आपका डिवाइस डेटा सुरक्षित करने के काम को बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"क्योंकि आपने सुलभता सेवा चालू की हुई है इसलिए आपका डिवाइस डेटा सुरक्षित करने के बेहतर करने के लिए आपके स्क्रीन लॉक का इस्तेमाल नहीं करेगा."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पैटर्न की पुष्‍टि करनी होगी."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पिन की पुष्‍टि करनी होगी"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"क्‍योंकि <xliff:g id="SERVICE">%1$s</xliff:g> को चालू करने से डेटा एेन्‍क्रिप्‍शन प्रभावित होता है, इसलिए आपको अपने पासवर्ड की पुष्‍टि करनी होगी."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"अपनी कार्यवाही ध्यान से देखें"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"किसी ऐप्स  से सहभागिता करते समय नोटिफ़िकेशन प्राप्त करें."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"किसी ऐप का इस्तेमाल करते समय सूचना पाएं."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> को रोकें?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"ठीक टैप करने से <xliff:g id="SERVICE">%1$s</xliff:g> बंद हो जाएगी."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"कोई सेवा इंस्‍टॉल नहीं है"</string>
@@ -1873,6 +1926,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>
@@ -1882,21 +1939,21 @@
     <string name="print_feature_state_off" msgid="7294876968403966040">"बंद"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"सेवा जोड़ें"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"प्रिंटर जोड़ें"</string>
-    <string name="print_menu_item_search" msgid="7025589328240514553">"खोजें"</string>
-    <string name="print_searching_for_printers" msgid="4680248496457576358">"प्रिंटर खोज रहा है"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"सर्च करें"</string>
+    <string name="print_searching_for_printers" msgid="4680248496457576358">"प्रिंटर को सर्च कर रहा है"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"सेवा अक्षम है"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"प्रिंट कार्य"</string>
     <string name="print_print_job" msgid="7563741676053287211">"प्रिंट कार्य"</string>
-    <string name="print_restart" msgid="8373999687329384202">"पुन: प्रारंभ करें"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"अभी नहीं"</string>
+    <string name="print_restart" msgid="8373999687329384202">"फिर से शुरू करें"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"रद्द करें"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> प्रिंट हो रहा है"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द हो रहा है"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"प्रिंटर गड़बड़ी <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"प्रिंटर अवरोधित <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
-    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"खोज बॉक्स प्रदर्शित है"</string>
-    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"खोज बॉक्स छुपा हुआ है"</string>
-    <string name="printer_info_desc" msgid="5824995108703060003">"इस प्रिंटर के बारे में अधिक जानकारी"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"सर्च बॉक्स दिखाई दे रहा है"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"सर्च बॉक्स छिपा हुआ है"</string>
+    <string name="printer_info_desc" msgid="5824995108703060003">"इस प्रिंटर के बारे में और जानकारी"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"बैटरी"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"बैटरी का उपयोग कौन कर रहा है"</string>
     <string name="power_usage_not_available" msgid="3109326074656512387">"बैटरी उपयोग डेटा उपलब्ध नहीं है."</string>
@@ -1933,12 +1990,35 @@
     <string name="awake" msgid="387122265874485088">"डिवाइस सक्रियण समय"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"वाई-फ़ाई  चालू होने से अब तक का समय"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"वाई-फ़ाई  चालू होने से अब तक का समय"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"उन्नत बैटरी उपयोग"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"बेहतर बैटरी उपयोग"</string>
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास विवरण"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"बैटरी उपयोग"</string>
     <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="4006631636646776488">"आपका फ़ोन बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"आपका टैबलेट बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"आपका डिवाइस बैटरी को सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> उसे बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप को अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> उसे बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप्लिकेशन अनइंस्टॉल करने की ज़रूरत हो सकती है."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"आपका डिवाइस बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> उसे बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ऐप्लिकेशन रोकें"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"बैकग्राउंड उपयोग बंद करें और ऐप्लिकेशन बंद करें?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> आपके डिवाइस को बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं और उसे बैकग्राउंड में चलने से रोक सकते हैं."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> आपके डिवाइस को बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं और उसे बैकग्राउंड में चलने से रोक सकते हैं."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP_0">%1$s</xliff:g> आपके डिवाइस को बार-बार चालू कर रहा है.\n\nइस समस्या को ठीक करने के लिए, आप <xliff:g id="APP_1">%1$s</xliff:g> को बंद कर सकते हैं और उसे बैकग्राउंड में चलने से रोक सकते हैं."</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="7774807745601479888">"आपका फ़ोन बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का इस्तेमाल नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके जगह का अनुरोध करता है.\n\nइस समस्या का हल करने के लिए, आप इस ऐप्लिकेशन के लिए जगह सेवा बंद कर सकते हैं."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"आपका टैबलेट बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का इस्तेमाल नहीं कर रहे होते हैं तब <xliff:g id="APP">%1$s</xliff:g> बार-बार आपके जगह का अनुरोध करता है.\n\nइस समस्या का हल करने के लिए, आप इस ऐप्लिकेशन के लिए जगह की जानकारी को बंद कर सकते हैं."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"आपका डिवाइस बैटरी को सामान्य रूप से प्रबंधित नहीं कर पा रहा है क्योंकि जब आप ऐप्लिकेशन का इस्तेमाल नहीं कर रहे होते हैं तब <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>
@@ -1946,20 +2026,20 @@
     <string name="power_bluetooth" msgid="4373329044379008289">"ब्लूटूथ"</string>
     <string name="power_cell" msgid="3392999761958982492">"मोबाइल नेटवर्क स्टैंडबाय"</string>
     <string name="power_phone" msgid="5392641106474567277">"ध्‍वनि कॉल"</string>
-    <string name="power_idle" product="tablet" msgid="4612478572401640759">"टेबलेट इस्तेमाल नहीं किया जा रहा"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"टैबलेट इस्तेमाल नहीं किया जा रहा"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"फ़ोन इस्तेमाल नहीं किया जा रहा"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"विविध"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"अत्यधिक"</string>
     <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="usage_type_cpu" msgid="715162150698338714">"कुल CPU"</string>
-    <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभाग"</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>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
     <string name="usage_type_wifi_running" msgid="3134357198266380400">"वाई-फ़ाई  चल रहा है"</string>
-    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"टेबलेट"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"टैबलेट"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"फ़ोन"</string>
     <string name="usage_type_data_send" msgid="8971710128438365919">"मोबाइल पैकेट भेजे गए"</string>
     <string name="usage_type_data_recv" msgid="5468564329333954445">"मोबाइल पैकेट प्राप्त हुए"</string>
@@ -1976,13 +2056,13 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"पावर का परिकलित उपयोग"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"पावर का देखा गया उपयोग"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"ज़बरदस्ती रोकें"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"ऐप्स की जानकारी"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"ऐप की जानकारी"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"ऐप्स सेटिंग"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"स्‍क्रीन सेटिंग"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"वाई-फ़ाई सेटिंग"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"ब्लूटूथ सेटिंग"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"ध्‍वनि कॉल द्वारा उपयोग की गई बैटरी"</string>
-    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"टेबलेट के इस्तेमाल न होने पर, उपयोग की गई बैटरी"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"टैबलेट के इस्तेमाल न होने पर, उपयोग की गई बैटरी"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"फ़ोन के इस्तेमाल न होने पर, उपयोग की गई बैटरी"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"सेल रेडियो द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"बिना सेट कवरेज वाले क्षेत्रों में पावर बचाने के लिए हवाई जहाज मोड पर स्‍विच करें"</string>
@@ -1999,18 +2079,19 @@
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ऐप्स रोकें या अनइंस्‍टॉल करें"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बैटरी की बचत मोड चुनें"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"बैटरी के उपयोग में कमी लाने के लिए ऐप्स, सेटिंग ऑफ़र कर सकता है"</string>
-    <string name="battery_desc_users" msgid="7682989161885027823">"उपयोगकर्ता के द्वारा उपयोग की गई बैटरी"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"उपयोगकर्ता के ज़रिये इस्तेमाल की गई बैटरी"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"पावर के विविध उपयोग"</string>
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"बैटरी का उपयोग पावर का अनुमानित उपयोग है और इसमें बैटरी की खपत करने वाला प्रत्येक स्रोत शामिल नहीं है. विविध, पावर के परिकलित अनुमानित उपयोग और बैटरी पर देखी गई वास्तविक खपत के बीच का अंतर है."</string>
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"पूरी तरह चार्ज होने के बाद से अब तक का विश्लेषण"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"पिछली बार पूरी तरह चार्ज होने का समय"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"बचा हुआ बैटरी समय अनुमानित है और वह उपयोग के आधार पर बदल सकता है"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"बैटरी उपयोग का डेटा अनुमानित है और यह उपयोग के आधार पर बदल सकता है"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"जब सक्रिय उपयोग में हो"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"बैकग्राउंड में होने पर"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"बैटरी उपयोग"</string>
@@ -2045,7 +2126,7 @@
     <string name="process_stats_os_native" msgid="5322428494231768472">"स्थानीय"</string>
     <string name="process_stats_os_kernel" msgid="1938523592369780924">"कर्नेल"</string>
     <string name="process_stats_os_zram" msgid="677138324651671575">"Z-Ram"</string>
-    <string name="process_stats_os_cache" msgid="6432533624875078233">"संचय"</string>
+    <string name="process_stats_os_cache" msgid="6432533624875078233">"कैश मेमोरी"</string>
     <string name="process_stats_ram_use" msgid="976912589127397307">"RAM का उपयोग"</string>
     <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM का उपयोग (पृष्‍ठभूमि)"</string>
     <string name="process_stats_run_time" msgid="6520628955709369115">"रन टाइम"</string>
@@ -2057,7 +2138,7 @@
     <string name="mem_use_subtitle" msgid="7319468770222422412">"मेमोरी उपयोग"</string>
     <string name="mem_use_kernel_type" msgid="8698327165935012484">"कर्नल"</string>
     <string name="mem_use_native_type" msgid="5976704902328347400">"स्थानीय"</string>
-    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"कर्नल संचय"</string>
+    <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"कर्नल कैश मेमोरी"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam स्वैप"</string>
     <string name="mem_use_free_type" msgid="717708548454880840">"नि:शुल्क"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"कुल"</string>
@@ -2075,14 +2156,14 @@
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"संचित"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"बोलकर फ़ोन को निर्देश और आउटपुट"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"बोलकर फ़ोन को निर्देश और आउटपुट सेटिंग"</string>
-    <string name="voice_search_settings_title" msgid="2775469246913196536">"बोलकर खोजें"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"बोलकर सर्च करें"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android कीबोर्ड"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"बोलकर फ़ोन को निर्देश सेटिंग"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"बोलकर फ़ोन को निर्देश"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"बोलकर फ़ोन को निर्देश सेवाएं"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"पूर्ण हॉटवर्ड और इंटरैक्शन"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"आसान वाक् से लेख"</string>
-    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"बोलकर फ़ोन को निर्देश देने की यह सेवा, आपकी ओर से हमेशा आवाज़ की निगरानी और आवाज़ सक्षम एेप को नियंत्रित करने में मदद करेगी. यह <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> एेप से आता है. इस सेवा को चालू करें?"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"बोलकर फ़ोन को निर्देश देने की यह सेवा, आपकी ओर से हमेशा आवाज़ की निगरानी और ऐसी ऐप जिसमें आवाज़ का इस्तेमाल होता है, को नियंत्रित करने में मदद करेगी. यह <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> एेप से आता है. इस सेवा को चालू करें?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"पसंदीदा इंजन"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"इंजन सेटिंग"</string>
     <string name="tts_sliders_title" msgid="992059150784095263">"बोलने की दर और पिच"</string>
@@ -2096,8 +2177,8 @@
     <string name="tts_reset" msgid="2661752909256313270">"रीसेट करें"</string>
     <string name="tts_play" msgid="2628469503798633884">"चलाएं"</string>
     <string name="gadget_title" msgid="5519037532720577836">"पावर नियंत्रण"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाई-फ़ाई  सेटिंग के बारे में नई जानकारी मिलना"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटूथ सेटिंग में नई जानकारी मिल रही है"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाई-फ़ाई सेटिंग अपडेट हो रही है"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटूथ सेटिंग अपडेट हो रही है"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"चालू"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"बंद"</string>
@@ -2105,7 +2186,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद हो रहा है"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"वाई-फ़ाई"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटूथ"</string>
-    <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"जगह"</string>
     <string name="gadget_sync" msgid="858895763714222152">"समन्वयन करें"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"स्क्रीन की रोशनी <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"स्वचालित"</string>
@@ -2122,13 +2203,13 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"सभी प्रमाणपत्र निकालें"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"विश्वसनीय प्रमाणिकता"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वस्त CA प्रमाणपत्र दिखाएं"</string>
-    <string name="user_credentials" msgid="3719013347787187083">"उपयोगकर्ता प्रमाणिकता"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"यूज़र क्रेडेंशियल"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"संग्रहित प्रमाणिकता देखें और बदलाव करें"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"बेहतर सेटिंग"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"मेमोरी का प्रकार"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-समर्थित"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"केवल सॉफ़्टवेयर"</string>
-    <string name="credentials_settings_not_available" msgid="7968275634486624215">"इस उपयोगकर्ता के लिए प्रमाणिकता उपलब्ध नहीं हैं"</string>
+    <string name="credentials_settings_not_available" msgid="7968275634486624215">"इस उपयोगकर्ता के लिए क्रेडेंशियल मौजूद नहीं हैं"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN और ऐप्लिकेशन के लिए इंस्टॉल किया गया"</string>
     <string name="credential_for_wifi" msgid="6228425986551591864">"वाई-फ़ाई के लिए इंस्टॉल किया गया"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -2143,7 +2224,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"प्रमाणिकता मेमोरी मिटाया नहीं जा सका."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"प्रमाणिकता मेमोरी सक्षम किया गया है."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"प्रमाणिकता मेमोरी का उपयोग करने से पहले, आपको लॉक स्‍क्रीन पिन या पासवर्ड सेट करना होगा."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"उपयोग एक्सेस वाले ऐप्स"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"उपयोग एक्सेस वाले ऐप"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"आपातकालीन टोन"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"बैकअप लें"</string>
@@ -2166,24 +2247,24 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"इस डिवाइस का एडमिन एेप बंद करें"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"ऐप अनइंस्टॉल करें"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"बंद करें और अनइंस्टॉल करें"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"डिवाइस व्यवस्थापक ऐप्लिकेशन"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"डिवाइस एडमिन ऐप"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"कोई भी डिवाइस व्यवस्थापक ऐप्लिकेशन उपलब्ध नहीं है"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"व्यक्तिगत"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"कार्यस्थल"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"कोई ट्रस्ट एजेंट उपलब्ध नहीं"</string>
-    <string name="add_device_admin_msg" msgid="1501847129819382149">"डिवाइस व्यवस्थापक ऐप्लिकेशन सक्रिय करें?"</string>
-    <string name="add_device_admin" msgid="4192055385312215731">"इस डिवाइस व्यवस्थापक ऐप्लिकेशन को सक्रिय करें"</string>
+    <string name="add_device_admin_msg" msgid="1501847129819382149">"इस डिवाइस एडमिन ऐप को सक्रिय करें?"</string>
+    <string name="add_device_admin" msgid="4192055385312215731">"इस डिवाइस एडमिन ऐप को सक्रिय करें"</string>
     <string name="device_admin_add_title" msgid="3140663753671809044">"डिवाइस व्यवस्थापक"</string>
     <string name="device_admin_warning" msgid="7482834776510188134">"इस व्यवस्थापक ऐप्लिकेशन को सक्रिय करने से <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्लिकेशन को ये काम करने की अनुमति मिल जाएगी:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"यह व्यवस्थापक ऐप्लिकेशन सक्रिय है और <xliff:g id="APP_NAME">%1$s</xliff:g> ऐप्लिकेशन को आगे दिए गए काम करने देता है:"</string>
-    <string name="profile_owner_add_title" msgid="6249331160676175009">"प्रोफाइल प्रबंधक सक्रिय करें?"</string>
-    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"आगे बढ़ने से, आपके उपयोगकर्ता का प्रबंधन आपका व्यवस्थापक करेगा जो आपके व्यक्तिगत डेटा के अलावा, जुड़ा हुआ डेटा भी संग्रहित कर सकेगा.\n\nआपका व्यवस्थापक इस उपयोगकर्ता की सेटिंग, एक्सेस, ऐप्लिकेशन और इससे जुड़े डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिसमें नेटवर्क गतिविधि और आपके डिवाइस के स्थान की जानकारी शामिल है."</string>
+    <string name="profile_owner_add_title" msgid="6249331160676175009">"प्रोफाइल प्रबंधक को सक्रिय करें?"</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"अगर आप आगे बढ़ते हैं, तो आपके उपयोगकर्ता का प्रबंधन आपका एडमिन करेगा जो आपके निजी डेटा के अलावा, उससे जुड़ा हुआ डेटा भी इकट्ठा कर सकता है.\n\nआपका एडमिन इस उपयोगकर्ता की सेटिंग, पहुंच, ऐप्लिकेशन और इससे जुड़े डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिसमें नेटवर्क गतिविधि और आपके डिवाइस के जगह की जानकारी शामिल है."</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"आपके व्यवस्थापक ने दूसरे विकल्पों को अक्षम किया हुआ है"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"अधिक विवरण"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"शीर्षक-रहित"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"सामान्य"</string>
-    <string name="notification_log_title" msgid="3766148588239398464">"नोटिफ़िकेशन लॉग"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"कॉल की रिंगटोन और कंपन"</string>
+    <string name="notification_log_title" msgid="3766148588239398464">"सूचना लॉग"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"रिंगटोन और कंपन (वाइब्रेशन)"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"सिस्टम"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"वाई-फ़ाई  सेटअप"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"वाई-फ़ाई नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट करें"</string>
@@ -2200,7 +2281,7 @@
     <string name="wifi_setup_connect" msgid="7954456989590237049">"जोड़ दें"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"भूलें"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"जोड़ें"</string>
-    <string name="wifi_setup_cancel" msgid="3185216020264410239">"अभी नहीं"</string>
+    <string name="wifi_setup_cancel" msgid="3185216020264410239">"रद्द करें"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"नेटवर्क स्‍कैन कर रहा है..."</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"किसी नेटवर्क से कनेक्ट करने के लिए उस पर टैप करें"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"मौजूदा नेटवर्क से कनेक्‍ट करें"</string>
@@ -2212,7 +2293,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP समर्थित नहीं है."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"आप सेटअप के दौरान किसी EAP वाई-फ़ाई  कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्‍ट होने में कुछ मिनट लग सकते हैं..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" टैप करें.\n\nकिसी भिन्न वाई-फ़ाई नेटवर्क से कनेक्ट करने के लिए "<b>"वापस जाएं"</b>" टैप करें."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" पर टैप करें.\n\nकिसी दूसरे वाई-फ़ाई नेटवर्क से कनेक्ट करने के लिए "<b>"वापस जाएं"</b>" पर टैप करें."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"अब समन्वयित हो रहा है"</string>
@@ -2239,7 +2320,7 @@
     <string name="settings_backup" msgid="2274732978260797031">"बैक अप सेटिंग"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"मेरी सेटिंग का बैक अप लें"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"अभी समन्वयन करें"</string>
-    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"समन्वयन ना करें"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"लिंक करना रद्द करें"</string>
     <string name="sync_one_time_sync" msgid="3733796114909082260">"अभी समन्वयित करने के लिए टैप करें<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
@@ -2250,11 +2331,11 @@
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"डेटा और सिंक्रनाइज़ेशन"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"पासवर्ड बदलें"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"खाता सेटिंग"</string>
-    <string name="remove_account_label" msgid="5921986026504804119">"खाता हटाएं"</string>
+    <string name="remove_account_label" msgid="5921986026504804119">"खाता मिटाएं"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"कोई खाता जोड़ें"</string>
     <string name="finish_button_label" msgid="481587707657751116">"समाप्त"</string>
-    <string name="really_remove_account_title" msgid="8800653398717172460">"खाता हटाएं?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यह खाता निकालने से, टेबलेट से खाते के सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
+    <string name="really_remove_account_title" msgid="8800653398717172460">"खाता मिटाएं?"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"यह खाता निकालने से, टैबलेट से खाते के सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"यह खाता निकालने से, फ़ोन से इसके सभी संदेश, संपर्क और अन्‍य डेटा हट जाएंगे!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"आपका व्यवस्थापक इस बदलाव की अनुमति नहीं देता"</string>
     <string name="provider_label" msgid="7724593781904508866">"पुश सदस्यता"</string>
@@ -2272,7 +2353,7 @@
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"गलत पिन"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"जांच की जा रही है..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android प्रारंभ किया जा रहा है..."</string>
-    <string name="delete" msgid="4219243412325163003">"हटाएं"</string>
+    <string name="delete" msgid="4219243412325163003">"मिटाएं"</string>
     <string name="misc_files" msgid="6720680815969643497">"विविध फ़ाइलें"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> में से <xliff:g id="NUMBER">%1$d</xliff:g> चयनित"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
@@ -2281,7 +2362,7 @@
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"डेटा खर्च एेप"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"ऐप्स का उपयोग"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ऐप्स की जानकारी"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ऐप की जानकारी"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"मोबाइल डेटा"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"डेटा की सीमा सेट करें"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"डेटा खर्च की अवधि"</string>
@@ -2327,18 +2408,18 @@
     <string name="data_usage_background_label" msgid="2722008379947694926">"पृष्ठभूमि:"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"ऐप्स सेटिंग"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"पृष्‍ठभूमि डेटा"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"बैकग्राउंड में मोबाइल डेटा का उपयोग करना सक्षम करें"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"बैकग्राउंड में मोबाइल डेटा का इस्तेमाल करना चालू करें"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"इस एप्‍लि. के लिए पृष्ठभूमि डेटा प्रतिबंधित करने के लिए, पहले मो. डेटा सीमा सेट करें."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"यह सुविधा सिर्फ़ मोबाइल नेटवर्क उपलब्ध होने पर उस एेप को काम करने से रोक सकती है जो बैकग्राउंड डेटा पर निर्भर है.\n\nआप एेप में उपलब्ध सेटिंग में ज़्यादा उचित डेटा खर्च नियंत्रण पा सकते हैं."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"बैकग्राउंड डेटा प्रतिबंधित करना तभी संभव है जब आपने कोई नेटवर्क डेटा सीमा सेट की हुई हो."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"अपने आप डेटा सिंक चालू करें?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"आपने वेब पर अपने खातों में जो भी बदलाव किए हैं उनकी कॉपी आपके टेबलेट में अपने आप बन जाएगी.\n\nआपने जो भी बदलाव टेबलेट पर किए हैं, उन्हें कुछ खाते वेब पर भी कॉपी कर सकते हैं. Google खाता इसी तरह काम करता है."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"आपने वेब पर अपने खातों में जो भी बदलाव किए हैं उनकी कॉपी आपके टैबलेट में अपने आप बन जाएगी.\n\nआपने जो भी बदलाव टैबलेट पर किए हैं, उन्हें कुछ खाते वेब पर भी कॉपी कर सकते हैं. Google खाता इसी तरह काम करता है."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"आपने वेब पर अपने खातों में जो भी बदलाव किए हैं उनकी कॉपी आपके फ़ोन में अपने आप बन जाएगी.\n\nआपने जो भी बदलाव फ़ोन पर किए हैं, उन्हें कुछ खाते वेब पर भी कॉपी कर सकते हैं. Google खाता इसी तरह काम करता है."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"अपने आप डेटा सिंक बंद करें?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"यह डेटा और बैटरी उपयोग को संरक्षित करेगा, लेकिन हाल की जानकारी इकट्ठा करने के लिए आपको हर खाते का सिंक मैन्‍युअल रूप से करना होगा. और जब नई जानकारी मिलेगी तो आपको नोटिफ़िकेशन नहीं आएगा."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"उपयोग चक्र रीसेट दिनांक"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"प्रत्येक माह का दिनांक:"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"यह डेटा और बैटरी में बचत करेगा, लेकिन हाल की जानकारी इकट्ठा करने के लिए आपको हर खाते को मैन्‍युअल रूप से सिंक करना होगा. और ऐसा करने से आपको किसी भी अपडेट की जानकारी नहीं मिलेगी."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"उपयोग अवधि रीसेट तारीख"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"हर महीने की तारीख:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"सेट करें"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"डेटा खर्च की चेतावनी सेट करें"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"डेटा खर्च की सीमा सेट करें"</string>
@@ -2347,28 +2428,28 @@
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"जैसे ही आपका मोबाइल डेटा आपकी सेट की हुई सीमा पर पहुंचेगा, आपका फ़ोन उसे बंद कर देगा.\n\nचूंकि डेटा खर्च आपके फ़ोन से मापा जाता है और आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, इस्तेमाल किए गए डेटा का हिसाब अलग तरीके से लगा सकती है. इसलिए सीमा को कम पर सेट करने के बारे में विचार करें."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"अगर आप बैकग्राउंड मोबाइल डेटा प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई से कनेक्ट नहीं हो जाते, तब तक कुछ ऐप्लिकेशन और सेवाएं काम नहीं करेंगी."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"अगर आप बैकग्राउंड मोबाइल डेटा प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई से कनेक्ट नहीं हो जाते, तब तक कुछ ऐप्लिकेशन और सेवाएं काम नहीं करेंगी.\n\nइस सेटिंग से इस टैबलेट पर मौजूद सभी उपयोगकर्ता प्रभावित होते हैं."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"अगर आप बैकग्राउंड मोबाइल डेटा प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई से कनेक्ट नहीं हो जाते, तब तक कुछ ऐप्लिकेशन और सेवाएं काम नहीं करेंगी.\n\nइस सेटिंग से इस फ़ोन पर मौजूद सभी उपयोगकर्ता प्रभावित होते हैं."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"अगर आप बैकग्राउंड मोबाइल डेटा प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई से कनेक्ट नहीं हो जाते, तब तक कुछ ऐप्लिकेशन और सेवाएं काम नहीं करेंगी.\n\nइस सेटिंग का इस टैबलेट पर मौजूद सभी उपयोगकर्ताओं पर असर पड़ेगा ."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"अगर आप बैकग्राउंड मोबाइल डेटा प्रतिबंधित करते हैं, तो जब तक आप वाई-फ़ाई से कनेक्ट नहीं हो जाते, तब तक कुछ ऐप्लिकेशन और सेवाएं काम नहीं करेंगी.\n\nइस सेटिंग का इस फ़ोन पर मौजूद सभी उपयोगकर्ताओं पर असर पड़ता है."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"चेतावनी"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"सीमा"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"निकाले गए ऐप्स"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"ऐप्स  और उपयोगकर्ताओं को निकालें"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> प्राप्त, <xliff:g id="SENT">%2$s</xliff:g> भेजा"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया."</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके टेबलेट के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपके कैरियर की डेटा गणना अलग हो सकती है."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके टैबलेट के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपके कैरियर की डेटा गणना अलग हो सकती है."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके फ़ोन के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपके कैरियर की डेटा गणना अलग हो सकती है."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"नेटवर्क प्रतिबंध"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"बैकग्राउंड डेटा प्रतिबंधित होने पर मापे जाने वाले नेटवर्क मोबाइल नेटवर्क की तरह माने जाते हैं. बड़े डाउनलोड के लिए इन नेटवर्क का उपयोग करने से पहले ऐप्लिकेशन चेतावनी दे सकते हैं."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"बैकग्राउंड डेटा प्रतिबंधित होने पर बिल किए जाने वाले नेटवर्क मोबाइल नेटवर्क की तरह माने जाते हैं. बड़े डाउनलोड के लिए इन नेटवर्क का उपयोग करने से पहले ऐप चेतावनी दे सकते हैं."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाइल नेटवर्क"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"मीटर किए गए वाई-फ़ाई नेटवर्क"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"मापे जाने वाले नेटवर्क चुनने के लिए, वाई-फ़ाई चालू करें."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"बिल किए गए वाई-फ़ाई नेटवर्क"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"बिल किए जाने वाले नेटवर्क चुनने के लिए, वाई-फ़ाई चालू करें."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आपातकालीन कॉल"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"कॉल पर वापस लौटें"</string>
     <string name="vpn_name" msgid="4689699885361002297">"नाम"</string>
     <string name="vpn_type" msgid="5435733139514388070">"प्रकार"</string>
     <string name="vpn_server" msgid="2123096727287421913">"सर्वर पता"</string>
-    <string name="vpn_mppe" msgid="6639001940500288972">"PPP एन्‍क्रिप्‍शन (MPPE)"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"पीपीपी सुरक्षा (MPPE) चालू करें"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP सीक्रेट"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec पहचानकर्ता"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec पहले से शेयर की गई कुंजी"</string>
@@ -2376,12 +2457,12 @@
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA प्रमाणपत्र"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec सर्वर प्रमाणपत्र"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"बेहतर विकल्प दिखाएं"</string>
-    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS खोज डोमेन"</string>
-    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS सर्वर (उदा. 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"अग्रेषण मार्ग (उदा. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"उपयोगकर्ता नाम"</string>
+    <string name="vpn_search_domains" msgid="5391995501541199624">"DNS सर्च डोमेन"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS सर्वर (उदाहरण 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"फ़ॉरवर्डिंग रूट्स (उदाहरण 10.0.0.0/8)"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"उपयोगकर्ता का नाम"</string>
     <string name="vpn_password" msgid="6756043647233596772">"पासवर्ड"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"खाता जानकारी रखें"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"खाते की जानकारी सेव करें"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(उपयोग नहीं किया)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(सर्वर सत्‍यापित न करें)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्वर से प्राप्त)"</string>
@@ -2389,13 +2470,13 @@
     <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"हमेशा-चालू VPN सिर्फ़ संख्या वाले सर्वर पतों का समर्थन करता है"</string>
     <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"हमेशा-चालू VPN के लिए एक DNS सर्वर तय किया जाना चाहिए"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"DNS सर्वर के पते हमेशा-चालू VPN के लिए संख्या रूप में होने चाहिए"</string>
-    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"जो जानकारी डाली गई है वह हमेशा-चालू VPN का समर्थन नहीं करती"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"अभी नहीं"</string>
+    <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"डाली गई जानकारी VPN हमेशा चालू रखें से मेल नहीं खाती"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"रद्द करें"</string>
     <string name="vpn_done" msgid="8678655203910995914">"ख़ारिज करें"</string>
     <string name="vpn_save" msgid="4233484051644764510">"जोड़ें"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"जोड़ दें"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"बदलें"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"VPN प्रोफ़ाइल संपादित करें"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"VPN प्रोफ़ाइल में बदलाव करें"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"भूल जाएं"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">" <xliff:g id="PROFILE">%s</xliff:g> से कनेक्ट करें"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"इस VPN को डिसकनेक्ट करना चाहते हैं?"</string>
@@ -2413,8 +2494,8 @@
     <string name="vpn_cant_connect_message" msgid="1352832123114214283">"यह ऐप्लिकेशन हमेशा-चालू VPN का समर्थन नहीं करता"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">" VPN प्रोफ़ाइल जोड़ें"</string>
-    <string name="vpn_menu_edit" msgid="408275284159243490">"प्रोफ़ाइल संपादित करें"</string>
-    <string name="vpn_menu_delete" msgid="8098021690546891414">"प्रोफ़ाइल हटाएं"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"प्रोफ़ाइल में बदलाव करें"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"प्रोफ़ाइल मिटाएं"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"हमेशा-चालू VPN"</string>
     <string name="vpn_no_vpns_added" msgid="5002741367858707244">"कोई VPN नहीं जोड़ा गया"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"VPN से हमेशा कनेक्ट रहें"</string>
@@ -2424,7 +2505,7 @@
     <string name="vpn_require_connection_title" msgid="159053539340576331">"VPN कनेक्शन ज़रूरी है?"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"वह VPN प्रोफ़ाइल चुनें जिससे हमेशा कनेक्ट रहना है. नेटवर्क ट्रैफ़िक की अनुमति केवल इस VPN से कनेक्ट रहने पर ही दी जाएगी."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"कोई नहीं"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"हमेशा-चालू VPN के लिए, सर्वर और DNS दोनों के लिए IP पता होना आवश्यक है."</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"हमेशा-चालू VPN के लिए, सर्वर और DNS दोनों के लिए आईपी पता होना ज़रूरी है."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"कोई नेटवर्क कनेक्शन नहीं है. कृपया बाद में पुन: प्रयास करें."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN से डिसकनेक्ट किया गया"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"कोई नहीं"</string>
@@ -2432,7 +2513,7 @@
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"सिस्‍टम"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"उपयोगकर्ता"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"अक्षम करें"</string>
-    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"सक्षम करें"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"चालू करें"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"निकालें"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"भरोसा"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"सिस्‍टम CA प्रमाणपत्र सक्षम करना है?"</string>
@@ -2443,32 +2524,32 @@
     <string name="one_usercrt" msgid="2150319011101639509">"एक उपयोगकर्ता प्रमाणपत्र"</string>
     <string name="one_cacrt" msgid="6844397037970164809">"एक CA प्रमाणपत्र"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA प्रमाणपत्र"</string>
-    <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेंशियल का विवरण"</string>
+    <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेंशियल की पूरी जानकारी"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेंशियल निकाला गया: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
-    <string name="user_credential_none_installed" msgid="3729607560420971841">"कोई उपयोगकर्ता क्रेडेंशियल इंस्टॉल नहीं है"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"कोई यूज़र क्रेडेंशियल इंस्टॉल नहीं है"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्द जांच"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"अपना वर्तमान पूर्ण बैकअप पासवर्ड यहां लिखें"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"पूर्ण बैकअप के लिए यहां नया पासवर्ड लिखें"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"यहां अपना नया पूर्ण बैकअप पासवर्ड फिर से लिखें"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"बैकअप पासवर्ड सेट करें"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"अभी नहीं"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"रद्द करें"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"अतिरिक्त सिस्टम अपडेट"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"अक्षम"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"अनुमति देने वाला"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"लागू किया जा रहा है"</string>
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"नेटवर्क को मॉनीटर किया जा सकता है"</string>
-    <string name="done_button" msgid="1991471253042622230">"पूर्ण"</string>
+    <string name="done_button" msgid="1991471253042622230">"हो गया"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
       <item quantity="one">प्रमाणपत्रों पर विश्वास करें या निकालें</item>
       <item quantity="other">प्रमाणपत्रों पर विश्वास करें या निकालें</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपके डिवाइस पर प्रमाणपत्र प्राधिकार इंस्टॉल किए हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही आपकी डिवाइस नेटवर्क गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपके डिवाइस पर प्रमाणपत्र प्राधिकार इंस्टॉल किए हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही आपकी डिवाइस नेटवर्क गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपके डिवाइस पर एक सर्टिफ़िकेट अथॉरिटी को इंस्टॉल किया है, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही आपकी डिवाइस नेटवर्क गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में और जानकारी के लिए, अपने एडमिन से संपर्क करें.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपके डिवाइस पर एक सर्टिफ़िकेट अथॉरिटी को इंस्टॉल किया है, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही आपकी डिवाइस नेटवर्क गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में और जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी कार्य प्रोफ़ाइल के लिए प्रमाणपत्र प्राधिकरण इंस्टॉल किए हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही कार्यस्थल की नेटवर्क की गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी कार्य प्रोफ़ाइल के लिए प्रमाणपत्र प्राधिकरण इंस्टॉल किए हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही कार्यस्थल की नेटवर्क की गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में अधिक जानकारी के लिए, अपने व्यवस्थापक से संपर्क करें.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी वर्क प्रोफ़ाइल के लिए प्रमाणपत्र अनुमतियां इंस्टॉल की हैं, जिससे उसे ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइटों के साथ ही वर्क नेटवर्क की गतिविधि की निगरानी करने की अनुमति मिल सकती है.\n\nइन प्रमाणपत्रों के बारे में और जानकारी के लिए, अपने एडमिन से संपर्क करें.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ने आपकी वर्क प्रोफ़ाइल के लिए प्रमाणपत्र अनुमतियां इंस्टॉल की हैं, जो उन्हें ईमेल, ऐप्लिकेशन और सुरक्षित वेबसाइट सहित, वर्क नेटवर्क गतिविधि की निगरानी करने की अनुमति दे सकते हैं.\n\nइन प्रमाणपत्रों के बारे में और जानकारी के लिए, अपने एडमिन से संपर्क करें.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"एक तृतीय पक्ष ईमेल, ऐप्स और सुरक्षित वेबसाइटों सहित आपकी नेटवर्क गतिविधि को मॉनीटर करने में सक्षम है.\n\nआपके डिवाइस पर इंस्टॉल किए गए एक विश्वसनीय क्रेंडेशियल के कारण ऐसा संभव हो रहा है."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
@@ -2485,64 +2566,64 @@
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट नहीं है"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"सेट नहीं की गई - प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"सेट नहीं की गई - कार्य प्रोफ़ाइल"</string>
-    <string name="user_admin" msgid="993402590002400782">"नियंत्रक"</string>
+    <string name="user_admin" msgid="993402590002400782">"एडमिन"</string>
     <string name="user_you" msgid="1639158809315025986">"आप (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"प्रचलित नाम"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"जोड़ें"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"आप <xliff:g id="USER_COUNT">%1$d</xliff:g> उपयोगकर्ता तक जोड़ सकते हैं"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"उपयोगकर्ताओं के उनके स्वयं के ऐप्स  और सामग्री होती है"</string>
-    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"आप अपने खाते से ऐप्स  और सामग्री पर एक्सेस को प्रतिबंधित कर सकते हैं"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"आप अपने खाते से ऐप और सामग्री की पहुंच को रोक सकते हैं"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"उपयोगकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"नया उपयोगकर्ता जोड़ें?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"आप और ज़्यादा उपयोगकर्ता बनाकर इस डिवाइस को अन्य लोगों से शेयर कर सकते हैं. हर उपयोगकर्ता ऐप, वॉलपेपर जैसी चीज़ों से अपनी जगह में मनपसंद तरीके से बदलाव कर सकते हैं. उपयोगकर्ता वाई-फ़ाई जैसी डिवाइस सेटिंग को भी बदल कर, हर किसी पर असर डाल सकते हैं.\n\nजब आप एक नया उपयोगकर्ता जोड़ते हैं, तो उस उपयोगकर्ता को अपनी जगह सेट करनी पड़ती है.\n\nकोई भी उपयोगकर्ता और सभी उपयोगकर्ताओं के लिए ऐप अपडेट कर सकता है."</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">"जब आप कोई नया उपयोगकर्ता जोड़ते हैं तो उस व्यक्ति को अपना स्थान सेट करना होता है.\n\nकोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं के लिए ऐप्स अपडेट कर सकता है."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"आप और ज़्यादा उपयोगकर्ता बनाकर इस डिवाइस को अन्य लोगों से शेयर कर सकते हैं. हर उपयोगकर्ता ऐप, वॉलपेपर जैसी चीज़ों से अपनी जगह में मनपसंद तरीके से बदलाव कर सकते हैं. उपयोगकर्ता वाई-फ़ाई जैसी डिवाइस सेटिंग को भी बदल कर, हर किसी पर असर डाल सकते हैं.\n\nजब आप एक नया उपयोगकर्ता जोड़ते हैं, तो उसे अपनी जगह सेट करनी पड़ती है.\n\nकोई भी उपयोगकर्ता बाकी सभी उपयोगकर्ताओं के लिए ऐप अपडेट कर सकता है."</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"जब आप कोई नया उपयोगकर्ता जोड़ते हैं तो उसे अपनी जगह सेट करनी होती है.\n\nकोई भी उपयोगकर्ता बाकी सभी उपयोगकर्ताओं के लिए ऐप अपडेट कर सकता है."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"उपयोगकर्ता को अभी सेट करें?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"सुनिश्चित करें कि व्यक्ति डिवाइस लेने और अपना स्थान सेट करने के लिए उपलब्ध है"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"पक्का करें कि व्यक्ति डिवाइस का इस्तेमाल करने और अपनी जगह सेट करने के लिए मौजूद है"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"प्रोफ़ाइल अभी सेट करें?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"अभी सेट करें"</string>
-    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"अभी नहीं"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"केवल टेबलेट का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
+    <string name="user_setup_button_setup_later" msgid="3068729597269172401">"रद्द करें"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"केवल टैबलेट का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"केवल फ़ोन का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"प्रतिबंधित प्रोफ़ाइल खाते नहीं जोड़ सकती हैं"</string>
-    <string name="user_remove_user_menu" msgid="6897150520686691355">"इस डिवाइस से <xliff:g id="USER_NAME">%1$s</xliff:g> को हटाएं"</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"इस उपकरण से <xliff:g id="USER_NAME">%1$s</xliff:g> को मिटाएं"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"लॉक स्‍क्रीन सेटिंग"</string>
     <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"लॉक स्क्रीन से उपयोगकर्ताओं को जोड़ें"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"नया उपयोगकर्ता"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"नई प्रोफ़ाइल"</string>
-    <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"स्वयं को हटाएं?"</string>
+    <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"खुद को मिटाएं?"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"इस उपयोगकर्ता को निकालें?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"इस प्रोफ़ाइल को निकालें?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"कार्य प्रोफ़ाइल निकालें?"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"आप इस टेबलेट पर अपने स्थान और डेटा को खो देंगे. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"आप इस फ़ोन पर अपने स्थान और डेटा को खो देंगे. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"आप इस टैबलेट पर जगह और डेटा को खो देंगे. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"आप इस फ़ोन पर अपनी जगह और डेटा को खो देंगे. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"सभी ऐप्स और डेटा हटा दिए जाएंगे."</string>
     <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"यदि आप जारी रखते हैं तो इस प्रोफ़ाइल के सभी ऐप्‍स और डेटा को हटा दिया जाएगा."</string>
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"सभी ऐप्स और डेटा हटा दिए जाएंगे."</string>
-    <string name="user_adding_new_user" msgid="1521674650874241407">"नया उपयोगकर्ता जोड़ रहा है…"</string>
-    <string name="user_delete_user_description" msgid="3158592592118767056">"उपयोगकर्ता हटाएं"</string>
-    <string name="user_delete_button" msgid="5131259553799403201">"हटाएं"</string>
+    <string name="user_adding_new_user" msgid="1521674650874241407">"नया उपयोगकर्ता जोड़ा जा रहा है…"</string>
+    <string name="user_delete_user_description" msgid="3158592592118767056">"उपयोगकर्ता मिटाएं"</string>
+    <string name="user_delete_button" msgid="5131259553799403201">"मिटाएं"</string>
     <string name="user_guest" msgid="8475274842845401871">"अतिथि"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"अतिथि को निकालें"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"अतिथि को निकालें?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"इस सत्र के सभी ऐप्स और डेटा को हटा दिया जाएगा."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"निकालें"</string>
     <string name="user_enable_calling" msgid="5128605672081602348">"फ़ोन कॉल चालू करें"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"फ़ोन कॉल और SMS चालू करें"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"फ़ोन कॉल और मैसेज (एसएमएस) चालू करें"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"उपयोगकर्ता निकालें"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"फ़ोन कॉल चालू करें?"</string>
-    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"कॉल इतिहास इस उपयोगकर्ता के साथ साझा किया जाएगा."</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फ़ोन कॉल और SMS चालू करें?"</string>
-    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कॉल और SMS इतिहास इस उपयोगकर्ता के साथ साझा किया जाएगा."</string>
+    <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"कॉल इतिहास इस उपयोगकर्ता के साथ शेयर किया जाएगा."</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फ़ोन कॉल और मैसेज (एसएमएस) चालू करें?"</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"कॉल और मैसेज (एसएमएस) का इतिहास इस उपयोगकर्ता के साथ शेयर किया जाएगा."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आपातकालीन जानकारी"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> की जानकारी और संपर्क"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"ऐप्स  और सामग्री की अनुमति दें"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले ऐप्स"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ऐप्स  सेटिंग विस्तृत करें"</string>
-    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ऐप के लिए सेटिंग का विस्तार करें"</string>
+    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"यह सेटिंग इस टैबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदलें"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"टैप करें और पेमेंट करें"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"टैप करें और भुगतान करें"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"यह कैसे काम करता है"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"स्टोर में अपने फ़ोन से भुगतान करें"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"भुगतान डिफ़ॉल्‍ट"</string>
@@ -2554,7 +2635,7 @@
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"एक टैप करके और AMP के ज़रिये; भुगतान टर्मिनल पर, इससे भुगतान करें:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"टर्मिनल पर भुगतान करना"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"भुगतान ऐप सेट करें. फिर बस अपने फ़ोन के पिछले भाग को संपर्क-रहित प्रतीक वाले किसी टर्मिनल की ओर रखकर पकड़ें."</string>
-    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"समझ लिया"</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"ठीक है"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"अधिक..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"अपनी प्राथमिकता के रूप में सेट करें?"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"टैप करके भुगतान करते समय हमेशा <xliff:g id="APP">%1$s</xliff:g> का उपयोग करें?"</string>
@@ -2562,36 +2643,36 @@
     <string name="restriction_settings_title" msgid="4233515503765879736">"प्रतिबंध"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"प्रतिबंधों को निकालें"</string>
     <string name="restriction_menu_change_pin" msgid="740081584044302775">"पिन बदलें"</string>
-    <string name="app_notifications_switch_label" msgid="9124072219553687583">"नोटिफ़िकेशन दिखाएं"</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>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"जान और माल की गंभीर धमकियों की नोटिफ़िकेशन प्राप्त करें"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"जान और माल की गंभीर खतरों के अलर्ट पाएं"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"गंभीर धमकियां"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"जान और माल की गंभीर धमकियों के लिए नोटिफ़िकेशन प्राप्त करें"</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER नोटिफ़िकेशन"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"जान और माल के गंभीर खतरों के लिए अलर्ट पाएं"</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER अलर्ट"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"बाल अपहरणों के बारे में बुलेटिन प्राप्त करें"</string>
     <string name="repeat_title" msgid="6473587828597786996">"दोहराएं"</string>
-    <string name="call_manager_enable_title" msgid="7718226115535784017">"कॉल प्रबंधक सक्षम करें"</string>
+    <string name="call_manager_enable_title" msgid="7718226115535784017">"कॉल प्रबंधक चालू करें"</string>
     <string name="call_manager_enable_summary" msgid="8458447798019519240">"इस सेवा को कॉल करने का आपका तरीका प्रबंधित करने दें."</string>
     <string name="call_manager_title" msgid="4479949569744516457">"कॉल प्रबंधक"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"आपातकालीन प्रसारण"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"नेटवर्क ऑपरेटर"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"एक्सेस पॉइंट नाम"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"एक्सेस पॉइंट का नाम"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"बेहतर 4G LTE मोड"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ध्वनि और संचारों को उन्नत बनाने के लिए LTE डेटा का उपयोग करें (सुझाए गए)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"पसंदीदा नेटवर्क प्रकार"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (सुझाया गया)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"कार्यस्थल सिम"</string>
-    <string name="user_restrictions_title" msgid="5794473784343434273">"ऐप्स और सामग्री की एक्सेस"</string>
+    <string name="user_restrictions_title" msgid="5794473784343434273">"ऐप और सामग्री तक पहुंच"</string>
     <string name="user_rename" msgid="8523499513614655279">"नाम बदलें"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"ऐप्स  प्रतिबंधों को सेट करें"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> द्वारा नियंत्रित"</string>
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"यह ऐप्स  आपके खातों को एक्सेस कर सकता है"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"यह ऐप आपके खातों तक पहुंच सकता है"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"यह ऐप आपके खातों को ऐक्‍सेस कर सकता है. <xliff:g id="APP">%1$s</xliff:g> के द्वारा नियंत्रित है"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"वाई-फ़ाई और मोबाइल"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"वाई-फ़ाई और मोबाइल सेटिंग में बदलाव की अनुमति दें"</string>
@@ -2599,10 +2680,10 @@
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"ब्लूटूथ से जोड़ने और सेटिंग में बदलाव की अनुमति दें"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"जब यह <xliff:g id="DEVICE_NAME">%1$s</xliff:g> किसी अन्य NFC डिवाइस को स्पर्श करे तब डेटा का आदान-प्रदान होने दें"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"जब टेबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"जब टैबलेट अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"जब फ़ोन अन्य डिवाइस को स्पर्श करे तो डेटा ट्रांसफर करने दें"</string>
-    <string name="restriction_location_enable_title" msgid="5020268888245775164">"स्थान"</string>
-    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ऐप्स  को आपके स्थान की जानकारी का उपयोग करने दें"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"जगह"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ऐप को आपकी जगह की जानकारी का इस्तेमाल करने दें"</string>
     <string name="wizard_back" msgid="5567007959434765743">"वापस जाएं"</string>
     <string name="wizard_next" msgid="3606212602795100640">"आगे"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"समाप्त करें"</string>
@@ -2619,7 +2700,7 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"कोई डेटा SIM चुनने के लिए टैप करें"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"कॉल के लिए हमेशा इसका उपयोग करें"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"डेटा के लिए सिम चुनें"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"डेटा सिम स्‍विच की जा रही है, इसमें एक मिनट तक लग सकता है..."</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"डेटा सिम स्‍विच किया जा रहा है, इसमें एक मिनट तक लग सकता है..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"इस सिम से कॉल करें"</string>
     <string name="sim_select_card" msgid="211285163525563293">"सिम कार्ड चुनें"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"सिम <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -2640,7 +2721,7 @@
     <string name="sim_other_call_settings" msgid="8247802316114482477">"अन्य कॉल सेटिंग"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"पसंदीदा नेटवर्क ऑफ़लोड"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"नेटवर्क नाम प्रसारण अक्षम करें"</string>
-    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"नेटवर्क नाम प्रसारण अक्षम करने से तृतीय पक्षों को आपकी नेटवर्क जानकारी की एक्सेस नहीं मिल पाती."</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"नेटवर्क नाम प्रसारण को बंद करने से तीसरे पक्षों को आपकी नेटवर्क की जानकारी की पहुंच नहीं मिल पाती."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"नेटवर्क नाम प्रसारण को अक्षम करने से छिपे हुए नेटवर्क से स्वचालित कनेक्शन नहीं होगा."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM कार्ड बदला गया."</string>
@@ -2654,19 +2735,22 @@
       <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="app_and_notification_dashboard_title" msgid="7838365599185397539">"ऐप्लिकेशन और नोटिफ़िकेशन"</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>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"डिफ़ॉल्‍ट ऐप्लिकेशन"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"डिफ़ॉल्‍ट ऐप"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"भाषाएं, समय, बैकअप, अपडेट"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिंग"</string>
-    <string name="search_menu" msgid="6283419262313758339">"सेटिंग में खोजें"</string>
-    <string name="query_hint_text" msgid="3350700807437473939">"सेटिंग में खोजें"</string>
+    <string name="search_menu" msgid="6283419262313758339">"सेटिंग में सर्च करें"</string>
+    <string name="query_hint_text" msgid="3350700807437473939">"सेटिंग में सर्च करें"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"वाईफ़ाई, वाई-फ़ाई नेटवर्क कनेक्शन"</string>
-    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"पाठ संदेश पाठ संदेश भेजना मेसेज सेवा"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"मैसेज, मैसेज करना, मैसेज, मैसेज भेजना"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, मोबाइल और इंटरनेट सेवा देने वाली कंपनी, वायरलेस, डेटा, 4g,3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"वाईफ़ाई, वाई-फ़ाई, कॉल, कॉलिंग"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लॉन्चर"</string>
@@ -2674,41 +2758,42 @@
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"हल्की रोशनी, टचस्‍क्रीन, बैटरी"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"हल्की रोशनी, टचस्‍क्रीन, बैटरी"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"मद्धम स्क्रीन, रात, टिंट"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"पृष्ठभूमि, वैयक्तिकृत करें, स्क्रीन कस्टमाइज़ करें"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"बैकग्राउंड, अपने हिसाब से ढालें, स्क्रीन को अपनी पसंद के मुताबिक बनाएं"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"लेख का आकार"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"प्रोजेक्ट, कास्ट करें"</string>
-    <string name="keywords_storage" msgid="3299217909546089225">"स्थान डिस्क हार्ड डिस्क डिवाइस उपयोग"</string>
+    <string name="keywords_storage" msgid="3299217909546089225">"जगह, डिस्क, हार्ड डिस्क, डिवाइस का इस्तेमाल"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"पावर उपयोग, शुल्क"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"वर्तनी शब्दकोश वर्तनीजांच स्‍वत: सुधार"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"पहचानकर्ता, इनपुट, बोली, बोलें, भाषा, हैंड्सफ़्री, हैंड फ़्री, पहचान, आपत्तिजनक, शब्द, ऑडियो, इतिहास, ब्लूटूथ, हेडसेट"</string>
-    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"रेट करें, भाषा, डिफ़ॉल्ट, बोलें, बोलना, tts, एक्सेस-योग्यता स्क्रीन रीडर, नेत्रहीन"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"रेट करें, भाषा, डिफ़ॉल्ट, बोलें, बोलना, tts, सुलभता स्क्रीन रीडर, नेत्रहीन"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"घड़ी, सेना"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"रीसेट करें, पुन: स्‍थापित करें, फ़ैक्टरी"</string>
-    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"वाइप करें, हटाएं, पुनः स्थापित करें, साफ़ करें, निकालें"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"वाइप करें, मिटाएं, रीस्टोर करें, साफ़ करें, निकालें"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"प्रिंटर"</string>
     <string name="keywords_sounds" msgid="7146245090127541167">"स्पीकर बीप"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"न करें, परेशान न करें, बाधा डालें, बाधा, विराम"</string>
     <string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
-    <string name="keywords_location" msgid="6615286961552714686">"आस-पास, स्थान, इतिहास, रिपोर्टिंग"</string>
+    <string name="keywords_location" msgid="6615286961552714686">"आस-पास की जगह, जगह, इतिहास, रिपोर्ट करना"</string>
     <string name="keywords_location_mode" msgid="8584992704568356084">"सटीकता"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"खाता"</string>
     <string name="keywords_users" msgid="3434190133131387942">"प्रतिबंध, प्रतिबंधित करें, प्रतिबंधित"</string>
-    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"लिखी हुई सामग्री में सुधार, सही आवाज़, वाइब्रेशन (कंपन), अपने आप आने वाले भाषा के सुझाव, जेस्चर के सुझाव, थीम, आपत्तिजनक शब्द, प्रकार, इमोजी, अंतर्राष्ट्रीय"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"लिखी हुई सामग्री में सुधार, सही आवाज़, वाइब्रेशन (कंपन), अपने आप आने वाले भाषा के सुझाव, हाथ के जेस्चर(स्पर्श) के सुझाव, थीम, आपत्तिजनक शब्द, लिखना, इमोजी, अंतर्राष्ट्रीय"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"रीसेट करें, प्राथमिकताएं, डिफ़ॉल्‍ट"</string>
     <string name="keywords_emergency_app" msgid="3143078441279044780">"आपातकालीन, बर्फ़, ऐप, डिफ़ॉल्‍ट"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"फ़ोन, डायलर, डिफ़ॉल्ट"</string>
     <string name="keywords_all_apps" msgid="7814015440655563156">"ऐप्स, डाउनलोड करें, ऐप्‍लिकेशन, सिस्‍टम"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"ऐप्स, अनुमतियां, सुरक्षा"</string>
-    <string name="keywords_default_apps" msgid="223872637509160136">"ऐप्स, डिफ़ॉल्ट"</string>
+    <string name="keywords_default_apps" msgid="223872637509160136">"ऐप, डिफ़ॉल्ट"</string>
     <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ऑप्टिमाइज़ेशन, बैटरी बचाएं (डोज़), ऐप स्टैंडबाय पर ध्यान न दें"</string>
     <string name="keywords_color_mode" msgid="6362744316886077510">"चमकीला, RGB, sRGB, रंग, प्राकृतिक, मानक"</string>
     <string name="keywords_color_temperature" msgid="2688947724153266364">"रंग तापमान D65 D73 सफ़ेद पीला नीला वॉर्म कूल"</string>
     <string name="keywords_lockscreen" msgid="5746561909668570047">"अनलॉक करने के लिए स्लाइड करें, पासवर्ड, पैटर्न, पिन"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"कार्य चुनौती, कार्य, प्रोफ़ाइल"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"कार्य प्रोफ़ाइल, प्रबंधित प्रोफ़ाइल, एक करना, एकीकरण, कार्य, प्रोफ़ाइल"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"जेस्चर"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"जेस्चर"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"भुगतान करें, टैप करें, भुगतान"</string>
     <string name="keywords_backup" msgid="470070289135403022">"बैकअप, बैक अप"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"जेस्चर"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाई-फ़ाई  NFC टैग सेट करें"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिखने के लिए टैग टैप करें..."</string>
@@ -2718,33 +2803,33 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC टैग लिखने योग्य नहीं है. कृपया किसी भिन्न टैग का उपयोग करें."</string>
     <string name="default_sound" msgid="8821684447333687810">"डिफ़ॉल्‍ट ध्‍वनि"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"रिंग वॉल्यूम <xliff:g id="PERCENTAGE">%1$s</xliff:g> पर है"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"वॉल्यूम, कंपन, परेशान न करें"</string>
-    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"रिंगर कंपन पर सेट है"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"आवाज़, कंपन (वाइब्रेशन), परेशान न करें"</string>
+    <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"रिंगर, कंपन (वाइब्रेशन) पर सेट है"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"रिंगर मौन पर सेट है"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"रिंग वॉल्यूम 80% पर है"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"मीडिया वॉल्‍यूम"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"अलार्म वॉल्‍यूम"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"रिंग का वॉल्यूम"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"नोटिफ़िकेशन वॉल्‍यूम"</string>
+    <string name="notification_volume_option_title" msgid="6064656124416882130">"सूचना की आवाज़"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"डिफ़ॉल्ट नोटिफ़िकेशन ध्वनि"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"सूचना की डिफ़ॉल्ट आवाज़"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ऐप की ओर से दी जाने वाली ध्वनि"</string>
-    <string name="notification_sound_default" msgid="565135733949733766">"डिफ़ॉल्ट नोटिफ़िकेशन ध्वनि"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"सूचना की डिफ़ॉल्ट आवाज़"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"डिफ़ॉल्ट अलार्म ध्वनि"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल के लिए भी कंपन"</string>
-    <string name="other_sound_settings" msgid="3151004537006844718">"अन्य ध्वनियां"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल के लिए भी कंपन (वाइब्रेशन) करें"</string>
+    <string name="other_sound_settings" msgid="3151004537006844718">"अन्य आवाज़ें"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"डायल पैड टोन"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"स्क्रीन लॉक करने की ध्वनियां"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"स्क्रीन लॉक करने की आवाज़ें"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"चार्जिंग ध्‍वनियां"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"डॉक करने की ध्वनियां"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"स्‍पर्श ध्‍वनियां"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"टैप करने पर कंपन करें"</string>
+    <string name="touch_sounds_title" msgid="5326587106892390176">"स्‍पर्श आवाज़ें"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"छूने पर कंपन (वाइब्रेशन) करे"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"डॉक स्पीकर चलेगा"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"सभी ऑडियो"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"केवल मीडिया ऑडियो"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"मौन"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"नोटिफ़िकेशन"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"अलर्ट"</string>
+    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन (वाइब्रेशन)"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"चालू होने की ध्वनि"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"कोई भी ऑटोमैटिक नियम चालू नहीं है"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
@@ -2753,10 +2838,10 @@
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"परेशान न करें की प्राथमिकताएं"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"प्राथमिकता इनकी अनुमति देती है"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वचालित नियम"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"अॉटोमैटिक नियम"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"परेशान न करें के नियम सेट करें"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"निश्चित समय पर ध्वनियों और कंपनों को सीमित करें"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"केवल प्राथमिकता"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"सिर्फ़ प्राथमिकता"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"केवल अलार्म"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"पूरी तरह शांत"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -2765,37 +2850,38 @@
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"व्यक्तिगत प्रोफाइल ध्वनि काम में लें"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"कार्य और व्यक्तिगत प्रोफ़ाइल के लिए ध्वनियां एक समान होती हैं"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"कार्य फ़ोन की रिंगटोन"</string>
-    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"डिफ़ॉल्ट कार्य नोटिफ़िकेशन ध्वनि"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"कार्य सूचना की डिफ़ॉल्ट आवाज़"</string>
     <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"डिफ़ॉल्ट कार्य अलाम ध्वनि"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"व्यक्तिगत प्रोफ़ाइल के समान"</string>
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"ध्वनियां बदलें?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"बदलें"</string>
     <string name="work_sync_dialog_message" msgid="7841728953710863208">"आपकी व्यक्तिगत प्रोफ़ाइल की ध्वनियों का उपयोग आपकी कार्य प्रोफ़ाइल के लिए किया जाएगा"</string>
-    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"कस्टम ध्वनि जोड़ना चाहते हैं?"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"अपने मुताबिक आवाज़ जोड़ना चाहते हैं?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"इस फ़ाइल को <xliff:g id="FOLDER_NAME">%s</xliff:g> फ़ोल्डर में कॉपी किया जाएगा"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"रिंगटोन"</string>
-    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"अन्य ध्‍वनियां और कंपन"</string>
-    <string name="configure_notification_settings" msgid="7616737397127242615">"नोटिफ़िकेशन"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"उन्नत"</string>
-    <string name="profile_section_header" msgid="2320848161066912001">"कार्य नोटिफ़िकेशन"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"नोटिफ़िकेशन बिंदुओं की अनुमति दें"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"और आवाज़ें और कंपन (वाइब्रेशन)"</string>
+    <string name="configure_notification_settings" msgid="7616737397127242615">"सूचनाएं"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"बेहतर"</string>
+    <string name="profile_section_header" msgid="2320848161066912001">"वर्क प्रोफ़ाइल सूचनाएं"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"सूचना बिंदुओं की अनुमति दें"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ब्लिंक लाइट"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीन पर"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी नोटिफ़िकेशन सामग्री दिखाएं"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील नोटिफ़िकेशन सामग्री छिपाएं"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"नोटिफ़िकेशन बिल्कुल ना दिखाएं"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"जब आपका डिवाइस लॉक हो, तो आप नोटिफ़िकेशन को किस प्रकार दिखाया जाना चाहेंगे?"</string>
-    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"नोटिफ़िकेशन"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"सभी कार्य नोटिफ़िकेशन सामग्री दिखाएं"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"संवेदनशील कार्य नोटिफ़िकेशन सामग्री छिपाएं"</string>
-    <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="notification_channel_title" msgid="2260666541030178452">"नोटिफ़िकेशन की श्रेणी"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी सूचना सामग्री दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील सूचना सामग्री छिपाएं"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"सूचनाएं बिल्कुल न दिखाएं"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"जब आपका डिवाइस लॉक हो, तो आप सूचना को किस तरह दिखाया जाना चाहेंगे?"</string>
+    <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"सूचना"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"सभी कार्य सूचना सामग्री दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"संवेदनशील कार्य सूचना सामग्री छिपाएं"</string>
+    <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="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>
-    <string name="notification_importance_blocked" msgid="7938180808339386300">"नोटिफ़िकेशन कभी ना दिखाएं"</string>
+    <string name="notification_importance_blocked" msgid="7938180808339386300">"सूचनाएं कभी न दिखाएं"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ध्वनि या दृश्य संबंधी कोई रुकावट नहीं"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"कोई ध्वनि नहीं"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ध्वनि करें"</string>
@@ -2805,24 +2891,28 @@
     <string name="notification_importance_default_title" msgid="9120383978536089489">"उच्च"</string>
     <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="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>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप्स  नोटिफ़िकेशन नहीं पढ़ सकते"</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>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप सूचनाएं नहीं पढ़ सकते"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
-      <item quantity="one">%d ऐप्‍स नोटिफ़िकेशन पढ़ सकते हैं</item>
-      <item quantity="other">%d ऐप्‍स नोटिफ़िकेशन पढ़ सकते हैं</item>
+      <item quantity="one">%d ऐप सूचनाएं पढ़ सकते हैं</item>
+      <item quantity="other">%d ऐप सूचनाएं पढ़ सकते हैं</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"इंस्टॉल किए गए किसी भी ऐप द्वारा नोटिफ़िकेशन ऐक्सेस का अनुरोध नहीं किया गया."</string>
-    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए नोटिफ़िकेशन ऐक्सेस की अनुमति दें?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> संपर्क नामों तथा आपको प्राप्त होने वाले संदेशों के लेख जैसी व्यक्तिगत जानकारी सहित, सभी नोटिफ़िकेशन पढ़ सकता है. वह नोटिफ़िकेशन खारिज कर सकेगा और उनमें शामिल कार्रवाई बटनों को ट्रिगर भी कर सकेगा. \n\nइससे ऐप्लिकेशन को परेशान न करें सेवा को चालू या बंद करने और संबंधित सेटिंग को बदलने की क्षमता भी मिल जाएगी."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"यदि आप <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> के लिए नोटिफ़िकेशन का एक्सेस बंद करते हैं, तो परेशान न करें सेवा का एक्सेस भी बंद हो सकता है."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"इंस्टॉल किए गए किसी भी ऐप ने सूचना के एक्सेस का अनुरोध नहीं किया है."</string>
+    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए सूचना को एक्सेस करने की अनुमति दें?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> संपर्क नामों और आपको मिलने वाले मैसेज जैसी निजी जानकारी सहित, सभी सूचना पढ़ सकता है. वह सूचना खारिज कर सकेगा और उनमें शामिल कार्रवाई बटनों को ट्रिगर भी कर सकेगा. \n\nइससे ऐप परेशान न करें सेवा को चालू या बंद कर सकता है और उससे जुड़ी सेटिंग को भी बदल सकता है"</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"अगर आप <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> के लिए सूचना का एक्सेस बंद करते हैं, तो \'परेशान न करें\' सेवा का एक्सेस भी बंद हो सकता है."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"बंद करें"</string>
-    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"अभी नहीं"</string>
+    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"रद्द करें"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR सहायक सेवाएं"</string>
-    <string name="no_vr_listeners" msgid="2689382881717507390">"इंस्टॉल किए गए किसी भी ऐप ने VR सहायक सेवाओं के रूप में चलाए जाने के लिए अनुरोध नहीं किया है."</string>
-    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए VR सेवा के एक्सेस की अनुमति दें?"</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"इंस्टॉल किए गए किसी भी ऐप ने VR सहायक सेवाओं के तौर पर चलाए जाने के लिए अनुरोध नहीं किया है."</string>
+    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"<xliff:g id="SERVICE">%1$s</xliff:g> के लिए VR सेवा के इस्तेमाल की अनुमति दें?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"जब आप आभासी वास्तविकता मोड में ऐप्लिकेशन का उपयोग कर रहे होते हैं, तब <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चला पाएगा."</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"जब डिवाइस VR मोड में हो"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"धुंधलापन कम करें (अनुशंसित)"</string>
@@ -2833,18 +2923,16 @@
     <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="manage_zen_access_title" msgid="2611116122628520522">"परेशान न करें एक्सेस"</string>
+    <string name="zen_access_empty_text" msgid="8772967285742259540">"इंस्टॉल किए गए किसी भी ऐप ने परेशान ना करें सुविधा के इस्तेमाल का अनुरोध नहीं किया है"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android इस ऐप्लिकेशन के नोटिफ़िकेशन को इस डिवाइस पर दिखाई देने से अवरुद्ध कर रहा है"</string>
-    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android नोटिफ़िकेशन की इस श्रेणी को इस डिवाइस पर दिखाई देने से अवरुद्ध कर रहा है"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android इस ऐप की सूचनाओं को इस डिवाइस पर दिखाई देने से रोक रहा है"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android सूचना की इस श्रेणी को इस डिवाइस पर दिखाई देने से रोक रहा है"</string>
     <string name="notification_channels" msgid="5346841743182627500">"श्रेणियां"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
-    <string name="no_channels" msgid="3077375508177744586">"इस ऐप्लिकेशन ने कोई भी नोटिफ़िकेशन पोस्ट नहीं किया है"</string>
+    <string name="no_channels" msgid="3077375508177744586">"इस ऐप ने कोई भी सूचना पोस्ट नहीं की है"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"ऐप्लिकेशन में मौजूद दूसरी सेटिंग"</string>
-    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"सभी ऐप्लिकेशन के लिए चालू किया गया"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"सभी ऐप के लिए चालू किया गया"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन के लिए बंद किया गया</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन के लिए बंद किया गया</item>
@@ -2856,32 +2944,32 @@
     <string name="notification_toggle_on" msgid="650145396718191048">"चालू"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"बंद"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"सभी रोक दें"</string>
-    <string name="app_notification_block_summary" msgid="4744020456943215352">"ये नोटिफ़िकेशन कभी ना दिखाएं"</string>
-    <string name="notification_content_block_title" msgid="5854232570963006360">"नोटिफ़िकेशन दिखाएं"</string>
-    <string name="notification_content_block_summary" msgid="7746185794438882389">"नोटिफ़िकेशन कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं"</string>
+    <string name="app_notification_block_summary" msgid="4744020456943215352">"ये सूचनाएं कभी न दिखाएं"</string>
+    <string name="notification_content_block_title" msgid="5854232570963006360">"सूचना दिखाएं"</string>
+    <string name="notification_content_block_summary" msgid="7746185794438882389">"सूचना कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं"</string>
     <string name="notification_badge_title" msgid="6370122441168519809">"नए नोटिफ़िकेशन बताने वाले गोल निशान की अनुमति दें"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"सूचना बिंदु दिखाएं"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"परेशान ना करें को ओवरराइड करें"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"जब परेशान ना करें को केवल प्राथमिकता पर सेट किया गया हो, तब इन नोटिफ़िकेशन को बाधित करते रहने दें"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"परेशान न करें को बदलें"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"जब \'परेशान न करें\' को सिर्फ़ प्राथमिकता पर सेट किया गया हो, तब इन सूचनाओं को आने से न रोकें"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीन पर"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरोधित"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"प्राथमिकता"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"संवेदनशील"</string>
-    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"पूर्ण"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"हो गया"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"महत्‍व"</string>
     <string name="notification_show_lights_title" msgid="7671781299688190532">"ब्लिंक लाइट"</string>
-    <string name="notification_vibrate_title" msgid="1646667807969755957">"कंपन"</string>
-    <string name="notification_channel_sound_title" msgid="3899212238513507941">"ध्वनि"</string>
-    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"हटाएं"</string>
+    <string name="notification_vibrate_title" msgid="1646667807969755957">"कंपन (वाइब्रेशन)"</string>
+    <string name="notification_channel_sound_title" msgid="3899212238513507941">"आवाज़"</string>
+    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"मिटाएं"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"नाम बदलें"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"नियम का नाम"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"नियम का नाम डालें"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"नियम नाम पहले से उपयोग में है"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"अधिक जोड़ें"</string>
-    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम हटाएं"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"ज़्यादा जोड़ें"</string>
+    <string name="zen_mode_delete_rule" msgid="2985902330199039533">"नियम मिटाएं"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"नियम का प्रकार चुनें"</string>
-    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"\"<xliff:g id="RULE">%1$s</xliff:g>\" नियम हटाएं?"</string>
-    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"हटाएं"</string>
+    <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"<xliff:g id="RULE">%1$s</xliff:g> नियम मिटाएं?"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"मिटाएं"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"नियम का प्रकार"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"अज्ञात"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"नियम कॉन्‍फ़िगर करें"</string>
@@ -2904,8 +2992,8 @@
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"दिन"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"कोई नहीं"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"प्रत्येक दिन"</string>
-    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"अलार्म समाप्ति समय को ओवरराइड कर सकता है"</string>
-    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"समाप्ति समय या अगला अलार्म, दोनों में से जो भी पहले आए, उस पर रुक जाएं"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"अलार्म, खत्म होने का समय को बदल सकता है"</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"खत्म होने का समय या अगला अलार्म, दोनों में से जो भी पहले आए, उस पर रुक जाएं"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> से <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -2914,22 +3002,23 @@
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"सभी संदेश"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"चयनित संदेश"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"किसी से भी"</string>
-    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"केवल संपर्कों से"</string>
-    <string name="zen_mode_from_starred" msgid="2678345811950997027">"केवल तारांकित संपर्कों से"</string>
+    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"सिर्फ़ संपर्कों से"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"सिर्फ़ तारांकित संपर्कों से"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"कोई नहीं"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
-    <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमाइंडर्स"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"अलार्म हमेशा प्राथमिकता वाले होते हैं और आवाज़ करते हैं"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमाइंडर"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इवेंट"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"सभी कॉल करने वाले (कॉलर)"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"चुनिंदा कॉल करने वाले (कॉलर)"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"बार-बार कॉल करने वाले (कॉलर)"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"यदि वही व्‍यक्‍ति <xliff:g id="MINUTES">%d</xliff:g> मिनट की अवधि के भीतर दूसरी बार कॉल करता है, तो उसे अनुमति दें"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"अगर वही व्‍यक्‍ति <xliff:g id="MINUTES">%d</xliff:g> मिनट के अंदर दूसरी बार कॉल करता है, तो उसे अनुमति दें"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वचालित रूप से चालू"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कभी नहीं"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"हर रात"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"प्रति सोम-शुक्र रात"</string>
-    <string name="zen_mode_start_time" msgid="8102602297273744441">"प्रारंभ समय"</string>
-    <string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ति समय"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"शुरू करने का समय"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"खत्म होने का समय"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अगले दिन"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"अनिश्‍चित काल के लिए केवल अलार्म को बदलें"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
@@ -2943,21 +3032,21 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"केवल <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> तक के लिए अलार्म को बदलें"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"हमेशा बाधित करें में बदलें"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"स्क्रीन चालू होने पर रोकें"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"परेशान न करें द्वारा मौन किए गए नोटिफ़िकेशन को स्क्रीन पर तांक-झांक करने या पॉप अप होने से रोकें"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"परेशान न करें की वजह से म्यूट हुई सूचनाओं को स्क्रीन पर तांक-झांक करने या अलग विंडो में खुलने से रोकें"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"स्क्रीन बंद होने पर रोकें"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"परेशान न करें द्वारा मौन किए गए नोटिफ़िकेशन को स्क्रीन को चालू करने से या नोटिफ़िकेशन की रोशनी को पल्स करने से रोकें"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"परेशान न करें द्वारा मौन किए गए नोटिफ़िकेशन को स्क्रीन चालू करने से रोकें"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"परेशान न करें की वजह से म्यूट हुई सूचनाओं को स्क्रीन को चालू करने या सूचना की रोशनी को पल्स करने से रोकें"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"परेशान न करें के ज़रिये म्यूट हुई सूचनाओं को स्क्रीन चालू करने से रोकें"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"बंद"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"स्क्रीन के चालू होने पर"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रीन के बंद होने पर"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रीन के चालू या बंद होने पर"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"नोटिफ़िकेशन सेटिंग"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग"</string>
     <string name="device_feedback" msgid="3238056036766293294">"इस डिवाइस के बारे में फ़ीडबैक भेजें"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"व्यवस्थापक पिन डालें"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"बंद"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"स्क्रीन पिन करना"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"इस सेटिंग के चालू होने पर, आप अनपिन करने तक, मौजूदा स्क्रीन को पिन करके दिखा सकते हैं.\n\nस्क्रीन को पिन करने के लिए :\n\n1. ध्यान रखें कि, स्क्रीन पिन करें, चालू है.\n\n2. उस स्क्रीन को खोलें जिसे आप पिन करना चाहते हैं.\n\n3. खास जानकारी टैप करें.\n\n4. ऊपर की ओर स्वाइप करें और फिर पिन आइकन टैप करें."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"इस सेटिंग के चालू होने पर, आप अनपिन करने तक, मौजूदा स्क्रीन को पिन करके दिखा सकते हैं.\n\nस्क्रीन को पिन करने के लिए :\n\n1. ध्यान रखें कि, स्क्रीन पिन करें, चालू है.\n\n2. उस स्क्रीन को खोलें जिसे आप पिन करना चाहते हैं.\n\n3. खास जानकारी छूएं.\n\n4. ऊपर की ओर स्वाइप करें और फिर पिन आइकॉन छूएं."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"अनपिन करने से पहले लॉक खोलने के पैटर्न के लिए पूछें"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करने से पहले पिन के लिए पूछें"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करने से पहले पासवर्ड के लिए पूछें"</string>
@@ -2965,19 +3054,14 @@
     <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>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"आप इसके चालू होने से पहले अपना पैटर्न डालना ज़रूरी बनाकर इसे और सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं. \n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
-    <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_pin" msgid="2317181134653424679">"आप इसके चालू होने से पहले अपना पिन डालना ज़रूरी बनाकर इसे और सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, मैसेज या सूचनाएं नहीं मिल सकती हैं. \n\nइससे खोए या चोरी हो गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में मदद मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"आप इसके चालू होने से पहले अपना पैटर्न डालना ज़रूरी बनाकर इसे और सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, मैसेज या सूचनाएं नहीं मिल सकती हैं. \n\n इससे खोए या चोरी हो गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में मदद मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <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="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>
@@ -2987,8 +3071,8 @@
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पैटर्न डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पासवर्ड डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"नोट: पुनः बूट करने के बाद, यह ऐप्लिकेशन तब तक शुरू नहीं हो सकता है जब तक कि आप अपना फ़ोन अनलॉक ना कर लें"</string>
-    <string name="imei_information_title" msgid="8499085421609752290">"IMEI जानकारी"</string>
-    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI संबंधी जानकारी"</string>
+    <string name="imei_information_title" msgid="8499085421609752290">"IMEI की जानकारी"</string>
+    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI से जुड़ी जानकारी"</string>
     <string name="slot_number" msgid="3762676044904653577">"(स्लॉट<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"डिफ़ॉल्ट रूप से खोलें"</string>
     <string name="app_launch_domain_links_title" msgid="1160925981363706090">"खुलने वाले लिंक"</string>
@@ -3004,14 +3088,14 @@
     <string name="storage_used" msgid="7128074132917008743">"उपयोग की गई मेमोरी"</string>
     <string name="change" msgid="6657848623929839991">"बदलें"</string>
     <string name="change_storage" msgid="600475265207060436">"मेमोरी बदलें"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"ऐप्लिकेशन नोटिफ़िकेशन"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"ऐप सूचनाएं"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"चालू"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"सब कुछ बंद कर दिया गया है"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> श्रेणियां बंद हैं"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"मौन किया गया"</string>
     <string name="notifications_redacted" msgid="4493588975742803160">"संवेदनशील जानकारी लॉक स्क्रीन पर नहीं है"</string>
     <string name="notifications_hidden" msgid="3619610536038757468">"लॉक स्क्रीन पर नहीं है"</string>
-    <string name="notifications_priority" msgid="1066342037602085552">"परेशान न करें को ओवरराइड किया गया"</string>
+    <string name="notifications_priority" msgid="1066342037602085552">"परेशान न करें को बदला गया"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
     <string name="notification_summary_level" msgid="2726571692704140826">"लेवल %d"</string>
     <string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
@@ -3029,28 +3113,28 @@
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"कोई अनुमति नहीं दी गई"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"किसी अनुमति का अनुरोध नहीं किया गया"</string>
-    <string name="filter_all_apps" msgid="1988403195820688644">"सभी ऐप्स"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"सभी ऐप"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"इंस्‍टॉल किए गए ऐप"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"झटपट ऐप"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"कार्यस्‍थल"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"ऐप्लिकेशन: सभी"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ऐप्लिकेशन: बंद हैं"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ऐप: बंद हैं"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"श्रेणियां: अत्यंत महत्वपूर्ण"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"श्रेणियां: कम महत्व के"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"श्रेणियां: बंद हैं"</string>
-    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"श्रेणियां: परेशान न करें ओवरराइड करती हैं"</string>
+    <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"श्रेणियां: परेशान न करें को बदलती हैं"</string>
     <string name="advanced_apps" msgid="4812975097124803873">"बेहतर सेटिंग"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ऐप्स कॉन्‍फ़िगर करें"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात ऐप"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ऐप अनुमतियां"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> का उपयोग करने वाले ऐप्लिकेशन"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"वेक करने के लिए टैप करें"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"डिवाइस को वेक करने के लिए स्क्रीन पर कहीं भी डबल-टैप करें"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"डिवाइस की स्क्रीन को चालू करने के लिए, स्क्रीन पर कहीं भी दो बार छूएं"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"खुलने वाले लिंक"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"समर्थित लिंक ना खोलें"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> खोलें"</string>
-    <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> और अन्य URL खोलें"</string>
+    <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> और अन्य यूआरएल खोलें"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"कोई भी ऐप्लिकेशन समर्थित लिंक नहीं खोल रहा है"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन समर्थित लिंक खोल रहे हैं</item>
@@ -3065,7 +3149,7 @@
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"सहायक और वॉइस इनपुट"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"सहायक ऐप"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> को आपका सहायक बनाएं?"</string>
-    <string name="assistant_security_warning" msgid="8498726261327239136">"सहायक, आपके सिस्‍टम पर उपयोग किए जा रहे ऐप्‍स के बारे में जानकारी पढ़ सकेगा, जिसमें आपके स्‍क्रीन पर दृश्‍यमान जानकारी या ऐप्‍स में ऐक्‍सेस करने योग्‍य जानकारी शामिल होगी."</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"Assistant , आपके सिस्‍टम पर इस्तेमाल किए जा रहे ऐप के बारे में जानकारी पढ़ सकेगा, जिसमें आपके स्‍क्रीन पर दिखाई देने वाली जानकारी या ऐप में मौजूद जानकारी शामिल है."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"सहमत"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"असहमत"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"वॉइस इनपुट चुनें"</string>
@@ -3076,10 +3160,10 @@
     <string name="system_app" msgid="9068313769550747372">"(सिस्टम)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(सिस्टम डिफ़ॉल्ट)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"ऐप मेमोरी"</string>
-    <string name="usage_access" msgid="5479504953931038165">"उपयोग एक्‍सेस"</string>
+    <string name="usage_access" msgid="5479504953931038165">"उपयोग की एक्‍सेस"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"उपयोग की ऐक्‍सेस की अनुमति दें"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"ऐप उपयोग की प्राथमिकताएं"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"उपयोग का ऐक्‍सेस, किसी ऐप को यह ट्रैक करने देता है कि आप कौन-कौन से एेप इस्तेमाल कर रहे हैं और उन्हें कितनी बार इस्तेमाल करते हैं. साथ ही आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, भाषा सेटिंग और अन्‍य जानकारी भी ट्रैक करने देती है."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"इस्तेमाल की पहुंच (यूसेज एक्सेस), किसी ऐप को यह ट्रैक करने देता है कि आप कौन-कौन से एेप इस्तेमाल कर रहे हैं और उन्हें कितनी बार इस्तेमाल करते हैं. साथ ही आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, भाषा सेटिंग और अन्‍य जानकारी भी ट्रैक करने देती है."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"मेमोरी"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"मेमोरी का विवरण"</string>
     <string name="always_running" msgid="6042448320077429656">"हमेशा चलने वाला (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3095,13 +3179,22 @@
     <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>
     <string name="high_power_system" msgid="7362862974428225301">"बैटरी ऑप्‍टिमाइज़ेशन उपलब्‍ध नहीं"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"बैटरी ऑप्‍टिमाइज़ेशन लागू ना करें. इससे आपकी बैटरी अधिक तेज़ी से खाली हो सकती है."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"ऐप्लिकेशन को बैकग्राउंड में हमेशा चलते रहने दें?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> को बैकग्राउंड में हमेशा चलने की अनुमति देने से बैटरी लाइफ़ कम हो सकती है. \n\nआप इसे बाद में सेटिंग &gt; ऐप्लिकेशन और नोटिफ़िकेशन से बदल सकते हैं."</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> को बैकग्राउंड में हमेशा चलने की अनुमति देने से बैटरी लाइफ़ कम हो सकती है. \n\nआप इसे बाद में सेटिंग &gt; ऐप और सूचना से बदल सकते हैं."</string>
     <string name="battery_summary" msgid="8044042095190688654">"पिछली बार पूरी तरह चार्ज होने के बाद से <xliff:g id="PERCENTAGE">%1$s</xliff:g> उपयोग"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"पावर मैनेजमेंट"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"पिछली बार पूर्ण चार्ज होने के बाद से बैटरी का कोई उपयोग नहीं"</string>
@@ -3109,10 +3202,10 @@
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ट्यूनर दिखाएं"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त अनुमतियां"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> और"</string>
-    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"बग रिपोर्ट साझा करें?"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपके आईटी व्यवस्थापक ने इस डिवाइस के समस्या निवारण में सहायता के लिए एक बग रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को साझा किया जा सकता है."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"आपके आईटी व्यवस्थापक ने इस डिवाइस के समस्या निवारण में सहायता के लिए एक बग रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को साझा किया जा सकता है और आपका डिवाइस अस्थायी रूप से धीमा हो सकता है."</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"यह बग रिपोर्ट आपके आईटी व्यवस्थापक से साझा की जा रही है. अधिक विवरण के लिए उनसे संपर्क करें."</string>
+    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"गड़बड़ी की रिपोर्ट शेयर करें?"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपके आईटी एडमिन ने इस डिवाइस की समस्या हल करने में मदद के लिए एक गड़बड़ी की रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को शेयर किया जा सकता है."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"आपके आईटी एडमिन ने इस डिवाइस की समस्या को हल करने में सहायता के लिए एक गड़बड़ी की रिपोर्ट का अनुरोध किया है. ऐप्लिकेशन और डेटा को शेयर किया जा सकता है और आपका डिवाइस कुछ देर के लिए धीमा हो सकता है."</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"यह गड़बड़ी की रिपोर्ट आपके आईटी एडमिन से शेयर की जा रही है. और जानकारी के लिए उनसे संपर्क करें."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"साझा करें"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"अस्वीकार करें"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"इस डिवाइस को चार्ज करें"</string>
@@ -3121,7 +3214,7 @@
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"कनेक्ट किए गए डिवाइस को चार्ज करें. यह सिर्फ़ उन डिवाइस पर काम करता है जिनमें USB चार्जिंग होती है."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"फ़ाइलें स्थानान्तरित करें"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"किसी अन्य डिवाइस पर फ़ाइलें स्थानान्तरित करें"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"फ़ोटो का स्थानांतरण (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"फ़ोटो का ट्रांसफ़र (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP समर्थित नहीं होने पर फ़ोटो या फ़ाइलें ट्रांसफर करें (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"डिवाइस का उपयोग MIDI के रूप में करें"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"इस डिवाइस का उपयोग MIDI के रूप में करें"</string>
@@ -3133,14 +3226,14 @@
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"फ़ोटो स्थानान्तरित करना (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"डिवाइस का उपयोग MIDI के रूप में करना"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"बैकग्राउंड चैक"</string>
-    <string name="background_check_title" msgid="4534254315824525593">"पूर्ण पृष्ठभूमि एक्सेस"</string>
+    <string name="background_check_title" msgid="4534254315824525593">"पूरे बैकग्राउंड की एक्सेस"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"स्क्रीन के लेख का उपयोग करना"</string>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"सहायक ऐप को स्क्रीन की सामग्रियों को लेख के रूप में ऐक्सेस करने दें"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"स्क्रीनशॉट का उपयोग करना"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"सहायक ऐप को स्क्रीन की छवि को ऐक्सेस करने दें"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"सहायक ऐप को स्क्रीन की तस्वीर तक पहुंचने दें"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"स्क्रीन फ़्लैश करें"</string>
-    <string name="assist_flash_summary" msgid="9160668468824099262">"सहायक ऐप्लिकेशन द्वारा स्क्रीन या स्क्रीनशॉट से लेख एक्सेस करने पर स्क्रीन के किनारे फ़्लैश करें"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"आप जो स्क्रीन देख रहे हैं, उसकी जानकारी के आधार पर सहायक ऐप आपकी मदद कर सकते हैं. कुछ ऐप आपकी पूरी तरह से मदद करने के लिए लॉन्चर और बोलकर फ़ोन को निर्देश, दोनों सेवाअों  का समर्थन करते हैं."</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"जब सहायक ऐप स्क्रीन पर मौजूद लेख या स्क्रीनशॉट को एक्सेस करे तो स्क्रीन के किनारों पर रोशनी चमकाएं"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"आप जो स्क्रीन देख रहे हैं, उसकी जानकारी के आधार पर सहायक ऐप आपकी मदद कर सकते हैं. कुछ ऐप पर आपकी पूरी तरह से मदद करने के लिए लॉन्चर और बोलकर फ़ोन को निर्देश देना, ये दोनों सेवाएं काम करती हैं."</string>
     <string name="average_memory_use" msgid="829566450150198512">"औसत मेमोरी उपयोग"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"अधिकतम मेमोरी उपयोग"</string>
     <string name="memory_usage" msgid="1781358557214390033">"मेमोरी का उपयोग"</string>
@@ -3148,8 +3241,8 @@
     <string name="memory_details" msgid="5943436005716991782">"विवरण"</string>
     <string name="memory_use_summary" msgid="5608257211903075754">"पिछले 3 घंटों में <xliff:g id="SIZE">%1$s</xliff:g> औसत मेमोरी का उपयोग किया गया"</string>
     <string name="no_memory_use_summary" msgid="2016900536806235588">"पिछले 3 घंटों में किसी मेमोरी का उपयोग नहीं किया गया"</string>
-    <string name="sort_avg_use" msgid="3998036180505143129">"औसत उपयोग के अनुसार क्रमबद्ध करें"</string>
-    <string name="sort_max_use" msgid="4629247978290075124">"अधिकतम उपयोग के अनुसार क्रमबद्ध करें"</string>
+    <string name="sort_avg_use" msgid="3998036180505143129">"औसत इस्तेमाल के हिसाब से क्रम से लगाएं"</string>
+    <string name="sort_max_use" msgid="4629247978290075124">"सबसे ज़्यादा इस्तेमाल के हिसाब से क्रम से लगाएं"</string>
     <string name="memory_performance" msgid="5661005192284103281">"प्रदर्शन"</string>
     <string name="total_memory" msgid="2017287600738630165">"कुल मेमोरी"</string>
     <string name="average_used" msgid="5338339266517245782">"औसत उपयोग (%)"</string>
@@ -3164,8 +3257,8 @@
     <string name="no_data_usage" msgid="9131454024293628063">"किसी डेटा का उपयोग नहीं किया गया"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की ऐक्सेस की अनुमति दें?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"यह ऐप, परेशान न करें को चालू/बंद कर सकेगा और संबंधित सेटिंग में बदलाव कर सकेगा."</string>
-    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"इसे चालू रहना चाहिए, क्योंकि नोटिफ़िकेशन एक्सेस चालू है"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की एक्‍सेस निरस्‍त करें?"</string>
+    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"इसे चालू रखें क्योंकि सूचना का एक्सेस चालू है"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> के लिए परेशान न करें की पहुंच रद्द करें?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"इस ऐप के द्वारा, परेशान न करें के लिए बनाए गए सभी नियम निकाल दिए जाएंगे."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"ऑप्‍टिमाइज़ ना करें"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"ऑप्‍टिमाइज़ करें"</string>
@@ -3175,20 +3268,20 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"कोई नहीं"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"इस ऐप के इस्तेमाल का एक्सेस बंद करने के बाद भी आपका एडमिन आपकी वर्क प्रोफ़ाइल के ऐप का डेटा खर्च ट्रैक कर सकते हैं"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g> में से <xliff:g id="COUNT_0">%1$d</xliff:g> वर्णों का उपयोग किया गया"</string>
-    <string name="draw_overlay" msgid="6564116025404257047">"दूसरे ऐप्स पर प्रदर्शित करें"</string>
-    <string name="system_alert_window_settings" msgid="8466613169103527868">"दूसरे ऐप्स पर प्रदर्शित करें"</string>
-    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"ऐप्स"</string>
-    <string name="system_alert_window_access_title" msgid="6297115362542361241">"दूसरे ऐप्स पर प्रदर्शित करें"</string>
-    <string name="permit_draw_overlay" msgid="7456536798718633432">"हमेशा दूसरे ऐप्लिकेशन के ऊपर प्रदर्शित करें"</string>
+    <string name="draw_overlay" msgid="6564116025404257047">"दूसरे ऐप के ऊपर दिखाएं"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"दूसरे ऐप के ऊपर दिखाएं"</string>
+    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"ऐप"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"दूसरे ऐप के ऊपर दिखाएं"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"हमेशा दूसरे ऐप के ऊपर दिखाएं"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"ऊपर दिखाई देने वाले ऐप्लिकेशन की अनुमति"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"इस ऐप्लिकेशन को अपने उपयोग किए जा रहे दूसरे सभी ऐप्लिकेशन के ऊपर प्रदर्शित होने दें. यह उन ऐप्लिकेशन के आपके उपयोग में दखल दे सकता है या उनके दिखाई देने या व्यवहार करने के तरीके में बदलाव कर सकता है."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr आभासी वास्तविकता श्रोता स्टीरियो सहायक सेवा"</string>
-    <string name="keywords_system_alert_window" msgid="5049498015597864850">"सिस्टम अलर्ट विंडो संवाद को दूसरे ऐप्लिकेशन के ऊपर प्रदर्शित करें"</string>
-    <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="keywords_system_alert_window" msgid="5049498015597864850">"सिस्टम अलर्ट विंडो संवाद को दूसरे ऐप के ऊपर दिखाएं"</string>
+    <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>
@@ -3207,11 +3300,11 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"अपनी कलाई को दो बार मोड़कर कैमरा ऐप खोलें"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कैमरे के लिए पावर बटन दो बार दबाएं"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"अपनी स्‍क्रीन को अनलाॅक किए बिना अपना कैमरा तुरंत खोलें"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"प्रदर्शन आकार"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"डिसप्ले का आकार"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"स्क्रीन पर स्थित आइटम बड़े या छोटे करें"</string>
-    <string name="screen_zoom_keywords" msgid="9176477565403352552">"प्रदर्शन सघनता, स्‍क्रीन ज़ूम, पैमाना, स्‍केलिंग"</string>
-    <string name="screen_zoom_summary" msgid="6445488991799015407">"अपने स्क्रीन पर स्थित आइटम बड़े या छोटे करें. आपकी स्क्रीन पर स्थित कुछ ऐप्स स्थान बदल सकते हैं."</string>
-    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"पूर्वावलोकन"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"डिस्प्ले डेंसिटी (स्क्रीन के हर इंच में पिक्सेल की संख्या), स्‍क्रीन को ज़ूम करना, स्केल, स्‍केलिंग"</string>
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"अपने स्क्रीन पर मौजूद आइटम बड़े या छोटे करें. आपकी स्क्रीन पर मौजूद कुछ ऐप जगह बदल सकते हैं."</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"झलक"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"छोटा करें"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"बड़ा करें"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
@@ -3230,7 +3323,7 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन के लिए बंद है</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन के लिए बंद है</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"सभी ऐप्लिकेशन के लिए चालू"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"सभी ऐप के लिए चालू"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> ऐप्‍स इंस्‍टॉल किए गए हैं"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 ऐप्स इंस्टॉल किए गए"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> उपयोग किया गया - <xliff:g id="FREE_SPACE">%2$s</xliff:g> खाली है"</string>
@@ -3239,7 +3332,7 @@
     <string name="display_dashboard_summary" msgid="4145888780290131488">"वॉलपेपर, सुलाएं (कम बैटरी मोड), फ़ॉन्ट आकार"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"10 मिनट तक कोई गतिविधि ना होने पर कम बैटरी मोड में जाएं"</string>
     <string name="memory_summary" msgid="8080825904671961872">"औसतन <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> में से <xliff:g id="USED_MEMORY">%1$s</xliff:g> मेमोरी उपयोग की गई"</string>
-    <string name="users_and_accounts_summary" msgid="245282689646897882">"अभी वाला उपयोगकर्ता: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="users_and_accounts_summary" msgid="245282689646897882">"मौजूदा उपयोगकर्ता: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> के रूप में प्रवेश किया हुआ है"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> डिफ़ॉल्ट है"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"चालू / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
@@ -3249,14 +3342,14 @@
     <string name="disabled_by_policy_title" msgid="627023216027648534">"कार्रवाई की अनुमति नहीं"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"वॉल्यूम बदला नहीं जा सकता"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"कॉल करने की अनुमति नहीं है"</string>
-    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS की अनुमति नहीं है"</string>
+    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"मैसेज (एसएमएस) की अनुमति नहीं है"</string>
     <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"कैमरा की अनुमति नहीं है"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"स्क्रीनशॉट की अनुमति नहीं है"</string>
-    <string name="default_admin_support_msg" msgid="2853684309779513863">"यह कार्रवाई अक्षम है. अधिक जानने के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
+    <string name="default_admin_support_msg" msgid="2853684309779513863">"यह कार्रवाई बंद है. और जानने के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
     <string name="admin_support_more_info" msgid="8901377038510512654">"अधिक विवरण"</string>
-    <string name="admin_profile_owner_message" msgid="5860816886981109626">"आपका व्यवस्थापक आपकी कार्य प्रोफ़ाइल से जुड़े ऐप्लिकेशन और डेटा की निगरानी कर सकता है और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट एक्सेस, नेटवर्क गतिविधि और डिवाइस के स्थान की जानकारी शामिल हैं."</string>
-    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"आपका व्यवस्थापक इस उपयोगकर्ता से जुड़े ऐप्लिकेशन और डेटा की निगरानी कर सकता है और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट एक्सेस, नेटवर्क गतिविधि और डिवाइस के स्थान की जानकारी शामिल है."</string>
-    <string name="admin_device_owner_message" msgid="6232893638259790789">"आपका व्यवस्थापक इस डिवाइस से जुड़े ऐप्लिकेशन और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट एक्सेस, नेटवर्क गतिविधि और डिवाइस के स्थान की जानकारी शामिल है."</string>
+    <string name="admin_profile_owner_message" msgid="5860816886981109626">"आपका एडमिन आपकी वर्क प्रोफ़ाइल से जुड़े ऐप और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट पहुंच, नेटवर्क गतिविधि और डिवाइस के जगह की जानकारी शामिल हैं."</string>
+    <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"आपका एडमिन इस उपयोगकर्ता से जुड़े ऐप्लिकेशन और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट पहुंच, नेटवर्क गतिविधि और डिवाइस के जगह की जानकारी शामिल है."</string>
+    <string name="admin_device_owner_message" msgid="6232893638259790789">"आपका एडमिन इस उपयोगकर्ता से जुड़े ऐप्लिकेशन और डेटा की निगरानी और उनका प्रबंधन कर सकता है, जिनमें सेटिंग, अनुमतियां, कॉर्पोरेट पहुंच, नेटवर्क गतिविधि और डिवाइस के जगह की जानकारी शामिल है."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"बंद करें"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"चालू करें"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"दिखाएं"</string>
@@ -3267,7 +3360,7 @@
     <string name="condition_airplane_summary" msgid="5561586417832393666">"वाई-फ़ाई, ब्लूटूथ और मोबाइल नेटवर्क बंद हैं. आप फ़ोन कॉल नहीं कर सकते या इंटरनेट से कनेक्ट नहीं कर सकते."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"परेशान न करें चालू है (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"बैटरी सेवर चालू है"</string>
-    <string name="condition_battery_summary" msgid="4418839236027977450">"प्रदर्शन कम कर दिया गया है. स्थान सेवाएं और बैकग्राउंड डेटा बंद है."</string>
+    <string name="condition_battery_summary" msgid="4418839236027977450">"प्रदर्शन कम कर दिया गया है. जगह की जानकारी और बैकग्राउंड डेटा बंद हैं."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"मोबाइल डेटा बंद है"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"इंटरनेट केवल वाई-फ़ाई के द्वारा उपलब्ध है"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"डेटा बचाने की सेटिंग चालू है"</string>
@@ -3278,9 +3371,18 @@
     <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>
+    <string name="color_temperature_desc" msgid="4793729830226404052">"डिसप्ले में हलके रंगों का इस्तेमाल करें"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदलाव लागू करने के लिए, स्‍क्रीन बंद करें"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलीफ़ोनी मॉनिटर बदलाव लागू करने के लिए, डिवाइस को रीबूट करें"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वचालित सिस्टम अपडेट"</string>
@@ -3295,9 +3397,8 @@
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ईथरनेट डेटा"</string>
     <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" msgid="5169909190811133499">"बिलिंग की अवधि"</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>
@@ -3317,26 +3418,26 @@
       <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>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"असीमित डेटा खर्च"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"डेटा बचाने की सेटिंग चालू होने पर असीमित डेटा एक्सेस"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"डेटा सेवर चालू होने पर जितना चाहें उतना डेटा इस्तेमाल करने दें"</string>
     <string name="home_app" msgid="4066188520886810030">"होम ऐप"</string>
     <string name="no_default_home" msgid="7184117487704520238">"कोई डिफ़ॉल्‍ट होम नहीं"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"सुरक्षित स्‍टार्ट-अप"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"अपना डिवाइस प्रारंभ करने के लिए पैटर्न आवश्‍यक बनाएं. बंद होने पर, यह डिवाइस कॉल, संदेश, नोटिफ़िकेशन, या अलार्म प्राप्‍त नहीं कर सकता है."</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"अपना डिवाइस प्रारंभ करने के लिए पिन आवश्‍यक बनाएं. बंद होने पर, यह डिवाइस कॉल, संदेश, नोटिफ़िकेशन, या अलार्म प्राप्‍त नहीं कर सकता है."</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"अपना डिवाइस प्रारंभ करने के लिए पासवर्ड आवश्‍यक बनाएं. बंद होने पर, यह डिवाइस कॉल, संदेश, नोटिफ़िकेशन, या अलार्म प्राप्‍त नहीं कर सकता है."</string>
-    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"अन्य फ़िंगरप्रिंट जोड़ें"</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"अपना डिवाइस चालू करने के लिए पैटर्न ज़रूरी बनाएं. बंद होने पर, यह डिवाइस कॉल, मैसेज, नोटिफिकेशन, या अलार्म नहीं पा सकता."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"अपना डिवाइस चालू करने के लिए पिन ज़रूरी बनाएं. बंद होने पर, यह डिवाइस कॉल, मैसेज, नोटिफिकेशन, या अलार्म नहीं पा सकता."</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"अपना डिवाइस चालू करने के लिए पासवर्ड ज़रूरी बनाएं. बंद होने पर, यह डिवाइस कॉल, मैसेज, नोटिफिकेशन, या अलार्म नहीं पा सकता."</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"और फ़िंगरप्रिंट जोड़ें"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"किसी दूसरी अंगुली से अनलॉक करें"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"चालू / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"कभी अपने आप चालू ना करें"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s बैटरी शेष रहने पर अपने आप चालू करें"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"बैटरी ऑप्टिमाइज़ेशन का उपयोग नहीं कर रहा है"</string>
-    <string name="lockscreen_remote_input" msgid="969871538778211843">"यदि डिवाइस लॉक है, तो नोटिफ़िकेशन का जवाब या अन्य लेख लिखने से रोकें"</string>
+    <string name="lockscreen_remote_input" msgid="969871538778211843">"अगर डिवाइस लॉक है, तो सूचनाओं का जवाब या अन्य लेख लिखने से रोकें"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"डिफ़ॉल्ट वर्तनी-जांचकर्ता"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"वर्तनी-जांचकर्ता चुनें"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"नहीं चुना गया"</string>
@@ -3353,53 +3454,52 @@
     <string name="notification_log_details_explanation" msgid="1914295130775393551">"स्पष्टीकरण"</string>
     <string name="notification_log_details_badge" msgid="3258183328267662285">"बैज दिखा सकता है"</string>
     <string name="notification_log_details_content_intent" msgid="1113554570409128083">"इंटेंट"</string>
-    <string name="notification_log_details_delete_intent" msgid="905118520685297007">"इंटेंट हटाएं"</string>
+    <string name="notification_log_details_delete_intent" msgid="905118520685297007">"इंटेंट मिटाएं"</string>
     <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"पूर्ण स्क्रीन इंटेंट"</string>
     <string name="notification_log_details_actions" msgid="242523930165118066">"कार्रवाइयां"</string>
     <string name="notification_log_details_title" msgid="7177091647508863295">"शीर्षक"</string>
     <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"रिमोट इनपुट"</string>
-    <string name="notification_log_details_content_view" msgid="6638731378278561786">"कस्टम दृश्य"</string>
+    <string name="notification_log_details_content_view" msgid="6638731378278561786">"आपके मुताबिक दिखाई दे"</string>
     <string name="notification_log_details_extras" msgid="4188418723779942047">"कुछ और"</string>
-    <string name="notification_log_details_icon" msgid="8939114059726188218">"आइकन"</string>
+    <string name="notification_log_details_icon" msgid="8939114059726188218">"आइकॉन"</string>
     <string name="notification_log_details_parcel" msgid="243148037601903212">"पार्सल का आकार"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
-    <string name="notification_log_details_sound" msgid="5506232879598808099">"ध्वनि"</string>
-    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"कंपन"</string>
+    <string name="notification_log_details_sound" msgid="5506232879598808099">"आवाज़"</string>
+    <string name="notification_log_details_vibrate" msgid="6890065466625335940">"कंपन (वाइब्रेशन)"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"डिफ़ॉल्ट"</string>
     <string name="notification_log_details_none" msgid="184131801230614059">"कोई नहीं"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"रैंकिंग ऑब्जेक्ट अनुपलब्ध है."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"रैंकिंग ऑब्जेक्ट में यह कुंजी शामिल नहीं है."</string>
-    <string name="special_access" msgid="3458780842491881155">"विशेष ऐप्लिकेशन एक्सेस"</string>
+    <string name="special_access" msgid="3458780842491881155">"ख़ास ऐप की एक्सेस"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन अप्रतिबंधित डेटा का उपयोग कर सकते हैं</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन अप्रतिबंधित डेटा का उपयोग कर सकते हैं</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप अप्रतिबंधित डेटा का उपयोग कर सकते हैं</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ऐप अप्रतिबंधित डेटा का उपयोग कर सकते हैं</item>
     </plurals>
-    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"वाकई उपयोगकर्ता डेटा को वाइप करें और उसे फ़ाइल एन्क्रिप्शन में रूपांतरित करें?"</string>
+    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"उपयोगकर्ता डेटा को मिटाना और फ़ाइल सुरक्षित करने के तरीके में बदलना चाहते हैं?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"वाइप करें और रूपांतरित करें"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager दर सीमित करना रीसेट करें"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager दर सीमित करना रीसेट कर दिया गया है"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"लॉक स्क्रीन नोटिफ़िकेशन नियंत्रित करें"</string>
-    <string name="notification_suggestion_summary" msgid="8521159741445416875">"नोटिफ़िकेशन की सामग्री दिखाएं या छिपाएं"</string>
+    <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>
-    <string name="premium_sms_access" msgid="4660047004791638305">"प्रीमियम SMS एक्सेस"</string>
+    <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल किए गए किसी भी ऐप ने प्रीमियम मैसेज (एसएमएस) की पहुंच का अनुरोध नहीं किया है"</string>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम मैसेज (एसएमएस) के लिए आपको पैसे देने पड़ सकते हैं और इससे आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी का बिल बढ़ जाएगा. अगर आप किसी ऐप के लिए अनुमति देते हैं, तो आप उस ऐप का इस्तेमाल करके प्रीमियम मैसेज (एसएमएस) भेज सकते हैं."</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"प्रीमियम मैसेज (एसएमएस) की पहुंच"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"दूसरे डिवाइसों को दिखाई नहीं देता"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> से कनेक्‍ट है"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"कई डिवाइस से कनेक्ट है"</string>
-    <string name="demo_mode" msgid="2798762752209330277">"सिस्टम UI डेमो मोड"</string>
+    <string name="demo_mode" msgid="2798762752209330277">"सिस्टम यूज़र इंटरफ़ेस (यूआई) डेमो मोड"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"त्वरित सेटिंग डेवलपर टाइल"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"सहायता के लिए हम यहां हैं"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"हम आपके लिए पूरे सप्ताह, हर समय यहां उपलब्ध हैं"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"हम आपके लिए पूरे सप्ताह, हर समय यहां उपलब्ध हैं"</string>
     <string name="support_escalation_summary" msgid="8473084168776014405">"हमारी सहायता टीम किसी भी समस्या को हल करने के लिए यहां उपलब्ध है"</string>
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"हमारी सहायता टीम हर दिन, हर समय उपलब्ध रहती है"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"सहायता खोजें या सहायता अवधि (स्थानीय समय) के दौरान वापस आएं:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदद ढूंढें या सहायता की अवधि (स्थानीय समय) के दौरान वापस आएं:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फ़ोन सहायता अवधि का समय (स्थानीय समय)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
-    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"सहायता खोजें या टिप्स और सुझाव एक्सप्लोर करें"</string>
+    <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मदद ढूंढें या सलाह और सुझाव तलाशें"</string>
     <string name="support_country_list_title" msgid="823853371280534111">"इसके लिए समर्थन:"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
@@ -3407,19 +3507,19 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"अंतर्राष्‍ट्रीय शुल्क लागू हो सकते हैं"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"फ़ोन"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"चैट करें"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"टिप्स और सुझाव एक्सप्लोर करें"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"सहायता खोजें और फ़ीडबैक भेजें"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"सलाह और सुझाव के बारे में और जानें"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"मदद ढूंढें और सुझाव भेजें"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"सहायता से संपर्क करें"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"प्रवेश करें"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन करें"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"प्रवेश नहीं कर पा रहे हैं?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम जानकारी भेजें"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम की जानकारी भेजें"</string>
     <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"दोबारा ना दिखाएं"</string>
-    <string name="support_account_request_prefix" msgid="6387847874661861650">"इस रूप में अनुरोध किया जा रहा है"</string>
+    <string name="support_account_request_prefix" msgid="6387847874661861650">"के तौर पर अनुरोध किया जा रहा है"</string>
     <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाता जोड़ें"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम जानकारी"</string>
+    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम की जानकारी"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफ़ाइल सेटिंग"</string>
-    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क खोज"</string>
-    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉल करने वालों (कॉलर) और संपर्कों की पहचान करने के लिए अपने संगठन को संपर्क खोज करने दें"</string>
+    <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क सर्च"</string>
+    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉल करने वालों (कॉलर) और संपर्कों की पहचान करने के लिए अपने संगठन को संपर्क खोजने दें"</string>
     <plurals name="hours" formatted="false" msgid="7020844602875333472">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> घंटे</item>
@@ -3441,37 +3541,44 @@
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"इनपुट पेरिफ़ेरल"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ब्लूटूथ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"जगह प्रबंधित करें"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"मेमोरी स्थान खाली करने में सहायता के लिए, मेमोरी प्रबंधक आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"मेमोरी में जगह खाली करने में मदद करने के लिए, मेमोरी प्रबंधक आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"फ़ोटो और वीडियो निकालें"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"मेमोरी प्रबंधक"</string>
     <string name="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="5280023307132819052">"हाथ के जेस्चर (स्पर्श)"</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="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="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="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="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="assist_gesture_title" msgid="7746563137898655539">"सहायक जेस्चर"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"संवेदनशीलता"</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="gesture_setting_on" msgid="3455094265233870280">"चालू"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"बंद"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"बूटलोडर पहले से ही अनलाॅक किया हुआ है"</string>
@@ -3490,20 +3597,23 @@
     <string name="auto_sync_account_title" msgid="898796354710116383">"डेटा को अपने आप सिंक करें"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"व्यक्तिगत डेटा अपने आप सिंक करें"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"कार्यस्थल डेटा अपने आप सिंक करें"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"ऐप्लिकेशन को डेटा अपने आप रीफ्रेश करने दें"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"ऐप को डेटा अपने आप रीफ्रे़श करने दें"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"खाता सिंक"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> में से <xliff:g id="ID_1">%1$d</xliff:g> आइटम के लिए सिंक करना चालू है"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"सभी आइटम के लिए सिंक करना चालू है"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"सभी आइटम के लिए सिंक करना बंद है"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"प्रबंधित डिवाइस की जानकारी"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"आपके संगठन की ओर से प्रबंधित किए जाने वाले बदलाव और सेटिंग"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> की ओर से प्रबंधित किए जाने वाले बदलाव और सेटिंग"</string>
-    <string name="enterprise_privacy_header" msgid="7402406406883832509">"आपके कार्य डेटा का एक्सेस देने के लिए, आपका संगठन सेटिंग में बदलाव कर सकता है और आपके डिवाइस पर सॉफ़्टवेयर इंस्टॉल कर सकता है.\n\nअधिक जानकारी के लिए, अपने संगठन के व्यवस्थापक से संपर्क करें."</string>
-    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"जानकारी के वे प्रकार जिन्हें आपका संगठन देख सकता है"</string>
+    <string name="enterprise_privacy_header" msgid="7402406406883832509">"आपके वर्क डेटा तक पहुंच देने के लिए, आपका संगठन सेटिंग में बदलाव कर सकता है और आपके डिवाइस पर सॉफ़्टवेयर इंस्टॉल कर सकता है.\n\nऔर जानकारी के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
+    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"वह जानकारियां जिन्हें आपका संगठन देख सकता है"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"वे बदलाव जो आपके संगठन के व्यवस्थापक ने किए हैं"</string>
-    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"इस डिवाइस पर आपका एक्सेस"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"इस डिवाइस पर आपकी पहुंच"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"आपके कार्य खाते से संबद्ध डेटा, जैसे कि ईमेल और कैलेंडर"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"आपके डिवाइस पर मौजूद ऐप्लिकेशन की सूची"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"हर एक ऐप्लिकेशन में खर्च होने वाले समय और डेटा की मात्रा"</string>
     <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"हाल ही का नेटवर्क ट्रैफ़िक लॉग"</string>
-    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सबसे हाल ही की बग रिपोर्ट"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सबसे हाल ही की गड़बड़ी की रिपोर्ट"</string>
     <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"हाल ही का सुरक्षा लॉग"</string>
     <string name="enterprise_privacy_none" msgid="7706621148858381189">"कोई नहीं"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"इंस्टॉल किए गए ऐप्लिकेशन"</string>
@@ -3512,10 +3622,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>
-    <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"स्थान अनुमतियां"</string>
+    <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"जगह की अनुमतियां"</string>
     <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"माइक्रोफ़ोन अनुमतियां"</string>
     <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"कैमरा अनुमतियां"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"डिफ़ॉल्‍ट ऐप्लिकेशन"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"डिफ़ॉल्‍ट ऐप"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ऐप्लिकेशन</item>
@@ -3526,12 +3636,12 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"आपकी व्यक्तिगत प्रोफ़ाइल में हमेशा-चालू VPN चालू है"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"आपकी कार्य प्रोफ़ाइल में हमेशा-चालू VPN चालू है"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"वैश्विक HTTP प्रॉक्सी सेट है"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"विश्वसनीय क्रेडेंशियल"</string>
+    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"भरोसेमंद क्रेडेंशियल"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">कम से कम <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्र</item>
       <item quantity="other">कम से कम <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्र</item>
     </plurals>
-    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"व्यवस्थापक डिवाइस को लॉक कर सकता है और पासवर्ड रीसेट कर सकता है"</string>
+    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"एडमिन डिवाइस को लॉक कर सकते हैं और पासवर्ड फिर से कर सकते हैं"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"व्यवस्थापक डिवाइस का सभी डेटा हटा सकता है"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"डिवाइस का सभी डेटा हटाने से पहले विफल रही पासवर्ड की कोशिशें"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"कार्य प्रोफ़ाइल डेटा हटाने से पहले विफल रही पासवर्ड की कोशिशें"</string>
@@ -3542,7 +3652,7 @@
     <string name="do_disclosure_generic" msgid="8653670456990823307">"इस डिवाइस का प्रबंधन आपका संगठन करता है."</string>
     <string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> इस डिवाइस को प्रबंधित करता है."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
-    <string name="do_disclosure_learn_more" msgid="2416766240581561009">"अधिक जानें"</string>
+    <string name="do_disclosure_learn_more" msgid="2416766240581561009">"ज़्यादा जानें"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
       <item quantity="one">कैमरा ऐप्लिकेशन</item>
       <item quantity="other">कैमरा ऐप्लिकेशन</item>
@@ -3563,7 +3673,7 @@
     <string name="storage_photos_videos" msgid="319854636702241898">"फ़ोटो और वीडियो"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"संगीत और ऑडियो"</string>
     <string name="storage_games" msgid="7703159201697117621">"गेम"</string>
-    <string name="storage_other_apps" msgid="5524321740031718083">"अन्य ऐप्लिकेशन"</string>
+    <string name="storage_other_apps" msgid="5524321740031718083">"और ऐप"</string>
     <string name="storage_files" msgid="8581083146777364063">"फ़ाइलें"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> में से उपयोग किया गया"</string>
@@ -3572,8 +3682,9 @@
     <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="webview_disabled_for_user" msgid="1216426047631256825">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए बंद है)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ऑटोमैटिक भरने की सेवा"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ऑटो, भरना, ऑटोमैटिक भरना"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;सुनिश्चित करें कि आप इस ऐप्लिकेशन पर भरोसा करते हैं&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ऑटोमैटिक भरना&gt;%1$s&lt;/xliff:g&gt; ऑटोमैटिक भरी जा सकने वाली चीज़ें निर्धारित करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का उपयोग करता है."</string>
@@ -3584,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"चालू"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"झटपट ऐप"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"जगह प्रबंधक को बंद करना चाहते हैं?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"फ़िल्में और टीवी ऐप्लिकेशन"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"उपयोग की गई जगह"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"फ़िल्में और टीवी ऐप"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की नेटवर्क से जुड़ी जानकारी"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क ट्रिगर करें"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"नया और रोमांचक क्या है?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"प्रमुख 5 सुविधाएं देखें"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS रजिस्ट्रेशन की स्थिति"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"रजिस्टर है"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"रजिस्टर नहीं है"</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index bf780f189e095b920e35f00f42df9e52ea297c19..bcb125d32b8e5ec4452e299e5b66195d7e091bb1 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 e1b18d6f0e242267425fe6cc5d8e8a8640933743..7ff503f61fe10cd4c0af8f30d21c7c0117386335 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) -->
@@ -283,11 +295,11 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"Dopusti prijenos pod. putem mobilne mreže"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Podatkovni promet u roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming podataka"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Poveži se s podatkovnim uslugama u roamingu"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Poveži se s podatkovnim uslugama u roamingu"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Povezivanje s podatkovnim uslugama u roamingu"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Povezivanje s podatkovnim uslugama u roamingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Izgubili ste podatkovnu vezu jer ste isključili mrežni roaming podataka."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Uključi"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"To se može skupo naplaćivati."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"To može biti dosta skupo."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Kada dopustite podatkovni roaming, mogu nastati značajni troškovi roaminga!\n\nOva postavka utječe na sve korisnike na ovom tabletu."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Kada dopustite podatkovni roaming, mogu nastati značajni troškovi roaminga!\n\nOva postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Dopusti roaming podataka?"</string>
@@ -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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Učinit ću to kasnije"</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 +463,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 +535,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +658,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>
@@ -684,7 +713,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Isključeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nije dostupno jer je NFC isključen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Kada je ta značajka uključena, možete prenijeti sadržaj aplikacije na drugi uređaj na kojem je omogućen NFC tako da uređaje postavite jedan uz drugi. Na primjer, možete prenositi web-stranice, videozapise s YouTubea, kontakte i još mnogo toga.\n\nJednostavno uređaje postavite jedan uz drugi (prislonite im poleđine), pa dodirnite zaslon. Aplikacija određuje što će se prenijeti."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Kada je ta značajka uključena, sadržaj aplikacije možete prenijeti na drugi uređaj na kojem je omogućen NFC tako da uređaje postavite jedan uz drugi. Na primjer, možete prenositi web-stranice, videozapise s YouTubea, kontakte i još mnogo toga.\n\nUređaje samo postavite jedan uz drugi (prislonite im poleđine), pa dodirnite zaslon. Aplikacija određuje što će se prenijeti."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Uključite Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -702,11 +731,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Automatski uključi Wi-Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi će se automatski ponovo uključiti u blizini spremljenih mreža visoke kvalitete, poput vaše kućne mreže"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nije dostupno jer je pretraživanje Wi-Fi signala isključeno"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Za upotrebu odaberite ocjenjivača mreže"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbjegavati slabe veze"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne upotrebljavaj Wi-Fi mrežu ako internetska veza nije zadovoljavajuća"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Koristi samo mreže s dobrom internetskom vezom"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Poveži se s otvorenim mrežama"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatski se poveži s javnim mrežama visoke kvalitete"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Za upotrebu odaberite ocjenjivača mreže"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Za upotrebu odaberite kompatibilnog ocjenjivača mreže"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliranje certifikata"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Radi poboljšanja preciznosti lokacije aplikacije i usluge sustava i dalje mogu tražiti Wi‑Fi mreže. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Radi poboljšanja preciznosti lokacije uključite traženje Wi-Fi-ja 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>
@@ -790,6 +822,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>
@@ -822,7 +855,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>
@@ -859,9 +891,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>
@@ -908,6 +948,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>
@@ -965,6 +1006,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>
@@ -992,23 +1034,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>
@@ -1032,8 +1073,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="7337555569694794132">"Uvijek uključen/povećana potrošnja baterije"</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="6978257596231155345">"Prikazivanje vremena, ikona obavijesti i drugih informacija. Povećana potrošnja baterije."</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>
@@ -1286,6 +1333,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>
@@ -1310,12 +1358,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Na ovom uređaju postoje i drugi korisnici.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilni operateri na eSIM-u"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Time se neće otkazati vaš plan mobilne usluge."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši USB memoriju"</string>
     <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>
@@ -1335,29 +1388,18 @@
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Žarišna točka uključena, modemsko povezivanje"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Žarišna točka uključena"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Modemsko povezivanje"</string>
-    <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="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je Štednja podatkovnog prometa 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">"Dijeljenje internetske veze 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>
@@ -1390,7 +1432,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>
@@ -1435,8 +1477,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>
@@ -1505,6 +1550,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>
@@ -1674,6 +1722,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>
@@ -1772,6 +1824,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čitači zaslona, zaslon, kontrole interakcije"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Postavke za vid"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ovaj uređaj možete prilagoditi svojim potrebama. Značajke pristupačnosti možete promijeniti kasnije u postavkama."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Povećajte veličinu fonta"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čitači zaslona"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio i tekst na zaslonu"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zaslon"</string>
@@ -1894,6 +1947,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>
@@ -1960,6 +2018,29 @@
     <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 koje 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="4006631636646776488">"Vaš telefon ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete 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="2369957934555162428">"Vaš tablet ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete 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="6195430620406365292">"Vaš uređaj ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP">%1$s</xliff:g> zadržava u aktivnom stanju.\n\nDa biste pokušali riješiti taj problem, možete 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_wakeup_alarm" product="default" msgid="1638726742782558262">"Vaš telefon ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP_0">%1$s</xliff:g> neprestano aktivira.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g>.\n\nAko se problem ponovi, možda biste trebali deinstalirati tu aplikaciju da biste smanjili potrošnju baterije."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Vaš tablet ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP_0">%1$s</xliff:g> neprestano aktivira.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g>.\n\nAko se problem ponovi, možda biste trebali deinstalirati tu aplikaciju da biste smanjili potrošnju baterije."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Vaš uređaj ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP_0">%1$s</xliff:g> neprestano aktivira.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Isključiti upotrebu u pozadini i zaustaviti aplikaciju?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Vaš telefon ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP_0">%1$s</xliff:g> neprestano aktivira.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g> i spriječiti njezino izvođenje u pozadini."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Vaš tablet ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP_0">%1$s</xliff:g> neprestano aktivira.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g> i spriječiti njezino izvođenje u pozadini."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Vaš uređaj ne može upravljati baterijom na uobičajen način jer ga aplikacija <xliff:g id="APP_0">%1$s</xliff:g> neprestano aktivira.\n\nDa biste pokušali riješiti taj problem, možete zaustaviti aplikaciju <xliff:g id="APP_1">%1$s</xliff:g> i spriječiti njezino izvođenje 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1974,7 +2055,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>
@@ -2026,12 +2107,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razrada od posljednjeg potpunog punjenja"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Posljednje potpuno punjenje"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Preostalo vrijeme trajanja baterije približno je i može se mijenjati ovisno o upotrebi"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Podaci o upotrebi približni su i mogu se promijeniti ovisno o upotrebi"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Dok je u aktivnoj upotrebi"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Dok radi u pozadini"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Potrošnja baterije"</string>
@@ -2304,7 +2386,7 @@
     <string name="data_usage_app" msgid="4970478397515423303">"Potrošnja aplikacije"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIJE O APLIKACIJAMA"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilni podaci"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"Postavljanje ograničenja podataka"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"Postavljanje ograničenja potrošnje"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciklus upotrebe podataka"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Potrošnja aplikacije"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming podataka"</string>
@@ -2361,7 +2443,7 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum poništavanja ciklusa upotrebe"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum u mjesecu:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Postavi"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavite upozorenje o upotrebi podataka"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavite upozorenje o potrošnji podataka"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavite ograničenje upotrebe podataka"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje upotrebe podataka"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablet će isključiti mobilne podatke kada dosegne ograničenje koje ste postavili.\n\nBudući da potrošnju podataka mjeri tablet i da se obračun mobilnog operatera može razlikovati, možda biste trebali postaviti strože ograničenje."</string>
@@ -2370,7 +2452,7 @@
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge funkcionirat će samo ako se povežete s Wi‑Fi mrežom."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge funkcionirat će samo ako se povežete s Wi‑Fi mrežom.\n\nTa postavka utječe na sve korisnike tableta."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge funkcionirat će samo ako se povežete s Wi‑Fi mrežom.\n\nTa postavka utječe na sve korisnike telefona."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"Upozori na <xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12"></font></string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Upozori na"</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ograničenje"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Uklonjene aplikacije"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Uklonjene aplikacije i korisnici"</string>
@@ -2589,7 +2671,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>
@@ -2680,9 +2762,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>
@@ -2732,9 +2817,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"kliziti prstom za otključavanje, zaporka, uzorak, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"radni izazov, radni, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"radni profil, upravljani profil, objediniti, objedinjavanje, radni, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"pokret"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"pokreti"</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_assist_gesture_launch" msgid="813968759791342591">"pokret"</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>
@@ -2818,7 +2904,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>
@@ -2833,6 +2920,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>
@@ -2861,8 +2952,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>
@@ -2948,6 +3037,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od kontakata sa zvjezdicom"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmi su uvijek prioritetni i emitiraju zvuk"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsjetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivatelji"</string>
@@ -2997,11 +3087,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>
@@ -3009,7 +3094,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>
@@ -3131,6 +3216,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>
@@ -3224,8 +3320,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>
@@ -3262,7 +3358,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Uto, 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Uto, 18:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"Nije povezan"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"Količina iskorištenih podataka: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Iskorišten podatkovni promet: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one">Isključene za <xliff:g id="COUNT">%d</xliff:g> aplikaciju</item>
       <item quantity="few">Isključene za <xliff:g id="COUNT">%d</xliff:g> aplikacije</item>
@@ -3308,7 +3404,7 @@
     <string name="condition_battery_summary" msgid="4418839236027977450">"Neke značajke ne funkcioniraju. Isključene su usluge lokacije i pozadinski podaci."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Mobilni su podaci isključeni"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet je dostupan samo putem Wi-Fi-ja"</string>
-    <string name="condition_bg_data_title" msgid="2483860304802846542">"Ušteda podataka je uključena"</string>
+    <string name="condition_bg_data_title" msgid="2483860304802846542">"Štednja podat. prometa uključ."</string>
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Pozadinski podaci dostupni su samo putem Wi-Fi-ja. To može utjecati na neke aplikacije ili usluge kada Wi-Fi nije dostupan."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Radni je profil isključen"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Isključene su aplikacije, sinkronizacija u pozadini i ostale značajke povezane s vašim radnim profilom."</string>
@@ -3316,6 +3412,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>
@@ -3334,8 +3441,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>
@@ -3344,25 +3450,25 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Postavi upozorenje o podacima"</string>
-    <string name="data_warning" msgid="209133958008062117">"Upozorenje o podacima"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje podataka"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Postavi upozorenje o potrošnji"</string>
+    <string name="data_warning" msgid="209133958008062117">"Upozorenje o potrošnji"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje potrošnje"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje podataka"</string>
     <string name="data_usage_template" msgid="392191945602400904">"U razdoblju <xliff:g id="ID_2">%2$s</xliff:g> potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguriraj"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostale aplikacije uključene u upotrebu"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
-      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije smiju upotrebljavati neograničene podatke kada je Ušteda podataka uključena</item>
-      <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>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije neograničeno upotrebljavati podatkovni promet kad je uključena štednja podatakovnog prometa</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije smiju neograničeno upotrebljavati podatkovni promet kad je uključena Štednja podatakovnog prometa</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija smije neograničeno upotrebljavati podatkovni promet kad je uključena Štednja podatakovnog prometa</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="data_saver_title" msgid="398458827917495765">"Štednja podatkovnog prometa"</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>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Neograničena potroš. podataka"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Dopusti neograničen pristup podacima kada je Ušteda podataka uključena"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Dopusti neograničen pristup podacima kada je Štednja podatkovnog prometa uključena"</string>
     <string name="home_app" msgid="4066188520886810030">"Početna aplikacija"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Nema zadane početne"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Sigurno pokretanje"</string>
@@ -3422,8 +3528,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>
@@ -3497,25 +3602,32 @@
     <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">"Podizanje telefona za provjeru"</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">"Otisak prsta 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Uključeno"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Isključeno"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Početni program za pokretanje već je otključan"</string>
@@ -3536,6 +3648,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatski sinkroniziraj radne podatke"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Dopusti aplikacijama da automatski osvježavaju podatke"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sinkronizacija računa"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinkronizacija uključena za <xliff:g id="ID_1">%1$d</xliff:g> od sljedećeg broja stavki: <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sinkronizacija uključena za sve stavke"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sinkronizacija isključena za sve stavke"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informacije o upravljanom uređaju"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Promjene i postavke kojima upravlja vaša organizacija"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Promjene i postavke kojima upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3623,6 +3738,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>
@@ -3636,5 +3752,11 @@
     <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="698847081680980774">"Što je novo i uzbudljivo?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Pogledajte pet najboljih značajki"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Stanje registracije IMS-a"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrirano"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nije registrirano"</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 46f923451578d71bef1f7f5dc4963577dc1dbf6a..6034bac4fa59690d9bbf1aef00d7fb9cac3d1c37 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 4bb8ba455a28d80191874cee79db99e64c814801..0771cb0edd4c37be41dc13566ee1c35bc3bc1cb9 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>
@@ -347,47 +359,46 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Ujjlenyomat hozzáadása"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"képernyőzár"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ujjlenyomat beállítása</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ujjlenyomat beállítása</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ujjlenyomat beállítva</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ujjlenyomat beállítva</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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">"Emelgesse az ujját 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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Később"</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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi automatikus bekapcsolása"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"A Wi‑Fi újra bekapcsol jó minőségű mentett hálózatok (például az otthoni hálózat) közelében"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nem használható, mert a Wi-Fi-keresés ki van kapcsolva"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Használatához válasszon hálózatértékelési szolgáltatót"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Rossz minőségű kapcsolatok kerülése"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Csak akkor használjon Wi-Fi hálózatot, ha jó internetkapcsolatot tud biztosítani."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Csak jó internetkapcsolattal rendelkező hálózatok használata"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Csatlakozás nyilvános hálózatokhoz"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatikus csatlakozás jó minőségű nyilvános hálózatokra"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Használatához válasszon hálózatértékelési szolgáltatót"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Használatához válasszon kompatibilis hálózatértékelési szolgáltatót"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Tanúsítványok telepítése"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"A pontosabb helyadatok érdekében a rendszeralkalmazások és -szolgáltatások továbbra is kereshetnek Wi-Fi-hálózatokat. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Pontosabb helyadatok érdekében kapcsolja be a Wi-Fi-alapú keresést a <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>keresési beállításokban<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Mindig be/Megnövekedett akkumulátorhasználat"</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="6978257596231155345">"Az idő, az értesítési ikonok és egyéb információk megjelenítése. Megnövekedett akkumulátorhasználat."</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>
@@ -1081,7 +1128,7 @@
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Az eszköz akkumulátorának és a hálózatnak az állapota, valamint egyéb információk"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Telefonszám, jel stb."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Tárhely"</string>
-    <string name="storage_usb_settings" msgid="7293054033137078060">"Tárolás"</string>
+    <string name="storage_usb_settings" msgid="7293054033137078060">"Tárhely"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Tárolóhely beállításai"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"USB-tár leválasztása, és az elérhető tárhely megtekintése"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"SD-kártya leválasztása, a rendelkezésre álló tárhely megtekintése"</string>
@@ -1273,6 +1320,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>
@@ -1291,17 +1339,22 @@
       <item quantity="one">1 fiók lesz visszaállítva</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"A belső tárhely és minden adat visszaállításra kerül"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ez minden adatot töröl a táblagép "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google Fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ez minden adatot töröl a telefon "<b>"belső tárolójáról"</b>", többek között: \n \n"<li>"Google-fiókját;"</li>\n<li>"a rendszer- és alkalmazásadatokat és beállításokat;"</li>" \n"<li>"a letöltött alkalmazásokat."</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ez minden adatot töröl a táblagép "<b>"belső tárhelyéről"</b>", többek között: \n \n"<li>"Google-fiókját"</li>\n<li>"A rendszer- és alkalmazásadatokat és beállításokat"</li>" \n "<li>"A letöltött alkalmazásokat"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ez minden adatot töröl a telefon "<b>"belső tárhelyéről"</b>", többek között: \n \n"<li>"Google-fiókja"</li>\n<li>"a rendszer- és alkalmazásadatok és beállítások"</li>" \n"<li>"a letöltött alkalmazások"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Más felhasználók is vannak ezen az eszközön.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Szolgáltatók az eSIM-en"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ezzel nem szünteti meg mobil-előfizetését."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-tár törlése"</string>
     <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>
@@ -1324,26 +1377,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ást használhat 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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1540,7 +1588,7 @@
     <string name="reset_app_preferences" msgid="1321050641018356925">"Alapbeállítások"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Visszaállítja a beállításokat?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ez visszaállítja a következőkre vonatkozó összes beállítást:\n\n "<li>"Letiltott alkalmazások"</li>\n" "<li>"Letiltott alkalmazásértesítések"</li>\n" "<li>"Alapértelmezett alkalmazások adott műveletekhez"</li>\n" "<li>"Alkalmazások háttéradat-korlátozása"</li>\n" "<li>"Minden engedélykorlátozás"</li>\n\n" Az alkalmazásadatok nem vesznek el."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Alapbeállítások"</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Visszaállítás"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Tárhely kezelése"</string>
     <string name="filter" msgid="2018011724373033887">"Szűrő"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Válasszon szűrési lehetőségeket"</string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Képernyőolvasók, megjelenítés, interakcióvezérlők"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Látási beállítások"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Eszközét saját igényeinek megfelelően testre szabhatja. Ezeket a kisegítő lehetőségeket később a Beállítások menüben módosíthatja."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Betűméret növelése"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Képernyőolvasók"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Hang és képernyőn megjelenő szöveg"</string>
     <string name="display_category_title" msgid="685461049938269166">"Megjelenítés"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"A telefon 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 leállíthatja az alkalmazást.\n\nHa a probléma továbbra is fennáll, akkor az akkumulátor teljesítményének javításához lehet, hogy el kell távolítania az alkalmazást."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"A táblagép 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 leállíthatja az alkalmazást.\n\nHa a probléma továbbra is fennáll, akkor az akkumulátor teljesítményének javításához lehet, hogy el kell távolítania az alkalmazást."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"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 leállíthatja az alkalmazást.\n\nHa a probléma továbbra is fennáll, akkor az akkumulátor teljesítményének javításához lehet, hogy el kell távolítania az alkalmazást."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"A telefon nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP_0">%1$s</xliff:g> alkalmazás folyton felébreszti az eszközt.\n\nA probléma megoldásához leállíthatja a(z) <xliff:g id="APP_1">%1$s</xliff:g> alkalmazást.\n\nHa a probléma továbbra is fennáll, akkor az akkumulátor teljesítményének javításához lehet, hogy el kell távolítania az alkalmazást."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"A táblagép nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP_0">%1$s</xliff:g> alkalmazás folyton felébreszti az eszközt.\n\nA probléma megoldásához leállíthatja a(z) <xliff:g id="APP_1">%1$s</xliff:g> alkalmazást.\n\nHa a probléma továbbra is fennáll, akkor az akkumulátor teljesítményének javításához lehet, hogy el kell távolítania az alkalmazást."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Eszköze nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP_0">%1$s</xliff:g> alkalmazás folyton felébreszti az eszközt.\n\nA probléma megoldásához leállíthatja a(z) <xliff:g id="APP_1">%1$s</xliff:g> alkalmazást.\n\nHa a probléma továbbra is fennáll, akkor az akkumulátor teljesítményének javításához lehet, hogy el kell távolítania az alkalmazást."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Alkalmazás leállítása"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Kikapcsolja a háttérben futást, és leállítja az alkalmazást?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"A telefon nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP_0">%1$s</xliff:g> alkalmazás folyton felébreszti az eszközt.\n\nA probléma megoldásához leállíthatja a(z) <xliff:g id="APP_1">%1$s</xliff:g> alkalmazást, és megakadályozhatja, hogy fusson a háttérben."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"A táblagép nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP_0">%1$s</xliff:g> alkalmazás folyton felébreszti az eszközt.\n\nA probléma megoldásához leállíthatja a(z) <xliff:g id="APP_1">%1$s</xliff:g> alkalmazást, és megakadályozhatja, hogy fusson a háttérben."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Az eszköz nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP_0">%1$s</xliff:g> alkalmazás folyton felébreszti.\n\nA probléma megoldása érdekében leállíthatja a(z) <xliff:g id="APP_1">%1$s</xliff:g> alkalmazást, és megakadályozhatja, hogy fusson a háttérben."</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="7774807745601479888">"A telefon 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 az Ön tartózkodási helyét, amikor nincs használatban.\n\nA probléma megoldásához kikapcsolhatja az alkalmazás hozzáférését a tartózkodási helyhez."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"A táblagép 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 az Ön tartózkodási helyét, amikor nincs használatban.\n\nA probléma megoldásához kikapcsolhatja az alkalmazás hozzáférését a tartózkodási helyhez."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Az eszköz 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 az Ön tartózkodási helyét, amikor nincs használatban.\n\nA probléma megoldásához kikapcsolhatja az alkalmazás hozzáférését a tartózkodási helyhez."</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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Statisztikák az utolsó teljes feltöltés óta"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Utolsó teljes feltöltés"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"A fennmaradó akkumulátor-üzemidő becsült érték, a használattól függően módosulhat"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Az akkumulátorhasználati adatok hozzávetőlegesek, és az eszköz használatától függően módosulhatnak"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktív használatban"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Háttérben"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Akkumulátorhasználat"</string>
@@ -2566,7 +2647,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>
@@ -2656,9 +2737,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>
@@ -2708,9 +2792,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"feloldás csúsztatással, jelszó, minta, pin-kód"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"munkahelyi kihívás, munka, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"munkaprofil, felügyelt profil, egyesít, egyesítés, munka, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"kézmozdulat"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"kézmozdulatok"</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_assist_gesture_launch" msgid="813968759791342591">"kézmozdulat"</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>
@@ -2793,7 +2878,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>
@@ -2808,6 +2894,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>
@@ -2835,8 +2925,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>
@@ -2920,6 +3008,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Csak a megcsillagozott névjegyektől"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Senkitől"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Riasztások"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Az ébresztések kiemeltek, hangjelzéssel járnak"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Emlékeztetők"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Események"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Minden hívó"</string>
@@ -2967,11 +3056,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>
@@ -2979,7 +3063,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>
@@ -3097,6 +3181,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>
@@ -3189,8 +3282,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>
@@ -3280,6 +3373,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>
@@ -3298,8 +3400,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>
@@ -3319,7 +3420,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>
@@ -3383,8 +3484,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>
@@ -3455,25 +3555,32 @@
     <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_pickup_title" product="default" msgid="818688002837687268">"Ellenőrzés a telefon felemelésével"</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 felemeléssel"</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Bekapcsolva"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Kikapcsolva"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"A rendszerbetöltő már fel van oldva"</string>
@@ -3494,6 +3601,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Munkahelyi adatok automatikus szinkronizálása"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Az adatok automatikus frissítésének engedélyezése"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Fiók szinkronizálása"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Szinkronizálás bekapcsolva <xliff:g id="ID_2">%2$d</xliff:g>/<xliff:g id="ID_1">%1$d</xliff:g> elemnél"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Szinkronizálás bekapcsolva minden elemnél"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Szinkronizálás kikapcsolva minden elemnél"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Felügyelt eszköz adatai"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"A szervezet által kezelt módosítások és beállítások"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"A(z) <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> által kezelt módosítások és beállítások"</string>
@@ -3574,6 +3684,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>
@@ -3587,5 +3698,11 @@
     <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="698847081680980774">"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>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-regisztráció állapota"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Regisztrált"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nem regisztrált"</string>
 </resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 425ce3a4c93cc19b37b0d5ff5d4af5e9cdd58819..8212eafe68e177443d6f1ccaff055330884ea99a 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>
@@ -350,7 +340,7 @@
     <item msgid="2098976479485046797">"Ձայնի հիմնական բարձրություն"</item>
     <item msgid="5660213838861789350">"Ձայնի բարձրություն"</item>
     <item msgid="7983336752371254444">"Զանգի բարձրություն"</item>
-    <item msgid="7878027809189330917">"Մեդիանյութերի ձայնի բարձրություն"</item>
+    <item msgid="7878027809189330917">"Մուլտիմեդիայի ձայնը"</item>
     <item msgid="7260546305036218513">"Զարթուցիչի ձայնի բարձրություն"</item>
     <item msgid="9103719301075748925">"Ծանուցման ձայնի բարձրություն"</item>
     <item msgid="7025966722295861512">"Bluetooth-ի ձայնի բարձրություն"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 9c5040fc82d1b6c00ddc7bad825752d1cc8cfcd8..bfe901f4bd569189dc2cdca4beb3bfbc4db6d539 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) -->
@@ -285,10 +297,10 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Դուք կորցրել եք տվյալների կապը, քանի որ անջատված եք թողել ձեր գլխավոր ցանցի տվյալների ռոումինգը:"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Միացնել"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Դրա համար ձեզանից կարող են զգալի վճարներ գանձվել:"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Դրա համար ձեզանից կարող են խոշոր վճարներ գանձվել:"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Երբ դուք թույլատրում եք տվյալների ռոումինգը, հնարավոր է` ձեզնից գանձվեն զգալի գումարային վճարներ:\n\nԱյս կարգավորումը վերաբերում է պլանշետի բոլոր օգտատերերին:"</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Երբ դուք թույլատրում եք ռոումինգային տվյալները, հնարավոր է` ձեզնից գանձվեն զգալի գումարային վճարներ:\n\nԱյս կարգավորումը վերաբերում է հեռախոսի բոլոր օգտատերերին:"</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Թույլատրե՞լ տվյալների ռոումինգը:"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Թույլատրե՞լ տվյալների ռոումինգը"</string>
     <string name="networks" msgid="6333316876545927039">"Օպերատորի ընտրություն"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Ընտրել ցանցի օպերատորին"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ամսաթիվ և ժամ"</string>
@@ -329,8 +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>
-    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Գաղտնագրում և հավատարմագրեր"</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>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Էկրանի կողպման կարգավորումներ"</string>
@@ -354,43 +366,42 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Ավելի ուշ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Բաց թողնե՞լ մատնահետքի կարգավորումը:"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Դուք ընտրել եք մատնահետքի օգտագործումը որպես հեռախոսն ապակողպելու եղանակներից մեկը: Եթե բաց թողնեք հիմա, ապա ձեզ անհրաժեշտ կլինի կատարել կարգավորումն ավելի ուշ: Կարգավորումը տևում է ընդամենը մոտ մեկ րոպե:"</string>
     <string name="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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Մատնահետքը չգրանցվեց: Փորձեք նորից կամ ուրիշ մատով:"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Նոր մատնահետք"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Հաջորդը"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Բացի հեռախոսը ապակողպելուց՝ մատնահետքը կարող եք նաև օգտագործել գնումները հաստատելու և հավելվածներից օգտվելու համար: "<annotation id="url">"Մանրամասն"</annotation></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>
@@ -481,7 +494,7 @@
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Գաղտնաբառ"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"Էկրանի կողպումը կարգավորելուց հետո կարող եք ավելացնել ձեր մատնահետքը Կարգավորումներ &gt; Անվտանգություն ընտրացանկում:"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Անջատել էկրանի կողպումը"</string>
-    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Հեռացնե՞լ սարքի պաշտպանությունը:"</string>
+    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Անջատե՞լ սարքի պաշտպանությունը"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Հեռացնե՞լ պրոֆիլի պաշտպանությունը:"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Առանց ապակողպման նախշի սարքի պաշտպանության գործառույթները չեն աշխատի։"</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց ապակողպման նախշի:<xliff:g id="EMPTY_LINE">
@@ -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="1688030823464420974">"Հաջորդ փորձի ընթացքում սխալ նախշ մուտքագրելու դեպքում սարքի տվյալները կջնջվեն"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Հաջորդ փորձի ընթացքում սխալ PIN կոդ մուտքագրելու դեպքում սարքի տվյալները կջնջվեն"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Հաջորդ փորձի ընթացքում սխալ գաղտնաբառ մուտքագրելու դեպքում սարքի տվյալները կջնջվեն"</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="5047439819181833824">"Չափից շատ սխալ փորձեր: Այս սարքի տվյալները կջնջվեն:"</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>
@@ -571,10 +592,10 @@
     <string name="manage_device_admin" msgid="537804979483211453">"Սարքի ադմինիստրատորի հավելվածներ"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Ակտիվ հավելվածներ չկան"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ակտիվ հավելված</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ակտիվ հավելված</item>
     </plurals>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"Վստահության գործակալներ"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Օգտագործելու համար նախ սահմանեք էկրանի կողպման եղանակը"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Ոչ մի"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
@@ -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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Ավտոմատ կերպով միացնել Wi‑Fi-ը"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi-ը կրկին կմիանա պահված բարձր որակի ցանցերի (օրինակ՝ ձեր տան ցանցի) մոտակայքում"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Անհասանելի է, քանի որ Wi‑Fi-ի որոնումն անջատված է"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Օգտագործելու համար ընտրեք ցանցի վարկանիշի մատակարարը"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Չօգտագործել թույլ կապ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Չօգտագործել Wi‑Fi ցանցը, մինչև այն չունենա լավ ինտերնետային կապ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Օգտագործել միայն լավ ինտերնետ կապ ունեցող ցանցերը"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Միանալ բաց ցանցերին"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Ավտոմատ կերպով միանալ բարձր որակի հանրային ցանցերին"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Օգտագործելու համար ընտրեք ցանցի վարկանիշի մատակարարը"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Օգտագործելու համար ընտրեք համատեղելի ցանցի վարկանիշի մատակարարը"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Հավաստագրերի տեղադրում"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Տեղորոշման ճշգրտությունը բարելավելու նպատակով համակարգի հավելվածներն ու ծառայությունները կարող են շարունակել 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Տեղորոշման ճշգրտությունը բարելավելու համար միացրեք Wi-Fi ցանցերի որոնումը <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>որոնման կարգավորումներում<xliff:g id="LINK_END_1">LINK_END</xliff:g>։"</string>
@@ -779,6 +811,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>
@@ -806,11 +839,10 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Չեղարկել"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Պահված ցանցեր"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
-      <item quantity="one">%d networks</item>
+      <item quantity="one">%d ցանց</item>
       <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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -932,8 +973,8 @@
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Աուդիո"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Կցված աշխատասեղանի համակցման կարգավորումներ"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Կցված մեքենայի միակցիչի կարգավորումներ"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Գրասալիկը հարակցված չէ"</string>
-    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Հեռախոսը հարակցված չէ"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Պլանշետը միացված չէ դոկ-կայանին"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Հեռախոսը միացված չէ դոկ-կայանին"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Կցված հարակցման համար կարգավորումներ"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Միակցումը չգտնվեց"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Պետք է հարակցեք պլանշետը հարակցման աուդիոն կարգավորելուց առաջ:"</string>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1007,21 +1048,27 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Անհատականացրեք էկրանը"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Պաստառների տեղադրում"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Էկրանապահ"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Լիցքավորման ընթացքում կամ dock-կայանում"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Լիցքավորման ընթացքում կամ դոկ-կայանում"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Երկու դեպքում էլ"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Լիցքավորման ընթացքում"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Dock-կայանում"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Երբեք"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Անջատված է"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Հեռախոսը dock-կայանում և քնի ռեժիմում վերահսկելու համար միացրեք էկրանապահը։"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Հեռախոսը դոկ-կայանում և քնի ռեժիմում վերահսկելու համար միացրեք էկրանապահը։"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Երբ սկսել"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Ընթացիկ էկրանապահ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Սկսել հիմա"</string>
     <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="7337555569694794132">"Մշտապես ակտիվ / Մարտկոցի ավելի երկար օգտագործում"</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="6978257596231155345">"Ցուցադրել ժամանակը, ծանուցումների պատկերակները և այլ տեղեկատվություն: Մարտկոցի ավելի երկար օգտագործում:"</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>
@@ -1073,7 +1120,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Սարքավորման ID-ն"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Baseband-ի տարբերակը"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Միջուկի տարբերակը"</string>
-    <string name="build_number" msgid="3075795840572241758">"Պատրաստման համարը"</string>
+    <string name="build_number" msgid="3075795840572241758">"Կառուցման համարը"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux կարգավիճակը"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Անհասանելի է"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Կարգավիճակ"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Հաշիվներն այս սարքում՝\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Այս սարքում այլ օգտատերերի հաշիվներ կան:\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Երաժշտություն"</li>\n<li>"Լուսանկարներ"</li>\n<li>"Օգտվողի այլ տվյալներ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-ի օպերատորներ"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Բջջային ծառայությունների ձեր փաթեթը չի չեղարկվի:"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Երաժշտությունը, նկարները և այլ տվյալները ջնջելու համար "<b>"USB կրիչը "</b>"պետք է ջնջվի:"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Երաժշտությունը, նկարները և այլ տվյալները "<b>"SD քարտից"</b>" մաքրելու համար` այն պետք է ջնջել:"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ջնջել USB կրիչը"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1454,9 +1499,9 @@
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Սեղմեք Ցանկ` օգնության համար:"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Հեռացրեք մատը ավարտելուց հետո"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Միացրեք առնվազն <xliff:g id="NUMBER">%d</xliff:g> կետ: Փորձեք կրկին:"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Կաղապարն ընդունված է"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Պատկերեք կաղապարը նորից` հաստատելու համար"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Ձեր ապակողպման նոր կաղապարը"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Նախշն ընդունված է"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Նկարեք նախշը նորից` հաստատելու համար"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Նոր նախշ"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"Հաստատել"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"Վերամուտքագրել"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"Մաքրել"</string>
@@ -1491,6 +1536,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>
@@ -1629,7 +1677,7 @@
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
-    <string name="running_process_item_user_label" msgid="3129887865552025943">"Օտատեր՝ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="running_process_item_user_label" msgid="3129887865552025943">"Օգտատեր՝ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Հեռացված օգտատեր"</string>
     <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> գործընթաց և <xliff:g id="NUMSERVICES">%2$d</xliff:g> ծառայություն"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> գործընթաց և <xliff:g id="NUMSERVICES">%2$d</xliff:g> ծառայություն"</string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Էկրանի ընթերցիչներ, էկրան, փոխազդման կառավարման տարրեր"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Տեսողության կարգավորումներ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Օգտվեք հատուկ հնարավորություններից՝ հարմար աշխատանքի համար։ Այս գործառույթները կարող եք փոփոխել սարքի կարգավորումներում։"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Մեծացրեք տառաչափը"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Էկրանի ընթերցիչներ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Աուդիո և էկրանի տեքստ"</string>
     <string name="display_category_title" msgid="685461049938269166">"Էկրան"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը սարքին թույլ չի տալիս անցնել քնի ռեժիմ:։\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել\n\nհավելվածի աշխատանքը: Եթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Ձեր պլանշետը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը պլանշետին թույլ չի տալիս անցնել քնի ռեժիմ:\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել\n\nհավելվածի աշխատանքը: Եթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Ձեր սարքը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը սարքին թույլ չի տալիս անցնել քնի ռեժիմ:\n\nԱյս խնդիրը շտկելու համար կարող եք դադրեցնել\n\nհավելվածի աշխատանքը: Եթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP_0">%1$s</xliff:g> հավելվածը շարունակաբար աշխատեցնում է ձեր հեռախոսը:\n\nԱյս խնդիրը շտկելու համար կարող եք դադրեցնել <xliff:g id="APP_1">%1$s</xliff:g>\n\nհավելվածի աշխատանքը: Եթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP_0">%1$s</xliff:g>հավելվածը շարունակաբար աշխատեցնում է ձեր հեռախոսը:Այս խնդիրը շտկելու համար կարող եք դադրեցնել\n\n հավելվածի աշխատանքը: <xliff:g id="APP_1">%1$s</xliff:g>\n\nԵթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Ձեր սարքը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP_0">%1$s</xliff:g> հավելվածը շարունակաբար աշխատեցնում է ձեր պլանշետը:\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել <xliff:g id="APP_1">%1$s</xliff:g>\n\nհավելվածի աշխատանքը: Եթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Փակել հավելվածը"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Անջատե՞լ ֆոնային օգտագործումը և դադարեցնել հավելվածը։"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP_0">%1$s</xliff:g> հավելվածը շարունակաբար աշխատեցնում է ձեր հեռախոսը։\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել <xliff:g id="APP_1">%1$s</xliff:g> հավելվածը և կանխել դրա աշխատանքը ֆոնային ռեժիմում։"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Ձեր պլանշետը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP_0">%1$s</xliff:g> հավելվածը շարունակաբար աշխատեցնում է ձեր պլանշետը։\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել <xliff:g id="APP_1">%1$s</xliff:g> հավելվածը և կանխել դրա աշխատանքը ֆոնային ռեժիմում:"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Ձեր սարքը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP_0">%1$s</xliff:g> հավելվածը շարունակաբար աշխատեցնում է ձեր սարքը։\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել <xliff:g id="APP_1">%1$s</xliff:g> հավելվածը և կանխել դրա աշխատանքը ֆոնային ռեժիմում։"</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="7774807745601479888">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը պարբերաբար պահանջում է տեղորոշան տվյալները, երբ դուք այն չեք օգտագործում:\n\nԽնդիրը շտկելու համար կարող եք անջատել այս հավելվածի տեղորոշման ընտրանքը։"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Ձեր պլաշետը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը պարբերաբար պահնջում է տեղորոշման տվյալները, երբ դուք այն չեք օգտագործում:\n\nԽնդիրը շտկելու համար կարող եք անջատել այս հավելվածի տեղորոշման ընտրանքը։"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Ձեր սարքը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Օգտագործումը վերջին լիցքավորումից հետո"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Վերջին լրիվ լիցքավորումը"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Աշխատանքի մնացած ժամանակը մոտավոր է և կարող է փոխվել՝ կախված օգտագործումից"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Մարտկոցի օգտագործման տվյալները մոտավոր են և կարող են փոխվել օգտագործումից կախված"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Ակտիվ օգտագործման ժամանակը"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Ֆոնում"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Մարտկոցի օգտագործում"</string>
@@ -2320,7 +2401,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Շարժական"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Ոչ մեկը"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Շարժական տվյալներ"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Բջջային ինտերնետ"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G տվյալներ"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G տվյալներ"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Առաջին պլանում՝"</string>
@@ -2332,9 +2413,9 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Սահմանափակե՞լ հետնաշերտի տվյալները:"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Այս հատկությունը կարող է պատճառ հանդիսանալ հետնաշերտի տվյալներից կախված ծրագրի աշխատանքի դադարեցմանը, երբ միայն շարժական ցանցեր են հասանելի:\n\nԴուք ծրագրի հասանելի կարգավորումների մեջ կարող եք գտնել ավելի համապատասխան տվյալների օգտագործման կառավարներ:"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ֆոնային տվյալների սահմանափակումը հնարավոր է միայն բջջային ինտերնետի սահմանաչափ նշելու դեպքում։"</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Միացնե՞լ տվյալների ինքնահամաժամեցումը:"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Ոստայնում ձեր հաշվի մեջ կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր պլանշետում:\n\nՈրոշ հաշիվներ կարող են պլանշետով կատարած փոփոխություններն ավտոմատ պատճենել ոստայնում: Google հաշիվն աշխատում է հենց այդպես:"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ոստայնում ձեր հաշվի մեջ կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր հեռախոսում:\n\nՈրոշ հաշիվներ կարող են հեռախոսով կատարած փոփոխություններն ավտոմատ պատճենել ոստայնում: Google հաշիվն աշխատում է հենց այդպես:"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Միացնե՞լ ինքնահամաժամեցումը"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Համացանցում կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր պլանշետում:\n\nՈրոշ հաշիվներ կարող են պլանշետով կատարած փոփոխություններն ավտոմատ պատճենել համացանցում: Google հաշիվն աշխատում է հենց այդպես:"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Համացանցում կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր պլանշետում:\n\nՈրոշ հաշիվներ կարող են պլանշետով կատարած փոփոխություններն ավտոմատ պատճենել համացանցում: Google հաշիվն աշխատում է հենց այդպես:"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Անջատե՞լ ինքնահամաժամեցումը"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Դա կկրճատի թրաֆիկն ու մարտկոցի օգտագործման չափը, սակայն նոր տվյալներ ստանալու համար անհրաժեշտ կլինի ձեռքով համաժամեցնել յուրաքանչյուր հաշիվ։ Թարմացումների մասին ծանուցումներ չեն ցուցադրվի։"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Վիճակագրության վերակայում"</string>
@@ -2430,7 +2511,7 @@
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"Չկա"</string>
     <string name="vpn_missing_cert" msgid="5357192202207234745">"Հավաստագիր չկա: Փորձեք խմբագրել պրոֆիլը:"</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Համակարգ"</string>
-    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Օտատեր"</string>
+    <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Օգտատեր"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Կասեցնել"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Միացնել"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Հեռացնել"</string>
@@ -2492,12 +2573,12 @@
     <string name="user_add_max_count" msgid="5405885348463433157">"Մինչև <xliff:g id="USER_COUNT">%1$d</xliff:g> օգտատիրոջ ավելացում"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"Օգտվողներն իրենց անձնական հավելվածներն ու բովանդակությունն ունեն"</string>
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Դուք կարող եք սահմանափակել մուտքի իրավունքը ծրագրեր և ձեր հաշվի բովանդակություն:"</string>
-    <string name="user_add_user_item_title" msgid="8212199632466198969">"Օտատեր"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Օգտատեր"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Սահմանափակված պրոֆիլ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ավելացնե՞լ նոր օգտատեր"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Ավելացնելով հավելյալ օգտատերներ՝ սարքը կարող եք համօգտագործել այլ մարդկանց հետ: Ամեն մի օգտատեր կունենա իր սեփական տարածքը, որը կարող է հարմարեցնել իր հավելվածներով, պաստառով և այլ բաներով: Օգտատերերը կարող են նաև կարգաբերել Wi‑Fi-ի և սարքի այլ կարգավորումները, որոնք առնչվում են բոլորին:\n\nԵրբ նոր օգտատեր եք ավելացնում, նա պետք է կարգավորի իր տարածքը:\n\nՑանկացած օգտատեր կարող է թարմացնել բոլոր օգտատերների հավելվածները:"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Երբ նոր օգտատեր եք ավելացնում, նա պետք է կարգավորի իր պրոֆիլը:\n\nՑանկացած օգտատեր կարող է թարմացնել հավելվածները մյուս բոլոր հաշիվների համար:"</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Ստեղծե՞լ օգտատեր հիմա:"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Կարգավորե՞լ պրոֆիլը"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Համոզվեք, որ անձը կարող է վերցնել սարքը և կարգավորել իր տարածքը"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Կարգավորե՞լ պրոֆիլը հիմա:"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Կարգավորել հիմա"</string>
@@ -2534,7 +2615,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Զանգերի պատմությունը կհամօգտագործվի այս օգտատիրոջ հետ:"</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Միացնե՞լ հեռախոսազանգերն ու SMS-ները:"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Զանգերի և SMS-ների պատմությունը հասանելի կլինի այս օգտատիրոջը:"</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Անձնական բուժտվյալներ"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Անհետաձգելի բուժօգնության տվյալներ"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> օգտատիրոջ տվյալներն ու կոնտակտները"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Թույլատրել ծրագրերը և բովանդակությունը"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Սահմանափակումներով ծրագրեր"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"սահեցնելով ապակողպում, գաղտնաբառ, նախշ, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"աշխատանքային մարտահրավեր, աշխատանք, պրոֆիլ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"աշխատանքային պրոֆիլ, կառավարվող պրոֆիլ, միավորել, միավորում, աշխատանք, պրոֆիլ"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ժեստ"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ժեստեր"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"վճարել, հպել, վճարումներ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"պահուստավորում, պահուստավորել"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ժեստ"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Միայն աստղանշված կոնտակտներից"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ոչ ոքից"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Զարթուցիչ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Զարթուցիչներն առաջնահերթ են և միշտ ձայն կարձակեն"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Հիշեցումներ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Միջոցառումներ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Բոլոր զանգողները"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3118,10 +3211,10 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Այս սարքի լիցքավորում"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Պարզապես այս սարքի լիցքավորում"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Հոսանքի մատակարարում"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Լիցքավորեք կապակցված սարքը։ Աշխատում է միայն USB-ով լիցքավորումն աջակցող սարքերի հետ։"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Միացված սարքի լիքավորում։ Աշխատում է միայն USB-ով լիցքավորումն աջակցող սարքերի հետ։"</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Ֆայլերի փոխանցում"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Փոխանցել ֆայլեր մեկ այլ սարքին"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Լուսանկարների փոխանցման (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Լուսանկարների փոխանցում (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Լուսանկարների կամ ֆայլերի փոխանցում, եթե MTP-ն չի աջակցվում (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Սարքի օգտագործում որպես MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Այս սարքի օգտագործում որպես MIDI"</string>
@@ -3179,7 +3272,7 @@
     <string name="system_alert_window_settings" msgid="8466613169103527868">"Ցույց տալ այլ հավելվածների վրայից"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Հավելվածներ"</string>
     <string name="system_alert_window_access_title" msgid="6297115362542361241">"Ցույց տալ այլ հավելվածների վրայից"</string>
-    <string name="permit_draw_overlay" msgid="7456536798718633432">"Թույլատրել այլ հավելվածների վրա ցուցադրումը"</string>
+    <string name="permit_draw_overlay" msgid="7456536798718633432">"Ցուցադրել մյուս հավելվածների վրայից"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"Հավելվածը վերևում ցուցադրելու թույլտվություն"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"Թույլ տալ այս հավելվածի ցուցադրումը ձեր օգտագործած այլ հավելվածների վերևում: Այն կարող է խանգարել այդ հավելվածների ձեր կողմից օգտագործմանը կամ փոխել դրանք ցուցադրման կամ աշխատանքի եղանակը:"</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr վիրտուալ իրականություն ունկնդրիչ ստերեո օգնության ծառայություն"</string>
@@ -3187,8 +3280,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>
@@ -3242,7 +3335,7 @@
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Ընթացիկ օգտատերը՝ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Մուտք եք գործել որպես <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ը կանխադրված հավելվածն է"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"ՄԻԱՑՐԱԾ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"ՄԻԱՑ/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"ԱՆՋԱՏԱԾ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Պահուստավորումն անջատված է"</string>
     <string name="about_summary" msgid="924181828102801010">"Տեղադրվել է Android <xliff:g id="VERSION">%1$s</xliff:g> տարբերակը"</string>
@@ -3278,6 +3371,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>
@@ -3296,11 +3398,10 @@
     <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>
+      <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="operator_warning" msgid="1862988028996859195">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի տվյալներից։"</string>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Օժանդակ ժեստ"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Զգայունություն"</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="gesture_setting_on" msgid="3455094265233870280">"Միացված է"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Անջատված է"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Համակարգի բեռնիչն արդեն ապակողպված է"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Ավտոմատ կերպով համաժամեցնել աշխատանքային տվյալները"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Թույլ տալ հավելվածներին ավտոմատ կերպով թարմացնել տվյալները"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Հաշվի համաժամացում"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Համաժամեցումը միացված է <xliff:g id="ID_2">%2$d</xliff:g> տարրերից <xliff:g id="ID_1">%1$d</xliff:g>-ի համար"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Համաժամեցումը միացված է բոլոր տարրերի համար"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Համաժամեցումն անջատված է բոլոր տարրերի համար"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Կառավարվող սարքի տվյալները"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Ձեր կազմակերպության կողմից կառավարվող փոփոխություններ և կարգավորումներ"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> կազմակերպության կողմից կառավարվող փոփոխություններ և կարգավորումներ"</string>
@@ -3571,7 +3681,8 @@
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Մաքրել հավելվածի տվյալները"</string>
     <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="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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Ի՞նչ նորույթներ կան:"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Փորձեք լավագույն 5 գործառույթները"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS ծառայության գրանցման կարգավիճակը"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Գրանցված է"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Գրանցված չէ"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 4e762ddf23ec8ba62d9149326cd9a0a3bddbec7a..b6c0aabad940e123bfde3faa19ec5afdeca7c045 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>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index fc470bb5f4ac2910163e0997da06523bef47f533..8d4733ca51233e806230ac7520c423d49502db94 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) -->
@@ -312,7 +324,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Urutkan menurut zona waktu"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tanggal"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Waktu"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"Menggembok secara otomatis"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Mengunci secara otomatis"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> setelah tidur"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Segera setelah tidur, kecuali kuncinya tetap dibuka oleh <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> setelah tidur, kecuali jika tetap dikunci oleh <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Lakukan nanti"</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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"Terlalu sering mencoba dengan salah. Data perangkat ini 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>
@@ -613,7 +634,7 @@
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Bagikan buku telepon?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin mengakses kontak dan riwayat panggilan Anda."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ingin menyandingkan dengan Bluetooth. Saat tersambung, perangkat dapat mengakses kontak &amp; riwayat panggilan Anda."</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Perangkat disandingkan"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Perangkat disambungkan"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Perangkat yang tersedia"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Perangkat tak tersedia"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Sambungkan"</string>
@@ -626,6 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktifkan Wi‑Fi secara otomatis"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi akan aktif kembali di dekat jaringan berkualitas tinggi yang tersimpan, seperti jaringan rumah Anda"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Tidak tersedia karena pemindaian Wi-Fi dinonaktifkan"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Untuk menggunakan, pilih penyedia rating jaringan"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Hindari sambungan buruk"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Jangan gunakan jaringan Wi-Fi kecuali koneksi internetnya bagus"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Hanya gunakan jaringan yang memiliki koneksi internet kuat"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Sambungkan ke jaringan terbuka"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Otomatis sambungkan ke jaringan publik berkualitas tinggi"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Untuk menggunakan, pilih penyedia rating jaringan"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Untuk menggunakan, pilih penyedia rating jaringan yang kompatibel"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instal sertifikat"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Untuk meningkatkan akurasi lokasi, aplikasi dan layanan sistem tetap dapat memindai jaringan Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Untuk meningkatkan akurasi lokasi, aktifkan pemindaian Wi-Fi di <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>setelan pemindaian<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -727,7 +759,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan jaringan"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah jaringan"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Tulis ke tag NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Lihat jaringan yang ada dengan menyalakan Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Aktifkan Wi-Fi untuk melihat jaringan yang ada."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Menelusuri jaringan Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Anda tidak memiliki izin untuk mengubah jaringan Wi‑Fi."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lainnya"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1007,21 +1048,27 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalisasi layar Anda"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih wallpaper dari"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Screen saver"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Saat mengisi daya atau dipasang ke dok"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Saat mengisi baterai atau dipasang ke dok"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Keduanya"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi daya"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Saat mengisi baterai"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Selagi di dok"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Tidak pernah"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Mati"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Untuk mengontrol yang terjadi saat ponsel dipasang ke dok dan/atau sedang tidur, aktifkan screen saver."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Ketika memulai"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Waktu mulai"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Screensaver saat ini"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulai sekarang"</string>
     <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="7337555569694794132">"Selalu aktif / Penggunaan baterai meningkat"</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">"Mengaktifkan layar saat Anda menerima notifikasi"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Selalu aktif"</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Menampilkan waktu, ikon notifikasi, dan info lainnya. Penggunaan baterai meningkat."</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>
@@ -1063,7 +1110,7 @@
     <string name="pin_failed" msgid="1848423634948587645">"Operasi PIN SIM gagal!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Status tablet"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Status ponsel"</string>
-    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Pembaruan sistem"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Update sistem"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Versi Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Tingkat patch keamanan Android"</string>
@@ -1273,6 +1320,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>
@@ -1293,15 +1341,20 @@
     <string name="master_clear_summary" msgid="6902443944660426951">"Penyimpanan internal &amp; semua data akan disetel ulang"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl download"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan apl serta setelan"</li>\n<li>"Apl download"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah masuk ke akun berikut ini:\n"</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Ada pengguna lain yang aktif di perangkat ini.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operator di eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk menghapus gambar, musik, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Hapus penyimpanan USB"</string>
     <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">"Reset tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Reset ponsel"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"Hapus semua informasi pribadi dan aplikasi yang didownload? Tindakan ini tidak dapat diurungkan!"</string>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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 untuk fitur 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>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Perlihatkan pola"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Perlihatkan pola profil"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Bergetar saat di-tap"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tombol daya langsung kunci"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Tombol power langsung kunci"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Kecuali jika tetap dikunci oleh <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Setel pola pembuka kunci"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Ubah pola pembuka kunci"</string>
@@ -1491,6 +1536,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>
@@ -1601,7 +1649,7 @@
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Tidak dapat memindahkan apl. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Lokasi pemasangan yang disukai"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Ubah lokasi pemasangan yang diinginkan untuk apl baru."</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Nonaktifkan aplikasi bawaan?"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Nonaktifkan aplikasi built-in?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"Menonaktifkan aplikasi"</string>
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"Jika Anda menonaktifkan aplikasi ini, Android dan aplikasi lain mungkin tidak berfungsi lagi sesuai harapan."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Hapus data dan nonaktifkan aplikasi?"</string>
@@ -1659,6 +1707,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>
@@ -1685,7 +1737,7 @@
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Keyboard fisik"</string>
     <string name="show_ime" msgid="2658582193437188227">"Tampilkan keyboard virtual"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Pertahankan di layar jika keyboard fisik masih aktif"</string>
-    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pembantu pintasan keyboard"</string>
+    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Bantuan pintasan keyboard"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Tampilkan pintasan yang tersedia"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Default"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kecepatan penunjuk"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Pembaca layar, tampilan, kontrol interaksi"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Setelan Pandangan"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Anda dapat menyesuaikan perangkat ini sesuai kebutuhan. Fitur aksesibilitas ini dapat diubah nanti di Setelan."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Tambahkan ukuran font"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Pembaca layar"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; teks di layar"</string>
     <string name="display_category_title" msgid="685461049938269166">"Tampilan"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat ponsel selalu aktif.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan aplikasi.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat tablet selalu aktif.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan aplikasi.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Perangkat Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> membuat perangkat selalu aktif.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan aplikasi.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP_0">%1$s</xliff:g> selalu mengaktifkan ponsel.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan <xliff:g id="APP_1">%1$s</xliff:g>.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP_0">%1$s</xliff:g> selalu mengaktifkan tablet.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan <xliff:g id="APP_1">%1$s</xliff:g>.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Perangkat Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP_0">%1$s</xliff:g> selalu mengaktifkan perangkat.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan <xliff:g id="APP_1">%1$s</xliff:g>.\n\nJika masalah tersebut terus berlanjut, aplikasi mungkin perlu di-uninstal untuk meningkatkan performa baterai."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Hentikan aplikasi"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Nonaktifkan penggunaan background &amp; hentikan aplikasi?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP_0">%1$s</xliff:g> selalu mengaktifkan ponsel.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan <xliff:g id="APP_1">%1$s</xliff:g>, lalu mencegahnya agar tidak berjalan di background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP_0">%1$s</xliff:g> selalu mengaktifkan tablet.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan <xliff:g id="APP_1">%1$s</xliff:g>, lalu mencegahnya agar tidak berjalan di background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Perangkat Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP_0">%1$s</xliff:g> selalu mengaktifkan perangkat.\n\nUntuk menyelesaikan masalah ini, Anda dapat menghentikan <xliff:g id="APP_1">%1$s</xliff:g>, lalu mencegahnya agar tidak berjalan di background."</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="7774807745601479888">"Ponsel Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> selalu meminta lokasi saat Anda tidak menggunakan aplikasi.\n\nUntuk menyelesaikan masalah ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Tablet Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> selalu meminta lokasi saat Anda tidak menggunakan aplikasi.\n\nUntuk menyelesaikan masalah ini, Anda dapat menonaktifkan lokasi untuk aplikasi ini."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Perangkat Anda tidak dapat mengelola baterai secara normal karena <xliff:g id="APP">%1$s</xliff:g> selalu meminta lokasi saat Anda tidak menggunakan aplikasi.\n\nUntuk menyelesaikan masalah 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Penggunaan sejak pengisian baterai terakhir hingga penuh"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Pengisian baterai penuh terakhir"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Sisa waktu penggunaan baterai merupakan hasil perkiraan dan dapat berubah berdasarkan penggunaan"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Data penggunaan baterai merupakan perkiraan dan dapat berubah berdasarkan penggunaan"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Saat aktif digunakan"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Saat di background"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Penggunaan baterai"</string>
@@ -2333,11 +2414,11 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Fitur ini dapat menghentikan aplikasi yang bergantung pada data latar saat hanya ada jaringan seluler.\n\nAnda dapat menemukan kontrol penggunaan data yang lebih sesuai dalam setelan yang tersedia dalam aplikasi."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Pembatasan data latar belakang hanya dimungkinkan jika Anda telah menyetel batas data seluler."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Aktifkan sinkronisasi data otomatis?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Perubahan apa pun yang dilakukan pada akun Anda di web akan disalin ke tablet secara otomatis.\n\nBeberapa akun juga dapat otomatis menyalin perubahan apa pun yang dilakukan di tablet ke web. Beginilah cara kerja Akun Google."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Perubahan apa pun yang dilakukan pada akun Anda di web akan disalin ke ponsel secara otomatis.\n\nBeberapa akun juga dapat otomatis menyalin perubahan apa pun yang dilakukan di ponsel ke web. Beginilah cara kerja Akun Google."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Perubahan apa pun yang dilakukan pada akun Anda di web akan disalin ke tablet secara otomatis.\n\nBeberapa akun juga dapat otomatis menyalin setiap perubahan yang dilakukan di tablet ke web. Akun Google mengikuti cara kerja tersebut."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Perubahan apa pun yang dilakukan pada akun Anda di web akan disalin ke ponsel secara otomatis.\n\nBeberapa akun juga dapat otomatis menyalin setiap perubahan yang dilakukan di ponsel ke web. Akun Google mengikuti cara kerja tersebut."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Nonaktifkan sinkronisasi data otomatis?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hal ini akan menghemat penggunaan baterai dan data, tapi Anda perlu menyinkronkan setiap akun secara manual untuk mengumpulkan informasi terkini. Anda juga tidak akan menerima pemberitahuan ketika ada pembaruan."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tanggal penyetelan ulang daur penggunaan"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hal ini akan menghemat penggunaan baterai dan data, tapi Anda perlu menyinkronkan setiap akun secara manual untuk mengumpulkan informasi terkini. Anda juga tidak akan menerima pemberitahuan ketika ada update."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tanggal penyetelan ulang siklus penggunaan"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Tanggal setiap bulannya:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Setel"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setel peringatan penggunaan data"</string>
@@ -2358,10 +2439,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan menurut tablet. Hitungan data operator dapat berbeda."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan menurut ponsel. Hitungan data operator dapat berbeda."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Batasan jaringan"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Jaringan terukur diperlakukan seperti jaringan seluler jika data latar belakang dibatasi. Saat hendak melakukan download file berukuran besar menggunakan jaringan ini, aplikasi mungkin memberikan peringatan."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Jaringan berbayar yang dikenakan biaya sesuai besarnya penggunaan (metered) diperlakukan seperti jaringan seluler jika data latar belakang dibatasi. Saat hendak melakukan download file berukuran besar menggunakan jaringan ini, aplikasi mungkin memberikan peringatan."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Jaringan seluler"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Jaringan Wi‑Fi terukur"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Untuk memilih jaringan terukur, aktifkan Wi‑Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Jaringan Wi‑Fi berbayar"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Untuk memilih jaringan berbayar, aktifkan Wi‑Fi."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan darurat"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
@@ -2452,7 +2533,7 @@
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ketik ulang sandi baru cadangan penuh Anda di sini"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Setel sandi cadangan"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Batal"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Pembaruan sistem tambahan"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Update sistem tambahan"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Nonaktif"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Tidak Wajib"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Wajib"</string>
@@ -2564,7 +2645,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>
@@ -2581,7 +2662,7 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"Notifikasi darurat"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operator jaringan"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"Nama titik akses"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"Nama poin akses"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Mode LTE 4G yang Ditingkatkan"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Gunakan data LTE untuk meningkatkan suara dan komunikasi (Disarankan)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"Jenis jaringan yang dipilih"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"geser untuk membuka kunci, sandi, pola, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"tantangan kerja, kerja, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil kerja, profil yang dikelola, menyatukan, penyatuan, kerja, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"isyarat"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestur"</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_assist_gesture_launch" msgid="813968759791342591">"gestur"</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>
@@ -2782,16 +2867,17 @@
     <string name="notification_pulse_title" msgid="1905382958860387030">"Cahaya kedip"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Di layar kunci"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tampilkan semua konten notifikasi"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Menyembunyikan konten notifikasi yang sensitif"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan konten notifikasi yang sensitif"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Jangan tampilkan notifikasi sama sekali"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Saat perangkat dikunci, Anda ingin notifikasi ditampilkan seperti apa?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifikasi"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Tampilkan semua konten notifikasi kerja"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Sembunyikan konten notifikasi kerja yang sensitif"</string>
-    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Jangan menampilkan notifikasi kerja sama sekali"</string>
+    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Jangan tampilkan 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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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">"Izinkan picture-in-picture"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Mengizinkan aplikasi ini membuat jendela picture-in-picture 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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Hanya dari kontak berbintang"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Tidak ada"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarm selalu prioritas dan membunyikan suara"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pengingat"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Semua penelepon"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Pemberitahuan penggunaan"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Tampilkan semua penggunaan"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Tampilkan penggunaan aplikasi"</string>
+    <string name="power_high_usage_title" msgid="6027369425057347826">"Sering 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>
@@ -3115,7 +3208,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Laporan bug ini sedang dibagikan kepada admin IT. Hubungi mereka untuk detail selengkapnya."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Bagikan"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Tolak"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"Isi daya perangkat ini"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Mengisi baterai perangkat ini"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Mengisi daya perangkat ini saja"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Suplai daya"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Isi daya baterai perangkat yang tersambung. Tindakan ini hanya berfungsi pada perangkat yang mendukung pengisian daya baterai melalui USB."</string>
@@ -3127,7 +3220,7 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Menggunakan perangkat ini sebagai MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Gunakan USB untuk"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Mengisi daya perangkat ini"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Mengisi baterai perangkat ini"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Menyuplai daya"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Mentransfer file"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Mentransfer foto (PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3447,31 +3547,38 @@
     <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="5280023307132819052">"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_twist_for_camera_mode_title" msgid="4877834147983530479">"Balikkan kamera"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Untuk membuka kamera dengan cepat, tekan tombol power 2 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">"Balik 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">"Geserkan sidik jari untuk melihat notifikasi"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk memeriksa notifikasi, geserkan jari 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, geserkan jari 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, geserkan jari ke bawah pada sensor sidik jari di bagian belakang perangkat."</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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Aktif"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Nonaktif"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader telah dibuka kuncinya"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Otomatis sinkronkan data kerja"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Izinkan aplikasi memuat ulang data secara otomatis"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sinkronisasi akun"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinkronisasi untuk <xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$d</xliff:g> item aktif"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sinkronisasi untuk semua item aktif"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sinkronisasi untuk semua item nonaktif"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Info perangkat yang dikelola"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Perubahan &amp; setelan yang dikelola oleh organisasi"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Perubahan &amp; setelan yang dikelola oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Apa yang baru dan menarik?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Lihat 5 fitur teratas"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Status pendaftaran IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Terdaftar"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Tidak terdaftar"</string>
 </resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index e42514d968c510fd242aa6b09910f815bceac158..5f692997272bc4593cd464117b326af3d4b8f0d1 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 cf4371afd072dc8294edce09112a291354625fbe..ce997c4e03a04674491f9469e890cf5293c672cd 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,7 @@
     <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>
+    <string name="security_settings_title" msgid="4918904614964215087">"Öryggi og staðsetning"</string>
     <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 +366,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Gera þetta seinna"</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="1688030823464420974">"Ef þú slærð inn rangt mynstur í næstu tilraun verður gögnum tækisins eytt"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ef þú slærð inn rangt PIN-númer í næstu tilraun verður gögnum tækisins eytt"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Ef þú slærð inn rangt aðgangsorð í næstu tilraun verður gögnum tækisins eytt"</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="5047439819181833824">"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>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Kveikja sjálfkrafa á Wi-Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi mun kveikja á sér innan sendisviðs vistaðra gæðaneta, eins og netsins þíns heima"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ekki tiltækt vegna þess að slökkt er á Wi‑Fi leit"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Til að nota þetta skaltu velja einkunnagjöf fyrir netkerfi"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Forðast lélegar tengingar"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ekki nota Wi-Fi net nema nettengingin sé góð"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Nota aðeins net með góða tengingu"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Tengja við opin net"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Tengja sjálfkrafa við opin gæðanet"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Til að nota þetta skaltu velja einkunnagjöf fyrir netkerfi"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Til að nota þetta skaltu velja samhæfa einkunnagjöf fyrir netkerfi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Setja upp vottorð"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Til þess að auka staðsetningarnákvæmni geta kerfisforrit og þjónusta áfram fundið Wi-Fi net. Hægt er að breyta þessu í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>0leitarstillingum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Til þess að auka staðsetningarnákvæmni geta kerfisforrit og þjónusta áfram fundið Wi-Fi net. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Til að auka nákvæmni staðsetninga skaltu kveikja á Wi-Fi leit í <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>leitarstillingum<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Ekki sýna þetta aftur"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hafa kveikt á Wi-Fi í biðstöðu"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Alltaf kveikt / aukin rafhlöðunotkun"</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="6978257596231155345">"Sýna tíma, tilkynningartákn og aðrar upplýsingar. Aukin rafhlöðunotkun."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Þú ert skráð(ur) inn á eftirfarandi reikninga:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Aðrir notendur eru til staðar í þessu tæki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Tónlist"</li>\n<li>"Myndir"</li>\n<li>"Önnur notandagögn"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Símafyrirtæki á eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Þetta mun ekki segja upp farsímaáskrift þinni."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"USB-geymslunni"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"SD-kortinu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Hreinsa út af USB-geymslu"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skjálesarar, skjár, gagnvirknistýringar"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Útlitsstillingar"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Þú getur sérsniðið þetta tæki eftir þínum þörfum. Þessum aðgengiseiginleikum má breyta síðar í stillingunum."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Stækka letur"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skjálesarar"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Hljóð og skjátexti"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skjár"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Síminn getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur símanum vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Spjaldtölvan getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur spjaldtölvunni vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Tækið getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur tækinu vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Síminn getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP_0">%1$s</xliff:g> vekur símann í sífellu.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað <xliff:g id="APP_1">%1$s</xliff:g>forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Spjaldtölvan getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP_0">%1$s</xliff:g> vekur spjaldtölvuna í sífellu.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað <xliff:g id="APP_1">%1$s</xliff:g>forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Tækið getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP_0">%1$s</xliff:g> vekur tækið í sífellu.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað <xliff:g id="APP_1">%1$s</xliff:g>forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stöðva forrit"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Slökkva á notkun í bakgrunni og slökkva á forritinu?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Rafhlöðunotkun símans er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP_0">%1$s</xliff:g> vekur símann í sífellu.\n\nTil að bregðast við þessu vandamáli getur þú stöðvað <xliff:g id="APP_1">%1$s</xliff:g> og komið í veg fyrir að það keyri í bakgrunni."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Rafhlöðunotkun spjaldtölvunnar er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP_0">%1$s</xliff:g> vekur tölvuna í sífellu.\n\nTil að bregðast við þessu vandamáli getur þú stöðvað <xliff:g id="APP_1">%1$s</xliff:g> og komið í veg fyrir að það keyri í bakgrunni."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Rafhlöðunotkun tækisins er ekki með eðlilegum hætti vegna þess að <xliff:g id="APP_0">%1$s</xliff:g> vekur tækið í sífellu.\n\nTil að bregðast við þessu vandamáli getur þú stöðvað <xliff:g id="APP_1">%1$s</xliff:g> og komið í veg fyrir að það 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Greining frá síðustu fullu hleðslu"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Síðasta fulla hleðsla"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Eftirstandandi rafhlöðutími er áætlaður og gæti breyst út frá notkun"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Upplýsingar um rafhlöðunotkun eru áætlaðar og geta breyst eftir notkun"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Í virkri notkun"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Í bakgrunni"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Rafhlöðunotkun"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"renna til að opna, aðgangsorð, mynstur, PIN-númer"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"verkefni í vinnu, vinna, snið"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"vinnusnið, stýrt snið, sameina, sameining, vinna, snið"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"bendingar"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"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_assist_gesture_launch" msgid="813968759791342591">"bendingar"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Aðeins frá stjörnumerktum tengiliðum"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ekkert"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Vekjarar"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Viðvaranir eru ávallt í forgangi og með hljóði"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Áminningar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Viðburðir"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Allir hringjendur"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Kveikt"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Slökkt"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Ræsiforrit er þegar opið"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Samstilla vinnugögn sjálfkrafa"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Leyfa forritum að endurnýja gögn sjálfkrafa"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Samstilling reiknings"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Kveikt á samstillingu fyrir <xliff:g id="ID_1">%1$d</xliff:g> af <xliff:g id="ID_2">%2$d</xliff:g> atriðum"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Kveikt á samstillingu fyrir öll atriði"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Slökkt á samstillingu fyrir öll atriði"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Upplýsingar um stjórnað tæki"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Breytingar og stillingar stýrðar af fyrirtækinu þínu"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Breytingar og stillingar stýrðar af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Hvað er nýtt og spennandi?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Skoðaðu fimm helstu eiginleikana"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Staða IMS-skráningar"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Skráð"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ekki skráð"</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index d766957a50d80b991b5886cf13f1e9ba743b3054..33a6e9f5967508b301becf6b686246c9532e68bf 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 ba563ef3b6a269e6bf00a3799c769b6fee715d53..4768e60e3cf01bdfa2d77da821d348a5ff212da6 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) -->
@@ -317,7 +329,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Subito dopo la sospensione, tranne quando tenuto sbloccato da <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> dopo la sospensione, tranne quando tenuto sbloccato da <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostra info proprietario su blocco schermo"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Msg schermata blocco"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Messaggio schermata blocco"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Abilita widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Disattivati dall\'amministratore"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nessuno"</string>
@@ -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>
@@ -353,44 +365,43 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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" msgid="3508870672887336095">"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 PIN complesso."</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">"Solleva ripetutamente 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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Più tardi"</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_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>
+    <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">"Registrazione non completata"</string>
+    <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Raggiunto tempo limite per la registrazione dell\'impronta digitale. Riprova."</string>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Registrazione dell\'impronta digitale non riuscita. Riprova o utilizza un dito diverso."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Aggiungine un\'altra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Avanti"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Oltre che per sbloccare il telefono, puoi utilizzare la tua impronta digitale per autorizzare acquisti e accessi alle app. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
@@ -444,11 +455,13 @@
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Proteggi il tuo tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Proteggi dispositivo"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"Proteggi il telefono"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Per maggiore sicurezza, imposta un blocco schermo di backup."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Per maggiore sicurezza, imposta un blocco schermo alternativo."</string>
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"Impedisci ad altri di utilizzare il tablet 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="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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Attiva Wi‑Fi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"La connessione Wi-Fi si riattiverà vicino a reti salvate di alta qualità, ad esempio la connessione di casa"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Non disponibile perché la ricerca di reti Wi-Fi è disattivata"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Per usare la funzione, seleziona un fornitore di servizi di valutazione rete"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evita connessioni deboli"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Non utilizzare una rete Wi‑Fi a meno che non abbia una buona connessione a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilizza solo reti con una buona connessione a Internet"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Connetti a reti aperte"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Connetti automaticamente a reti pubbliche di alta qualità"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Per usare la funzione, seleziona un fornitore di servizi di valutazione rete"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Per usare la funzione, seleziona un fornitore di servizi di valutazione rete compatibile"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installa certificati"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Per una maggiore precisione della geolocalizzazione, le app e i servizi di sistema possono ancora cercare reti Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Per una maggiore precisione della geolocalizzazione, attiva la ricerca delle reti Wi-Fi 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>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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\'hotspot"</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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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">"Pianificazione"</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>
@@ -1020,8 +1061,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="7337555569694794132">"Sempre attivo/Utilizzo elevato della batteria"</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="6978257596231155345">"Mostra ora, icone di notifica e altre informazioni. Utilizzo elevato della batteria."</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>
@@ -1201,7 +1248,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Esplora <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"In Altro sono inclusi file condivisi salvati dalle app, file scaricati da Internet o tramite Bluetooth, file Android e così via. \n\nPer vedere i contenuti visibili di <xliff:g id="NAME">^1</xliff:g>, tocca Esplora."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Il sistema include i file utilizzati per eseguire la versione di Android <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Il sistema include i file utilizzati per eseguire Android versione <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> potrebbe aver salvato foto, musica, film, app o altri dati che occupano <xliff:g id="SIZE">^2</xliff:g> di spazio di archiviazione. \n\nPer i dettagli, passa a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configura la tua <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizza come memoria portatile"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Al momento sei collegato ai seguenti account:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Sono presenti altri utenti su questo dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatori su eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Il tuo piano di servizio dati mobile non verrà annullato."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Cancella archivio USB"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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 app (<xliff:g id="COUNT">%1$d</xliff:g>)"</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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screen reader, display, controlli di interazione"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Impostazioni vista"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Puoi personalizzare questo dispositivo in base alle tue esigenze. Queste funzioni di accessibilità possono essere modificate in un secondo momento nelle Impostazioni."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumenta dimensioni carattere"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Screen reader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio e testo su schermo"</string>
     <string name="display_category_title" msgid="685461049938269166">"Visualizzazione"</string>
@@ -1819,7 +1872,7 @@
       <item quantity="one">Ritardo molto lungo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Impostazioni"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ON"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"On"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"OFF"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"Anteprima"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opzioni standard"</string>
@@ -1873,12 +1926,16 @@
       <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>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Impostazioni"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Aggiungi stampanti"</string>
-    <string name="print_feature_state_on" msgid="8098901852502441048">"ON"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"On"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"OFF"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Aggiungi servizio"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Aggiungi stampante"</string>
@@ -1939,6 +1996,29 @@
     <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">"Mantenimento del dispositivo attivo"</string>
+    <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Attivazione del dispositivo in background"</string>
+    <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Richiesta della posizione frequentemente"</string>
+    <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> app con comportamenti anomali"</string>
+    <string name="dialog_stop_title" msgid="6395127715596746479">"Arrestare l\'app?"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"Il telefono non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nProva a risolvere il problema interrompendo l\'app.\n\nSe il problema persiste, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Il tablet non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nProva a risolvere il problema interrompendo l\'app.\n\nSe il problema persiste, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Il dispositivo non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> lo mantiene attivo.\n\nProva a risolvere il problema interrompendo l\'app.\n\nSe il problema persiste, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Il telefono non può gestire normalmente la batteria perché l\'app <xliff:g id="APP_0">%1$s</xliff:g> continua a riattivarlo.\n\nProva a risolvere il problema interrompendo l\'app <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe il problema persiste, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Il tablet non può gestire normalmente la batteria perché l\'app <xliff:g id="APP_0">%1$s</xliff:g> continua a riattivarlo.\n\nProva a risolvere il problema interrompendo l\'app <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe il problema persiste, potresti dover disinstallare l\'app per migliorare le prestazioni della batteria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Il dispositivo non può gestire normalmente la batteria perché l\'app <xliff:g id="APP_0">%1$s</xliff:g> continua a riattivarlo.\n\nProva a risolvere il problema interrompendo l\'app <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe il problema persiste, 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="6936542136153283692">"Disattivare l\'utilizzo in background e interrompere l\'app?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Il telefono non può gestire normalmente la batteria perché l\'app <xliff:g id="APP_0">%1$s</xliff:g> continua a riattivarlo.\n\nProva a risolvere il problema interrompendo l\'app <xliff:g id="APP_1">%1$s</xliff:g> e impedendone l\'esecuzione in background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Il tablet non può gestire normalmente la batteria perché l\'app <xliff:g id="APP_0">%1$s</xliff:g> continua a riattivarlo.\n\nProva a risolvere il problema interrompendo l\'app <xliff:g id="APP_1">%1$s</xliff:g> e impedendone l\'esecuzione in background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Il dispositivo non può gestire normalmente la batteria perché l\'app <xliff:g id="APP_0">%1$s</xliff:g> continua a riattivarlo.\n\nProva a risolvere il problema interrompendo l\'app <xliff:g id="APP_1">%1$s</xliff:g> e impedendone l\'esecuzione 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="7774807745601479888">"Il telefono non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> continua a chiedere la posizione quando non la utilizzi.\n\nProva a risolvere il problema disattivando la geolocalizzazione per l\'app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Il tablet non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> continua a chiedere la posizione quando non la utilizzi.\n\nProva a risolvere il problema disattivando la geolocalizzazione per l\'app."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Il dispositivo non può gestire normalmente la batteria perché l\'app <xliff:g id="APP">%1$s</xliff:g> continua a chiedere la posizione quando non la utilizzi.\n\nProva a risolvere il problema disattivando la geolocalizzazione per l\'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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analisi dettagliata dall\'ultima ricarica completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Ultima ricarica completa"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"La durata rimanente della batteria è approssimativa e può variare in base all\'utilizzo"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"I dati sull\'utilizzo della batteria sono approssimativi e possono variare in base all\'utilizzo"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Durante l\'utilizzo attivo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"In background"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Utilizzo batteria"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"scorrimento per sbloccare, password, sequenza, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"sfida lavoro, lavoro, profilo"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profilo di lavoro, profilo gestito, unificare, unificazione, lavoro, profilo"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gesti"</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_assist_gesture_launch" msgid="813968759791342591">"gesto"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Solo da contatti Speciali"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nessuno"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Sveglie"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Sveglie sempre prioritarie, con audio attivo"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Promemoria"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventi"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tutti i chiamanti"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3075,7 +3159,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Predefinita)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predefinito)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Quota di archiviaz. per app"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Spazio archiviazione per app"</string>
     <string name="usage_access" msgid="5479504953931038165">"Accesso ai dati di utilizzo"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Consenti accesso ai dati di utilizzo"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferenze di utilizzo delle app"</string>
@@ -3095,6 +3179,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>
@@ -3121,9 +3214,9 @@
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Ricarica del dispositivo collegato. Funziona soltanto con dispositivi che supportano la ricarica tramite USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Trasferire file"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Trasferisci i file su un altro dispositivo"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Trasferisci foto (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Trasferire foto (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Trasferisci foto o file se la modalità MTP non è supportata (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"Utilizzare il dispositivo per la modalità MIDI"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Usare il dispositivo come MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utilizzare questo dispositivo per la modalità MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilizza USB per"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,27 +3553,34 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"On"</string>
-    <string name="gesture_setting_off" msgid="5230169535435881894">"Disattivato"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Off"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Il bootloader è già sbloccato"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Devi prima connetterti a Internet"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Connettiti a Internet o contatta il tuo operatore"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronizza i dati di lavoro automaticamente"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Consenti aggiornamento automatico dei dati delle app"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronizzazione account"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sincronizzazione attiva per <xliff:g id="ID_1">%1$d</xliff:g> elementi su <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sincronizzazione attivata per tutti gli elementi"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sincronizzazione disattivata per tutti gli elementi"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informazioni sul dispositivo gestito"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Impostazioni e modifiche sono gestite dalla tua organizzazione"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Impostazioni e modifiche sono gestite da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,9 +3682,10 @@
     <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>
+    <string name="autofill_app" msgid="7338387238377914374">"Compilazione automatica"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatico, compilazione, compilazione automatica"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Verifica che questa app sia attendibile&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=La Compilazione Automatica di Google&gt;%1$s&lt;/xliff:g&gt; usa ciò che è presente nella schermata per stabilire quali contenuti possono essere compilati automaticamente."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Quali entusiasmanti novità ti attendono?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Scopri le 5 funzioni principali"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Stato di registrazione IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrato"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Non registrato"</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 282da43915367a38683d379dce79db33c63b9357..b80b91f0a93b9c0cb30dfc18b3174ac4816a9f27 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 61879cbe4b73d8827b485f48820c003081b1670b..eae3c7d510dcdbc1d645d3d7fc7563353858784e 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>
@@ -106,12 +108,19 @@
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"הגדרות פרופיל"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"לא הוגדר שם, משתמש בשם החשבון"</string>
     <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_rename_device" msgid="4352483834491958740">"שינוי שם המכשיר"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"שינוי שם"</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) -->
@@ -169,7 +181,7 @@
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"חשבון:"</string>
     <string name="proxy_settings_title" msgid="9049437837600320881">"‏שרת Proxy"</string>
-    <string name="proxy_clear_text" msgid="5555400754952012657">"נקה"</string>
+    <string name="proxy_clear_text" msgid="5555400754952012657">"ניקוי"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"‏יציאת שרת Proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"‏עקוף שרת Proxy עבור"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"שחזר ברירות מחדל"</string>
@@ -242,7 +254,7 @@
     <string name="language_picker_title" msgid="3596315202551687690">"שפות"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"העדפות שפה"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"הסר"</string>
-    <string name="add_a_language" msgid="2330538812283783022">"הוסף שפה"</string>
+    <string name="add_a_language" msgid="2330538812283783022">"הוספת שפה"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
       <item quantity="two">האם להסיר את השפות שנבחרו?</item>
       <item quantity="many">האם להסיר את השפות שנבחרו?</item>
@@ -269,7 +281,7 @@
     <string name="cancel" msgid="6859253417269739139">"ביטול"</string>
     <string name="okay" msgid="1997666393121016642">"אישור"</string>
     <string name="forget" msgid="1400428660472591263">"שכח"</string>
-    <string name="save" msgid="879993180139353333">"שמור"</string>
+    <string name="save" msgid="879993180139353333">"שמירה"</string>
     <string name="done" msgid="6942539184162713160">"סיום"</string>
     <string name="settings_label" msgid="1626402585530130914">"הגדרות"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"הגדרות"</string>
@@ -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>
@@ -348,60 +360,59 @@
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"טביעת אצבע"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"נהל טביעות אצבע"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"השתמש בטביעות אצבע ל-"</string>
-    <string name="fingerprint_add_title" msgid="1926752654454033904">"הוסף טביעת אצבע"</string>
+    <string name="fingerprint_add_title" msgid="1926752654454033904">"הוספת טביעת אצבע"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"נעילת מסך"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
       <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> טביעות אצבע הוגדרו</item>
       <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> טביעות אצבע הוגדרו</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> טביעות אצבע הוגדרו</item>
-      <item quantity="one">טביעת אצבע <xliff:g id="COUNT_0">%1$d</xliff:g> הוגדרה</item>
+      <item quantity="one">טביעת אצבע אחת (<xliff:g id="COUNT_0">%1$d</xliff:g>) הוגדרה</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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_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_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="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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"מאוחר יותר"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"האם לדלג על הגדרת טביעת אצבע?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"בחרת להשתמש בטביעת האצבע שלך כאחת מהדרכים שבהן תוכל לבטל את הנעילה בטלפון. אם תדלג על שלב זה עכשיו, תצטרך לבצע את ההגדרה בהמשך. ההגדרה לוקחת רק דקה או שתיים."</string>
     <string name="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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"ההרשמה באמצעות טביעת אצבע נכשלה. כדאי לנסות שוב או להשתמש באצבע אחרת."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"עוד אחד"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"הבא"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"בנוסף לביטול הנעילה של הטלפון, תוכל להשתמש בטביעת האצבע כדי לאשר רכישות וגישה לאפליקציות. "<annotation id="url">"למידע נוסף"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"בנוסף לביטול הנעילה של הטלפון, אפשר להשתמש בטביעת האצבע כדי לאשר רכישות וגישה לאפליקציות. "<annotation id="url">"למידע נוסף"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" אפשרות נעילת המסך מושבתת. למידע נוסף ניתן לפנות למנהל המכשיר בארגון. "<annotation id="admin_details">"למידע נוסף"</annotation>\n\n"עדיין ניתן להשתמש בטביעת האצבע שלך כדי לאשר רכישות ולגשת לאפליקציות. "<annotation id="url">"למידע נוסף"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"הרם את האצבע ואז גע שוב בחיישן"</string>
+    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"יש להרים את האצבע ולגעת שוב בחיישן"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"תוכל להוסיף עד <xliff:g id="COUNT">%d</xliff:g> טביעות אצבע"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"הוספת את המספר המרבי של טביעות אצבע."</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"לא ניתן להוסיף עוד טביעות אצבע"</string>
@@ -455,6 +466,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 +538,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="1688030823464420974">"אם תזין קו ביטול נעילה שגוי בניסיון הבא, הנתונים במכשיר יימחקו"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"אם תזין קוד גישה שגוי בניסיון הבא, הנתונים במכשיר יימחקו"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"אם תזין סיסמה שגויה בניסיון הבא, הנתונים במכשיר יימחקו"</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="5047439819181833824">"נעשו יותר מדי ניסיונות שגויים. הנתונים במכשיר יימחקו."</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 +669,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>
@@ -659,7 +688,7 @@
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"התחברות"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"‏התחבר למכשיר Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"השתמש עבור"</string>
-    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"שנה שם"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"שינוי שם"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"אפשר העברות קבצים נכנסות"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"מחובר למכשיר לצורך גישה לאינטרנט"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"משתף חיבור אינטרנט מקומי עם מכשיר"</string>
@@ -713,11 +742,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"‏הפעל Wi‑Fi באופן אוטומטי"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"‏Wi‑Fi יחזור לפעול בסביבת רשתות שמורות באיכות גבוהה, כמו הרשת הביתית שלך"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‏לא זמין מפני שסריקת ה-Wi-Fi כבויה"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"כדי להשתמש בתכונה, יש לבחור ספק של דירוג רשת"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"הימנע מחיבורים באיכות ירודה"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"‏אל תשתמש ברשת Wi-Fi, אלא אם יש לה חיבור אינטרנט באיכות טובה"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"השתמש רק ברשתות בעלות חיבור אינטרנט איכותי"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"התחבר לרשתות פתוחות"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"חיבור אוטומטית לרשתות ציבוריות באיכות גבוהה"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"חיבור לרשתות פתוחות"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"חיבור אוטומטי לרשתות ציבוריות באיכות גבוהה"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"כדי להשתמש בתכונה, יש לבחור ספק של דירוג רשת"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"כדי להשתמש בתכונה, יש לבחור ספק תואם של דירוג רשת"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"התקנת אישורים"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות רשתות 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"‏כדי לשפר את דיוק המיקום, הפעל את אפשרות הסריקה אחר רשתות Wi-Fi ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -801,6 +833,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>
@@ -823,7 +856,7 @@
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"שכח"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"נכשל הניסיון לשכוח את הרשת"</string>
-    <string name="wifi_save" msgid="3331121567988522826">"שמור"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"שמירה"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"נכשל הניסיון לשמור את הרשת"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ביטול"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"רשתות שנשמרו"</string>
@@ -834,7 +867,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>
@@ -843,7 +875,7 @@
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"רשתות שנשמרו"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"‏הגדרות IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"‏הגדרות Wi-Fi מתקדמות אינן זמינות למשתמש הזה"</string>
-    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"שמור"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"שמירה"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ביטול"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"‏הקלד כתובת IP חוקית."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"הקלד כתובת שער חוקית."</string>
@@ -858,7 +890,7 @@
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"זכור חיבור זה"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"חיפוש מכשירים"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"מחפש…"</string>
-    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"שנה את שם המכשיר"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"שינוי שם המכשיר"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"‏מכשירי p2p"</string>
     <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"קבוצות שמורות בזיכרון"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8491862096448192157">"לא ניתן להתחבר."</string>
@@ -871,9 +903,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>
@@ -920,6 +960,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>
@@ -977,6 +1018,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 +1046,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 +1085,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="7337555569694794132">"פועל תמיד / צריכה מוגברת של הסוללה"</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="6978257596231155345">"הצגה של השעה, סמלי ההודעות ופרטים אחרים. צריכה מוגברת של הסוללה."</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>
@@ -1176,7 +1223,7 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ביטול טעינה מתבצע"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"שטח האחסון הולך ואוזל"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"ייתכן שפונקציות מסוימות של המערכת, כמו סנכרון, לא יפעלו כראוי. נסה לפנות מקום על ידי מחיקה או ביטול הצמדה של פריטים, כגון אפליקציות או תוכן מדיה."</string>
-    <string name="storage_menu_rename" msgid="7141058657592615390">"שנה שם"</string>
+    <string name="storage_menu_rename" msgid="7141058657592615390">"שינוי שם"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"טען"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"הוצא"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"פרמט"</string>
@@ -1217,7 +1264,7 @@
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"כשתוציא את ה-<xliff:g id="NAME_0">^1</xliff:g> הזה, האפליקציות המאוחסנות בו יפסיקו לפעול, וקובצי המדיה המאוחסנים בו לא יהיו זמינים עד שתכניס אותו שוב."</b>\n\n"ה-<xliff:g id="NAME_1">^1</xliff:g> הזה הוגדר באמצעות פרמוט לפעול במכשיר הזה בלבד. הוא לא יפעל במכשירים אחרים."</string>
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"כדי להשתמש באפליקציות, בתמונות או בנתונים המאוחסנים ב-<xliff:g id="NAME">^1</xliff:g> הזה, הכנס אותו שוב. \n\nלחלופין, תוכל לבחור לשכוח את האחסון הזה אם ההתקן אינו זמין. \n\nאם תבחר לשכוח, כל הנתונים שבהתקן יאבדו לצמיתות. \n\nתוכל להתקין מחדש את האפליקציות מאוחר יותר, אך הנתונים שלהן שהיו מאוחסנים בהתקן הזה יאבדו."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"האם לשכוח את <xliff:g id="NAME">^1</xliff:g>?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"כל האפליקציות, התמונות והנתונים המאוחסנים ב-<xliff:g id="NAME">^1</xliff:g> הזה יימחקו לצמיתות."</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"כל האפליקציות, התמונות והנתונים המאוחסנים ב-<xliff:g id="NAME">^1</xliff:g> הזה יימחקו לתמיד."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"אפליקציות"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"תמונות"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"סרטונים"</string>
@@ -1292,13 +1339,14 @@
     <string name="mvno_match_data" msgid="4560671695220540466">"‏ערך MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"‏מחק APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"‏צור APN חדש"</string>
-    <string name="menu_save" msgid="8109345640668285399">"שמור"</string>
+    <string name="menu_save" msgid="8109345640668285399">"שמירה"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"מחיקה"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"השדה \'שם\' לא יכול להיות ריק."</string>
     <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>
@@ -1321,15 +1369,20 @@
     <string name="master_clear_summary" msgid="6902443944660426951">"האחסון הפנימי וכל הנתונים יאופסו"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון שלך, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"אתה מחובר כעת לחשבונות הבאים:\n"</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"החשבונות הבאים שלך פעילים כעת:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"קיימים משתמשים אחרים במכשיר זה.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"מוסיקה"</li>\n<li>"תמונות"</li>\n<li>"נתוני משתמש אחרים"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">"‏"<li>"הספקים ב-eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"מחיקת הנתונים לא תבטל את תוכנית השירות הסלולרי שלך."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"‏מחק אחסון USB"</string>
     <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_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>
@@ -1352,26 +1405,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>
@@ -1404,7 +1446,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 +1491,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>
@@ -1478,16 +1523,16 @@
     <string name="lock_settings_title" msgid="4213839087748988686">"אבטחת המכשיר"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"שנה את קו ביטול הנעילה"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"שנה קוד גישה לביטול נעילה"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"שרטט קו ביטול נעילה"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"מהו קו ביטול הנעילה שלך?"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"לחץ על \'תפריט\' לקבלת עזרה."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"שחרר את האצבע כאשר תסיים"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"לסיום הפעולה פשוט צריך להרים את האצבע"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"חבר לפחות <xliff:g id="NUMBER">%d</xliff:g> נקודות. נסה שוב."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"קו ביטול הנעילה נרשם"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"צייר שוב קו ביטול נעילה כדי לאשר"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"יש לצייר שוב את קו ביטול הנעילה כדי לאשר"</string>
     <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"קו ביטול הנעילה החדש שלך"</string>
-    <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"אשר"</string>
+    <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"אישור"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"צייר שוב"</string>
-    <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"נקה"</string>
+    <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"ניקוי"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"המשך"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"קו ביטול נעילה"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"יש צורך בקו לביטול הנעילה"</string>
@@ -1519,6 +1564,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>
@@ -1547,7 +1595,7 @@
     <string name="data_size_label" msgid="6117971066063850416">"נתוני משתמש"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"‏נתוני אחסון USB"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"‏כרטיס SD"</string>
-    <string name="uninstall_text" msgid="3644892466144802466">"הסר התקנה"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"הסרת התקנה"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"הסר התקנה עבור כל המשתמשים"</string>
     <string name="install_text" msgid="884360662922471113">"התקן"</string>
     <string name="disable_text" msgid="6544054052049395202">"השבתה"</string>
@@ -1562,7 +1610,7 @@
     <string name="ask_compatibility" msgid="7225195569089607846">"שאל בעת הפעלה"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"שנה קנה מידה של אפליקציה"</string>
     <string name="unknown" msgid="1592123443519355854">"לא ידוע"</string>
-    <string name="sort_order_alpha" msgid="1410278099123670628">"מיין לפי שם"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"מיון לפי שם"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"מיין לפי גודל"</string>
     <string name="show_running_services" msgid="5736278767975544570">"הצג שירותים פועלים"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"הצג תהליכים המאוחסנים בקובץ שמור"</string>
@@ -1589,7 +1637,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"‏אחסון בכרטיס SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"מחשב גודל מחדש..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"למחוק את נתוני האפליקציות?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"כל נתוני האפליקציה יימחקו לצמיתות. נתונים אלה כוללים את כל הקבצים, ההגדרות, החשבונות, מסדי הנתונים וכדומה."</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"כל נתוני האפליקציה יימחקו לתמיד. נתונים אלה כוללים את כל הקבצים, ההגדרות, החשבונות, מסדי הנתונים וכדומה."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"אישור"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ביטול"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1689,6 +1737,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>
@@ -1702,8 +1754,8 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"פיסוק אוטומטי"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"הגדרות מקלדת פיזית"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"לחץ על מקש הרווח פעמיים כדי להוסיף \'.\'"</string>
-    <string name="show_password" msgid="4837897357002495384">"הצג סיסמאות"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"הצג את התווים לפרקי זמן קצרים בזמן ההקלדה"</string>
+    <string name="show_password" msgid="4837897357002495384">"הצגת סיסמאות"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"התווים יופיעו לפרקי זמן קצרים בזמן ההקלדה"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"ייתכן שבודק איות זה יוכל לאסוף את כל הטקסט שאתה מקליד, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיס אשראי. הוא מגיע מהאפליקציה <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. להשתמש בבודק איות זה?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"הגדרות"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"שפה"</string>
@@ -1741,7 +1793,7 @@
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"הקלד מילה"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"קיצור אופציונלי"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ערוך מילה"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ערוך"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"עריכה"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"מחיקה"</string>
     <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"אין לך מילים במילון המשתמש. כדי להוסיף מילה יש להקיש על לחצן \'הוספה\' (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"לכל השפות"</string>
@@ -1787,6 +1839,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"קוראי מסך, פקדי אינטראקציה, תצוגה"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"הגדרות תצוגה"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ניתן להתאים אישית את המכשיר הזה כדי שיתאים לצרכיך. ניתן לשנות את תכונות הנגישות מאוחר יותר ב\'הגדרות\'."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"הגדלת גודל הגופן"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"קוראי מסך"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"הקראת טקסט שמופיע במסך"</string>
     <string name="display_category_title" msgid="685461049938269166">"תצוגה"</string>
@@ -1915,6 +1968,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>
@@ -1922,14 +1981,14 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"הוסף מדפסות"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"פועל"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"כבוי"</string>
-    <string name="print_menu_item_add_service" msgid="3811645167869797802">"הוסף שירות"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"הוספת שירות"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"הוסף מדפסת"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"חיפוש"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"מחפש מדפסות"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"השירות הושבת"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"עבודות הדפסה"</string>
     <string name="print_print_job" msgid="7563741676053287211">"עבודת הדפסה"</string>
-    <string name="print_restart" msgid="8373999687329384202">"הפעל מחדש"</string>
+    <string name="print_restart" msgid="8373999687329384202">"הפעלה מחדש"</string>
     <string name="print_cancel" msgid="3621199386568672235">"ביטול"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"מדפיס את <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1981,6 +2040,29 @@
     <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="4006631636646776488">"הניהול של צריכת הסוללה בטלפון לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"הניהול של צריכת הסוללה בטאבלט לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"הניהול של צריכת הסוללה במכשיר לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"הניהול של צריכת הסוללה בטלפון לא תקין, כי האפליקציה <xliff:g id="APP_0">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה <xliff:g id="APP_1">%1$s</xliff:g>.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"הניהול של צריכת הסוללה בטאבלט לא תקין, כי האפליקציה <xliff:g id="APP_0">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה <xliff:g id="APP_1">%1$s</xliff:g>.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"הניהול של צריכת הסוללה במכשיר לא תקין, כי האפליקציה <xliff:g id="APP_0">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה <xliff:g id="APP_1">%1$s</xliff:g>.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"אני רוצה לעצור את האפליקציה"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"לכבות את השימוש ברקע ולהפסיק את פעולת האפליקציה?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"הניהול של צריכת הסוללה בטלפון לא תקין, כי האפליקציה <xliff:g id="APP_0">%1$s</xliff:g> מוציאה את הטלפון ממצב שינה.\n\nכדי לפתור את הבעיה, אפשר לעצור את <xliff:g id="APP_1">%1$s</xliff:g> כדי למנוע ממנה לפעול ברקע."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"הניהול של צריכת הסוללה בטאבלט לא תקין, כי האפליקציה <xliff:g id="APP_0">%1$s</xliff:g> מוציאה את הטאבלט ממצב שינה.\n\nכדי לפתור את הבעיה, אפשר לעצור את <xliff:g id="APP_1">%1$s</xliff:g> כדי למנוע ממנה לפעול ברקע."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"הניהול של צריכת הסוללה במכשיר לא תקין, כי האפליקציה <xliff:g id="APP_0">%1$s</xliff:g> מוציאה את המכשיר ממצב שינה.\n\nכדי לפתור את הבעיה, אפשר לעצור את <xliff:g id="APP_1">%1$s</xliff:g> ולמנוע ממנה לפעול ברקע."</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="7774807745601479888">"הניהול של צריכת הסוללה בטלפון לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מבקשת את נתוני המיקום שלך כשהיא לא בשימוש.\n\nכדי לפתור את הבעיה, אפשר להשבית העברה של נתוני מיקום לאפליקציה הזו."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"הניהול של צריכת הסוללה בטאבלט לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> מבקשת את נתוני המיקום שלך כשהיא לא בשימוש.\n\nכדי לפתור את הבעיה, אפשר להשבית העברה של נתוני מיקום לאפליקציה הזו."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"הניהול של צריכת הסוללה במכשיר לא תקין, כי האפליקציה <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 +2077,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>
@@ -2047,12 +2129,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"פירוט מאז הטעינה המלאה האחרונה"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"הטעינה המלאה האחרונה"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"זמן השימוש הנותר בסוללה הינו משוער ועשוי להשתנות על פי השימוש בפועל"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"נתוני השימוש בסוללה משוערים ועשויים להשתנות בהתאם לשימוש בפועל"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"זמן שימוש פעיל"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"זמן פעילות ברקע"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"שימוש בסוללה"</string>
@@ -2241,7 +2324,7 @@
     <string name="wifi_setup_detail" msgid="2336990478140503605">"פרטי רשת"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"התחבר"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"שכח"</string>
-    <string name="wifi_setup_save" msgid="3659235094218508211">"שמור"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"שמירה"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"ביטול"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"סורק רשתות..."</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"הקש על רשת כדי להתחבר אליה"</string>
@@ -2378,7 +2461,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"‏שינויים שתבצע בחשבונות שלך באינטרנט יועתקו באופן אוטומטי לטאבלט שלך.\n\nייתכן גם שחשבונות מסוימים יעתיקו לאינטרנט באופן אוטומטי שינויים שתבצע בטלפון. חשבון Google פועל באופן זה."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"‏כל שינוי שתבצע בחשבונות שלך באינטרנט יועתק לטלפון שלך באופן אוטומטי.\n\nייתכן גם שחשבונות מסוימים יעתיקו לאינטרנט באופן אוטומטי שינויים שתבצע בטלפון. חשבון Google פועל באופן זה."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"האם לכבות סנכרון אוטומטי של נתונים?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"פעולה זו תחסוך בשימוש בנתונים ובעוצמת סוללה, אך יהיה עליך לסנכרן כל חשבון באופן ידני על מנת לאסוף מידע עדכני. בזמן עדכונים לא תקבל התראות."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"פעולה זו תחסוך בשימוש בנתונים ובעוצמת סוללה, אך יהיה עליך לסנכרן כל חשבון באופן ידני על מנת לאסוף מידע עדכני. בזמן עדכונים לא יתקבלו התראות."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"תאריך איפוס של מחזור שימוש"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"תאריך בכל חודש:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"הגדר"</string>
@@ -2434,7 +2517,7 @@
     <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"‏המידע שהוזן לא תומך ב VPN בחיבור תמידי"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"ביטול"</string>
     <string name="vpn_done" msgid="8678655203910995914">"סגור"</string>
-    <string name="vpn_save" msgid="4233484051644764510">"שמור"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"שמירה"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"התחבר"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"החלף"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"‏עריכת פרופיל VPN"</string>
@@ -2550,9 +2633,9 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"‏תוכל לשתף מכשיר זה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו, שהוא יכול להתאים אישית בעזרת אפליקציות, טפט ופריטים נוספים משלו. המשתמשים יכולים גם להתאים הגדרות של המכשיר כגון Wi‑Fi, שיכולות להשפיע על כל אחד.\n\nבעת הוספת משתמש חדש, על משתמש זה להגדיר את השטח שלו.\n\nכל משתמש יכול לעדכן אפליקציות עבור כל המשתמשים האחרים."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"בעת הוספת משתמש חדש, על משתמש זה להגדיר את השטח שלו.\n\nכל משתמש יכול לעדכן אפליקציות עבור כל המשתמשים האחרים."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"האם להגדיר משתמש עכשיו?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"ודא שהמשתמש זמין לקחת את המכשיר ולהגדיר את המרחב שלו"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"כדאי לוודא שהמשתמש זמין ויכול לקחת את המכשיר ולהגדיר את המרחב שלו"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"האם להגדיר פרופיל עכשיו?"</string>
-    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"הגדר עכשיו"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"הגדרה"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"לא עכשיו"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"רק הבעלים של הטאבלט יכול לנהל משתמשים."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"רק הבעלים של הטלפון יכול לנהל משתמשים."</string>
@@ -2616,7 +2699,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>
@@ -2640,7 +2723,7 @@
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"‏LTE (מומלץ)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"‏SIM עבודה"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"גישה לאפליקציות ולתוכן"</string>
-    <string name="user_rename" msgid="8523499513614655279">"שנה שם"</string>
+    <string name="user_rename" msgid="8523499513614655279">"שינוי שם"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"הגדר הגבלות אפליקציה"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"בשליטת <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"האפליקציה הזו יכולה לגשת לחשבונות שלך"</string>
@@ -2708,9 +2791,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>
@@ -2760,9 +2846,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"החלק כדי לבטל נעילה, סיסמה, קו ביטול נעילה, קוד גישה"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"אתגר בעבודה, עבודה, פרופיל"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"פרופיל עבודה, פרופיל מנוהל, לאחד, איחוד, עבודה, פרופיל"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"תנועה"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"תנועות"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"שלם, הקש, תשלומים"</string>
     <string name="keywords_backup" msgid="470070289135403022">"‏גיבוי, לגבות, backup, back up"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"תנועה"</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>
@@ -2847,7 +2934,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>
@@ -2862,6 +2950,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>
@@ -2891,8 +2983,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>
@@ -2935,7 +3025,7 @@
     <string name="notification_vibrate_title" msgid="1646667807969755957">"רטט"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"צליל"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"מחיקה"</string>
-    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"שנה שם"</string>
+    <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"שינוי שם"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"שם הכלל"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"איך ייקרא הכלל"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"שם הכלל כבר נמצא בשימוש"</string>
@@ -2980,6 +3070,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"רק מאלו שמסומנים בכוכב"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"בלי הודעות"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"התראות"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"התראות תמיד מקבלות עדיפות גבוהה ומשמיעות צליל"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"תזכורות"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"אירועים"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"כל המתקשרים"</string>
@@ -3018,7 +3109,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"כאשר המסך כבוי"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"כאשר המסך מופעל או כבוי"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"שלח משוב על המכשיר הזה"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"שליחת משוב על המכשיר הזה"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"הזן את קוד הגישה של מנהל המכשיר"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"פועל"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"כבוי"</string>
@@ -3031,11 +3122,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>
@@ -3043,7 +3129,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>
@@ -3169,6 +3255,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>
@@ -3199,7 +3298,7 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"‏העברת תמונות או קבצים אם MTP אינו נתמך (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"‏להשתמש במכשיר כהתקן MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏שימוש במכשיר זה כהתקן MIDI"</string>
-    <string name="usb_use" msgid="3256040963685055320">"‏השתמש ב-USB כדי"</string>
+    <string name="usb_use" msgid="3256040963685055320">"‏שימוש ב-USB כדי"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"הטענת המכשיר"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"אספקת מתח"</string>
@@ -3263,8 +3362,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>
@@ -3356,6 +3455,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>
@@ -3374,8 +3486,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>
@@ -3399,7 +3510,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>
@@ -3465,8 +3576,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>
@@ -3543,25 +3653,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"תנועת סיוע"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"רגישות"</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="gesture_setting_on" msgid="3455094265233870280">"פועל"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"כבוי"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"הנעילה של מנהל האתחול כבר בוטלה"</string>
@@ -3582,6 +3699,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"סנכרן נתוני עבודה באופן אוטומטי"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"אפשר לאפליקציות לרענן נתונים באופן אוטומטי"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"סנכרון חשבון"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"הסנכרון פועל ל-<xliff:g id="ID_1">%1$d</xliff:g> מתוך <xliff:g id="ID_2">%2$d</xliff:g> פריטים"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"הסנכרון פועל לכל הפריטים"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"הסנכרון כבוי לכל הפריטים"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"פרטי מכשיר מנוהל"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"שינויים והגדרות שהארגון שלך מנהל"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"הגדרות ושינויים המנוהלים על ידי <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3676,6 +3796,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>
@@ -3689,5 +3810,11 @@
     <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="698847081680980774">"מה חדש ומעניין?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"אנחנו מזמינים אותך לנסות את חמש התכונות המובילות"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"‏סטטוס הרשמה ל-IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"רשום"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"לא רשום"</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index f1437c6b57bfb7640061adc86e6f2b8b7dbe202e..f846cf9bd8e5cb2e3783b16dc55fa9e5fab7b070 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -68,7 +68,7 @@
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"スキャン中..."</item>
-    <item msgid="8513729475867537913">"接続中..."</item>
+    <item msgid="8513729475867537913">"接続処理中..."</item>
     <item msgid="515055375277271756">"認証中..."</item>
     <item msgid="1943354004029184381">"IPアドレスを取得中..."</item>
     <item msgid="4221763391123233270">"接続済み"</item>
@@ -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>
@@ -436,7 +426,7 @@
   <string-array name="vpn_states">
     <item msgid="8621078286418985762">"切断されました"</item>
     <item msgid="6692305604213080515">"初期化中..."</item>
-    <item msgid="8001704909356800092">"接続中..."</item>
+    <item msgid="8001704909356800092">"接続処理中..."</item>
     <item msgid="4039737283841672166">"接続されました"</item>
     <item msgid="4042143101664725090">"タイムアウト"</item>
     <item msgid="7664124146786465092">"失敗しました"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a7de5624561276a1d027a252459ac0206e8fae19..c600f97a4743058122716ac0026efc0e277a3406 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"後で行う"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"指紋の設定をスキップしますか？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"スマートフォンのロック解除方法として指紋を選択しています。スキップした場合は、後でセットアップする必要があります。セットアップの所要時間は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 +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>
@@ -515,17 +528,25 @@
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"画面ロックがないと、プロファイル保護機能は利用できません。<xliff:g id="EMPTY_LINE">
 
 </xliff:g>保存してある指紋もこのプロファイルから削除されるため、指紋を使用してプロファイルのロック解除、購入の許可、アプリへのログインを行うことはできなくなります。"</string>
-    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"削除する"</string>
+    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"無効にする"</string>
     <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="1688030823464420974">"パターンをあと 1 回間違えると、この端末のデータは削除されます"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"PIN をあと 1 回間違えると、この端末のデータは削除されます"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"パスワードをあと 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="5047439819181833824">"間違えた回数が上限を超えました。この端末のデータは削除されます。"</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>
@@ -613,7 +634,7 @@
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"電話帳を共有する"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>が連絡先と通話履歴にアクセスしようとしています。"</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>がBluetoothとペア設定しようとしています。接続されると、連絡先や通話履歴にアクセスします。"</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ペアリングされたデバイス"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ペア設定したデバイス"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"使用可能なデバイス"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"利用可能なデバイスがありません"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"接続"</string>
@@ -624,8 +645,16 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"オプション..."</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"詳細設定"</string>
     <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_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>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi を自動的に ON にする"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ホーム ネットワークなどの高品質の保存済みネットワークの検出時に Wi‑Fi を ON にする"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi のスキャンが OFF になっているため利用できません"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"この機能を使用するには、ネットワーク評価プロバイダを選択してください"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"接続不良のとき無効にする"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"安定したインターネット接続があるときのみWi-Fiネットワークを使用する"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"インターネット接続が安定したネットワークのみ使用する"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"オープン ネットワークに接続する"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"高品質の公共ネットワークに自動的に接続する"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"この機能を使用するには、ネットワーク評価プロバイダを選択してください"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"この機能を使用するには、対応するネットワーク評価プロバイダを選択してください"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"証明書のインストール"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"位置情報の精度を向上させるため、Wi-FiがOFFの場合でもシステムのアプリやサービスは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="wifi_scan_notify_text" msgid="5593805423071186757">"位置情報の精度を向上させるため、Wi-Fi が OFF の場合でもシステムのアプリやサービスは 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"位置情報の精度を上げるには、<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>スキャンの設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>で Wi-Fi のスキャンをオンにしてください。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"次回から表示しない"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"スリープ時にWi-Fi接続を維持"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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,10 +878,18 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続への招待をキャンセルしますか？"</string>
     <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_checkbox_text" msgid="7763495093333664887">"Wi-Fi アクセス ポイント"</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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"常に 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="6978257596231155345">"時刻、通知アイコンなどの情報を表示します。電池使用量が増えます。"</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 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"以下のアカウントにログインしています:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"この端末には他にもユーザーがいます。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM の携帯通信会社"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"この操作を行っても、ご利用のモバイル サービス プランはキャンセルされません。"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"音楽、画像、その他のユーザーデータを消去する場合は"<b>"USBストレージデータ"</b>"を消去する必要があります。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"音楽、画像、その他のユーザーデータを消去するには、"<b>"SDカード"</b>"を消去する必要があります。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USBストレージ内データの消去"</string>
     <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>
@@ -1313,7 +1366,7 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"お待ちください..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ボイスメール、着信転送、発信者番号など"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USBテザリング"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB テザリング"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ポータブルアクセスポイント"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetoothテザリング"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"テザリング"</string>
@@ -1323,27 +1376,16 @@
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"テザリング"</string>
     <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_button_text" msgid="585829947108007917">"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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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 +1536,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 +1707,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>
@@ -1686,7 +1738,7 @@
     <string name="show_ime" msgid="2658582193437188227">"仮想キーボードの表示"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"物理キーボードが有効になっていても画面に表示されます"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"キーボード ショートカット ヘルパー"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"使用可能なショートカットを表示"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"使用可能なショートカットを表示します"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"デフォルト"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ポインタの速度"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ゲーム用コントローラ"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"スクリーン リーダー、表示、操作のコントロール"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覚補助"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"この端末を必要に応じてカスタマイズできます。このユーザー補助機能は後から [設定] で変更できます。"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"フォントサイズを拡大"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"スクリーン リーダー"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音声と画面上のテキスト"</string>
     <string name="display_category_title" msgid="685461049938269166">"表示"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> によりスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> によりスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> によりスリープ状態に移行しないため、端末で電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、端末で電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"アプリを停止する"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"バックグラウンドでの使用を OFF にしてアプリを停止しますか？"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止してバックグラウンドで実行できないようにすることで、問題が解消するか試してみることができます。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止してバックグラウンドで実行できないようにすることで、問題が解消するか試してみることができます。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> によりスリープ状態に移行しないため、端末で電池を正常に管理できません。\n\n<xliff:g id="APP_1">%1$s</xliff:g> を停止してバックグラウンドで実行できないようにすることで、問題が解消するか試してみることができます。"</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="7774807745601479888">"使用中でないときに <xliff:g id="APP">%1$s</xliff:g> が位置情報のリクエストを繰り返しているため、スマートフォンで電池を正常に管理できません。\n\nこの問題を解決するには、このアプリでの位置情報の利用を OFF にします。"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"使用中でないときに <xliff:g id="APP">%1$s</xliff:g> が位置情報のリクエストを繰り返しているため、タブレットで電池を正常に管理できません。\n\nこの問題を解決するには、このアプリでの位置情報の利用を OFF にします。"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"使用中でないときに <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>
@@ -1953,7 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"前回のフル充電以降の内訳"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"前回のフル充電"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"電池の残り時間は概算値であり、使用状況によって変わります"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"電池の使用状況データは概算値であり、使用状況によって変わります"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"アクティブ時"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"バックグラウンド時"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"電池使用量"</string>
@@ -2080,7 +2161,7 @@
     <string name="voice_input_settings" msgid="1099937800539324567">"音声入力の設定"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"音声入力"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"音声入力サービス"</string>
-    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"完全な注目ワードと対話"</string>
+    <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"完全な起動ワードと対話"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"シンプルな音声認識"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"この音声入力サービスを使用すると、常時音声監視を実行し、音声対応アプリの管理をユーザーに代わって行えるようになります。これは<xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>の一部です。このサービスの使用を有効にしますか？"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"優先するエンジン"</string>
@@ -2364,8 +2445,8 @@
     <string name="data_usage_metered_title" msgid="7383175371006596441">"ネットワーク制限"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"バックグラウンド データが制限されている場合、従量制のネットワークはモバイル ネットワークと同様に扱われます。これらのネットワークを使用して大量のダウンロードが行われる前に、アプリが警告を表示することがあります。"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"モバイルネットワーク"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"従量制のWi‑Fiネットワーク"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"従量制のネットワークを選択するにはWi‑FiをONにします。"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"従量制の Wi‑Fi ネットワーク"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"従量制のネットワークを選択するには Wi‑Fi を ON にします。"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"端末で記録されるデータ使用量と携帯通信会社のデータ使用量は異なる場合があります。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急通報"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"通話に戻る"</string>
@@ -2489,7 +2570,7 @@
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"セットアップしていません"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"セットアップしていません - 制限付きプロファイル"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"セットアップしていません - 仕事用プロファイル"</string>
-    <string name="user_admin" msgid="993402590002400782">"管理"</string>
+    <string name="user_admin" msgid="993402590002400782">"管理者"</string>
     <string name="user_you" msgid="1639158809315025986">"自分（<xliff:g id="NAME">%s</xliff:g>）"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ニックネーム"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"追加"</string>
@@ -2502,7 +2583,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。Wi-Fiなど、すべてのユーザーに影響する端末設定を変更することもできます。\n\n新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"新しいユーザーを追加したら、そのユーザーは自分のスペースをセットアップする必要があります。\n\nすべてのユーザーは他のユーザーに代わってアプリを更新できます。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ユーザーを今すぐセットアップ"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"ユーザーが端末を使って各自のスペースをセットアップできるよう確認してください"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"ユーザーが端末を使って各自のスペースをセットアップできるようにします"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"プロファイルを今すぐセットアップしますか？"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"今すぐセットアップ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"後で行う"</string>
@@ -2568,7 +2649,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>
@@ -2658,9 +2739,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>
@@ -2710,9 +2794,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"スライドでロック解除、パスワード、パターン、PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ワーク チャレンジ, 仕事用, プロファイル"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"仕事用プロファイル, 管理対象プロファイル, 統合する, 統合, 仕事, プロファイル"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"操作"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"操作"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支払い, タップ, ペイメント"</string>
     <string name="keywords_backup" msgid="470070289135403022">"バックアップ, バック アップ"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"操作"</string>
     <string name="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>
@@ -2795,7 +2880,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>
@@ -2810,6 +2896,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>
@@ -2837,8 +2927,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>
@@ -2922,6 +3010,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"スター付きの連絡先のみ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"なし"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"アラーム"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"アラームは常に優先的な割り込みとして音が鳴ります"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"リマインダー"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"予定"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"すべての発信者"</string>
@@ -2969,19 +3058,14 @@
     <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>
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"端末の起動時にパターンを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動にパターンを必要としますか？"</string>
     <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_pattern_for_fingerprint" msgid="932184823193006087">"端末のロック解除に指紋を使うだけでなく、起動時にパターンを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\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>
@@ -3099,6 +3183,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>
@@ -3125,7 +3218,7 @@
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"接続されている端末を充電します。USB 充電に対応している端末でのみ選択できます。"</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"ファイルを転送する"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ファイルを別の端末に転送します"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"写真の転送（PTP）"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"写真を転送する（PTP）"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"写真を転送またはMTPがサポートされない場合にファイルを転送する（PTP）"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"この端末を MIDI として利用する"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"この端末を MIDI として利用する際に使用します"</string>
@@ -3191,8 +3284,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>
@@ -3282,6 +3375,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>
@@ -3300,8 +3402,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>
@@ -3321,7 +3422,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>
@@ -3385,8 +3486,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>
@@ -3457,25 +3557,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"アシスト操作"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"感度"</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="gesture_setting_on" msgid="3455094265233870280">"ON"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"OFF"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ブートローダーは既にロック解除されています"</string>
@@ -3496,6 +3603,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"自動的に仕事用データを同期"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"アプリにデータの自動更新を許可します"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"アカウントの同期"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> 件中 <xliff:g id="ID_1">%1$d</xliff:g> 件のアイテムで同期が ON"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"すべてのアイテムで同期が ON"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"すべてのアイテムで同期が OFF"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"管理対象端末の情報"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"変更と設定は組織によって管理されています"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"変更と設定は <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> によって管理されています"</string>
@@ -3576,6 +3686,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>
@@ -3589,5 +3700,11 @@
     <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="698847081680980774">"注目の新機能"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5 つの優れた機能をご覧ください"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 登録ステータス"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"登録済み"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未登録"</string>
 </resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 13e21c28251d3a75a8c38f458c5e9813f373cec9..d93c79d9ebde45f387dc15414b453550a09436bb 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>
@@ -184,7 +174,7 @@
     <item msgid="8926455723452645935">"AKA\'"</item>
   </string-array>
   <string-array name="wifi_phase2_entries">
-    <item msgid="1818786254010764570">"არც ერთი"</item>
+    <item msgid="1818786254010764570">"არცერთი"</item>
     <item msgid="6189918678874123056">"PAP"</item>
     <item msgid="1524112260493662517">"MSCHAP"</item>
     <item msgid="5923246669412752932">"MSCHAPV2"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 76beb3dc31e88d894ad8f622e0c10943c370a97e..a1ff68b8edf07d2bdd67e8213b0f87b96aaa6857 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"მოგვიანებით გაკეთება"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"გსურთ თითის ანაბეჭდის დაყენ. გამოტოვება?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"თქვენ აირჩიეთ თქვენი თითის ანაბეჭდის გამოყენება თქვენი ტელეფონის განბლოკვის ერთ-ერთ მეთოდად. თუ ამას ახლა გამოტოვებთ, მისი დაყენება მოგვიანებით მოგიწევთ. დაყენებას მხოლოდ ერთი წუთი სჭირდება."</string>
     <string name="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="1688030823464420974">"შემდეგი მცდელობისას განმბლოკავი ნიმუშის არასწორად შეყვანის შემთხვევაში, ამ მოწყობილობის მონაცემები წაიშლება"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"შემდეგი მცდელობისას PIN-კოდის არასწორად შეყვანის შემთხვევაში, ამ მოწყობილობის მონაცემები წაიშლება"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"შემდეგი მცდელობისას პაროლის არასწორად შეყვანის შემთხვევაში, ამ მოწყობილობის მონაცემები წაიშლება"</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="5047439819181833824">"დაფიქსირდა ზედმეტად ბევრი არასწორი მცდელობა. შედეგად, ამ მოწყობილობის მონაცემები წაიშლება."</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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi-ს ავტომატურად ჩართვა"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi ჩაირთვება შენახულ, მაღალხარისხიან ქსელებთან სიახლოვისას (მაგალითად, სახლის ქსელისას)"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"მიუწვდომელია, რადგან Wi‑Fi სკანირება გამორთულია"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"გამოსაყენებლად, აირჩიეთ ქსელის ხარისხის შეფასების პროვაიდერი"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Wi-Fi ქსელების ფილტრი"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"არ გამოიყენო Wi‑Fi ქსელი, თუ მას არ აქვს კარგი ინტერნეტ კავშირი"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"მხოლოდ იმ ქსელების გამოყენება, რომლებსაც კარგი ინტერნეტ-კავშირი გააჩნია"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ღია ქსელებთან დაკავშირება"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"მაღალხარისხიან საჯარო ქსელებთან ავტომატურად დაკავშირება"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"გამოსაყენებლად, აირჩიეთ ქსელის ხარისხის შეფასების პროვაიდერი"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"გამოსაყენებლად, აირჩიეთ თავსებადი ქსელის ხარისხის შეფასების პროვაიდერი"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"სერთიფიკატების ინსტალაცია"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"მდებარეობის სიზუსტის გასაუმჯობესებლად სისტემის აპები და სერვისები კვლავ შეძლებს 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"მდებარეობის სიზუსტის გასაუმჯობესებლად ჩართეთ Wi-Fi სკანირება <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>სკანირების პარამეტრებში<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"ყოველთვის ჩართული / ბატარეის მოხმარება გაიზრდება"</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="6978257596231155345">"დროის, შეტყობინებათა ხატულების და სხვა ინფორმაციის ჩვენება. ბატარეის მოხმარება გაიზრდება."</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 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n" ამ მოწყობილობაზე წარმოდგენილია სხვა მომხმარებლები. \n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"მუსიკა"</li>\n<li>"ფოტოები"</li>\n<li>"მომხმარებლის სხვა მონაცემები"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ოპერატორები eSIM-ზე"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ეს არ გააუქმებს თქვენს მობილურ სერვისთა პაკეტს."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"მუსიკის, ფოტოების და მომხმარებლის სხვა მონაცემების წასაშლელად საჭიროა "<b>"USB მეხსიერების"</b>" წაშლა."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"მუსიკის, სურათებისა და მომხმარებლის სხვა მონაცემების წასაშლელად უნდა წაიშალოს "<b>"SD ბარათი"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB მეხსიერების წაშლა"</string>
     <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>
@@ -1313,37 +1366,26 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"გთხოვთ, დაელოდოთ..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"დარეკვის პარამეტრები"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"ხმოვანი ფოსტის, ზარის გადამისამართების, ზარის დალოდების, დამრეკავის ID-ის დაყენება"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB მოდემი"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB ტეტერინგი"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"პორტატული უსადენო ქსელი"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-მოდემი"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"მოდემის რეჟიმი"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth ტეტერინგი"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ტეტერინგი"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"უსადენო ქსელი და ტეტერინგი"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"უსადენო ქსელი ჩართულია, ტეტერინგი"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"უსადენო ქსელი ჩართულია"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ტეტერინგი"</string>
     <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="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="usb_tethering_button_text" msgid="585829947108007917">"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_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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ეკრანის წამკითხველები, ჩვენება, ინტერაქციის მართვის საშუალებები"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"მხედველობის პარამეტრები"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ამ მოწყობილობის მორგება თქვენი საჭიროებების შესაბამისად შეგიძლიათ. მარტივი წვდომის ამ პარამეტრების მოგვიანებით შეცვლა პარამეტრებიდან არის შესაძლებელი."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"შრიფტის ზომის გაზრდა"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ეკრანის წამკითხველები"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"აუდიო და ეკრანზე გამოტანილი ტექსტი"</string>
     <string name="display_category_title" msgid="685461049938269166">"ეკრანი"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"თქვენი ტელეფონი სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამოღვიძებულ რეჟიმში ტოვებს.\n\nამის მოსაგვარებლად, შეგიძლიათ აპის შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"თქვენი ტაბლეტი სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამოღვიძებულ რეჟიმში ტოვებს.\n\nამის მოსაგვარებლად, შეგიძლიათ აპის შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"თქვენი მოწყობილობა სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამოღვიძებულ რეჟიმში ტოვებს.\n\nამის მოსაგვარებლად, შეგიძლიათ აპის შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"თქვენი ტელეფონი სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP_0">%1$s</xliff:g> მას გამუდმებით აღვიძებს.\n\nამის მოსაგვარებლად, შეგიძლიათ <xliff:g id="APP_1">%1$s</xliff:g> აპის შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"თქვენი ტაბლეტი სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP_0">%1$s</xliff:g> მას გამოღვიძებულ რეჟიმში ტოვებს.\n\nამის მოსაგვარებლად, შეგიძლიათ <xliff:g id="APP_1">%1$s</xliff:g> აპის შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"თქვენი მოწყობილობა სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP_0">%1$s</xliff:g> მას გამუდმებით აღვიძებს.\n\nამის მოსაგვარებლად, შეგიძლიათ <xliff:g id="APP_1">%1$s</xliff:g> აპის შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"აპის შეჩერება"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"გსურთ ფონზე მოხმარების გამორთვა და აპის შეჩერება?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"თქვენი ტელეფონი ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP_0">%1$s</xliff:g> მას გამუდმებით აღვიძებს.\n\nამ პრობლემის მოსაგვარებლად, შეგიძლიათ <xliff:g id="APP_1">%1$s</xliff:g> აპის შეჩერება და მისი ფონურ რეჟიმში გაშვების აღკვეთა."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"თქვენი ტაბლეტი ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP_0">%1$s</xliff:g> მას გამუდმებით აღვიძებს.\n\nამ პრობლემის მოსაგვარებლად, შეგიძლიათ <xliff:g id="APP_1">%1$s</xliff:g> აპის შეჩერება და მისი ფონურ რეჟიმში გაშვების აღკვეთა."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"თქვენი მოწყობილობა ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP_0">%1$s</xliff:g> მას გამუდმებით აღვიძებს.\n\nამ პრობლემის მოსაგვარებლად, შეგიძლიათ <xliff:g id="APP_1">%1$s</xliff:g> აპის შეჩერება და მისი ფონურ რეჟიმში გაშვების აღკვეთა."</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="7774807745601479888">"თქვენი ტელეფონი ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP">%1$s</xliff:g> გამუდმებით ითხოვს თქვენს მდებარეობას მაშინ, როცა აპს არ იყენებთ.\n\nამის მოსაგვარებლად, შეგიძლიათ ამ აპისთვის მდებარეობაზე წვდომის გამორთვა."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"თქვენი ტაბლეტი ბატარეას სათანადოდ ვერ მართავს, რადგან <xliff:g id="APP">%1$s</xliff:g> გამუდმებით ითხოვს თქვენს მდებარეობას მაშინ, როცა აპს არ იყენებთ.\n\nამის მოსაგვარებლად, შეგიძლიათ ამ აპისთვის მდებარეობაზე წვდომის გამორთვა."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"თქვენი მოწყობილობა ბატარეას სათანადოდ ვერ მართავს, რადგან <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 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"დეტალები ბოლო სრული დატენვიდან"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"ბოლო სრული დატენვა"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ბატარეის მუშაობის დარჩენილი დრო მიახლოებითია და შეიძლება შეიცვალოს მოხმარების მიხედვით"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ბატარეის მუშაობის მონაცემები მიახლოებითია და შეიძლება შეიცვალოს მოხმარების მიხედვით"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"აქტიურად გამოყენებისას"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"ფონურ რეჟიმში ყოფნისას"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ბატარეის მოხმარება"</string>
@@ -2333,11 +2414,11 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"იმ შემთხვევაში, თუ ხელმისაწვდომი იქნება მხოლოდ მობილური ინტერნეტი, ამ პარამეტრმა შეიძლება გამოიწვიოს მონაცემთა ფონურ გადაცემაზე დამოკიდებული აპლიკაციების მუშაობის შეწყვეტა.\n\nმონაცემთა გადაცემის შესაფერისი პარამეტრების პოვნა შესაძლებელია ამ აპლიკაციების პარამეტრებში."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"ფონური მონაცემების შეზღუდვა შესაძლებელია მხოლოდ მაშინ, როდესაც თქვენ დააყენებთ მობილური ინტერნეტის ლიმიტს."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ჩაირთოს მონაცემთა ავტომატური სინქრონიზაცია?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ვებზე თქვენს ანგარიშებში განხორციელებული ყველა ცვლილება ავტომატურად დაკოპირდება თქვენს ტაბლეტში.\n\nზოგიერთი ანგარიში ასევე ვებზე ავტომატურად დააკოპირებს თქვენ მიერ ტაბლეტში განხორციელებულ ცვლილებებს. Google-ის ანგარიში ასე ფუნქციონირებს."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ვებზე თქვენს ანგარიშებში განხორციელებული ყველა ცვლილება ავტომატურად დაკოპირდება თქვენს ტელეფონში.\n\nზოგიერთი ანგარიში ასევე ვებზე ავტომატურად დააკოპირებს თქვენ მიერ ტელეფონში განხორციელებულ ცვლილებებს. Google-ის ანგარიში ასე ფუნქციონირებს."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ვებზე თქვენს ანგარიშებში განხორციელებული ყველა ცვლილება ავტომატურად დაკოპირდება თქვენს ტაბლეტში.\n\nზოგიერთი ანგარიში ასევე ვებზე ავტომატურად დააკოპირებს თქვენ მიერ ტაბლეტში განხორციელებულ ცვლილებებს. Google ანგარიში ასე ფუნქციონირებს."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ვებზე თქვენს ანგარიშებში განხორციელებული ყველა ცვლილება ავტომატურად დაკოპირდება თქვენს ტელეფონში.\n\nზოგიერთი ანგარიში ასევე ვებზე ავტომატურად დააკოპირებს თქვენ მიერ ტელეფონში განხორციელებულ ცვლილებებს. Google ანგარიში ასე ფუნქციონირებს."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"გამოირთოს მონაცემთა ავტომატური სინქრონიზაცია?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ეს გამოიწვევს მონაცემებისა და ბატარეის გამოყენების დაზოგვას, მაგრამ თქვენ ბოლო ინფორმაციის შესაგროვებლად, დაგჭირდებათ თითოეულ ანგარიშთან მექანიკურად სინქრონიზაცია. განახლებების შესახებ შეტყობინებებს არ მიიღებთ."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"გამოყენების ციკლის აღდგენის თარიღი"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ეს გამოიწვევს მონაცემებისა და ბატარეის გამოყენების დაზოგვას, მაგრამ თქვენ ბოლო ინფორმაციის შესაგროვებლად დაგჭირდებათ თითოეულ ანგარიშთან მექანიკურად სინქრონიზაცია. განახლებების შესახებ შეტყობინებებს არ მიიღებთ."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"გამოყენების ციკლის ჩამოყრის თარიღი"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"თითოეული თვის თარიღი:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"შენახვა"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"გაფრთხილების დაყენება"</string>
@@ -2497,8 +2578,8 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"დაემატოს ახალი მომხმარებელი?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"დამატებითი მომხმარებლების შექმნით, შეგიძლიათ ეს მოწყობილობა სხვებს გაუზიაროთ. თითოეულ მომხმარებელს თავისი სივრცე აქვს, რომლის პერსონალიზება მას შეუძლია საკუთარი აპებით, ფონით და ა.შ. მომხმარებლებს აგრეთვე შეუძლიათ მოწყობილობის ისეთი პარამეტრების მორგება, როგორიცაა Wi‑Fi, რაც ყველაზე გავრცელდება.\n\nახალი მომხმარებლის დამატების შემდეგ, აღნიშნულმა მომხმარებელმა საკუთარი სივრცის დაყენების პროცესი უნდა გაიაროს.\n\nნებისმიერი მომხმარებელი შეძლებს აპების ყველა სხვა დანარჩენი მომხმარებლისთვის განახლებას."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ახალი მომხმარებლის დამატებისას, ამ მომხმარებელს საკუთარი სივრცის შექმნა მოუწევს.\n\nნებისმიერ მომხმარებელს შეუძლია აპები ყველა სხვა მომხმარებლისათვის განაახლოს."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"დავაყენო მომხმარებლის პარამეტრები?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"დარწმუნდით, რომ პირს შეუძლია მოწყობილობის აღება და საკუთარი სივრცის და დაყენება"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"გსურთ მომხმარებლის პარამეტრების დაყენება?"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"დარწმუნდით, რომ პირს შეუძლია მოწყობილობის აღება და საკუთარი სივრცის დაყენება"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"გსურთ დავაყენო პროფილი ახლა?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"დაყენება ახლა"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ახლა არა"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"განსაბლოკად გასრიალება, პაროლი, ნიმუში, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"სამსახურის გამოწვევა, სამსახური, პროფილი"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"სამსახურის პროფილი, მართული პროფილი, გაერთიანება, უნიფიკაცია, სამსახური, პროფილი"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ჟესტი"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ჟესტები"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"გადახდა, შეხება, გადახდები"</string>
     <string name="keywords_backup" msgid="470070289135403022">"სარეზერვო ასლი, სარეზერვო ასლის შექმნა"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ჟესტი"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"მხოლოდ ვარსკვლავიანი კონტაქტებისგან"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"არავისგან"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"მაღვიძარები"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"მაღვიძარები მუდამ პრიორიტეტულია და ხმას გამოსცემს"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"შეხსენებები"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ღონისძიებები"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ყველა აბონენტი"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"დახმარების ჟესტი"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"მგრძნობიარობა"</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="gesture_setting_on" msgid="3455094265233870280">"ჩართული"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"გამორთული"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"სისტემის ჩამტვირთველი უკვე განბლოკილია"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"სამსახურის მონაცემების ავტომატური სინქრონიზაცია"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"აპებისთვის მონაცემების ავტომატურად განახლების დაშვება"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"ანგარიშის სინქრონიზაცია"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"სინქრონიზაცია ჩართულია <xliff:g id="ID_2">%2$d</xliff:g>-დან <xliff:g id="ID_1">%1$d</xliff:g> ერთეულისთვის"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"სინქრონიზაცია ჩართულია ყველა ერთეულისთვის"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"სინქრონიზაცია გამორთულია ყველა ერთეულისთვის"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"მართული მოწყობილობის ინფორმაცია"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"ცვლილებებსა და პარამეტრებს მართავს თქვენი ორგანიზაცია"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"ცვლილებებსა და პარამეტრებს მართავს <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ჩართული"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"მყისიერი აპი"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"გსურთ მეხსიერების მენეჯერის გამორთვა?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"ფილმების და ტელევიზიის აპები"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"გამოყენებული მეხსიერება"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"ფილმების და TV აპები"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ოპერატორის უზრუნველყოფის ინფორმაცია"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ოპერატორის უზრუნველყოფის გაშვება"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"რა არის ახალი და გამორჩეული?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"გაეცანით ყველაზე პოპულარულ 5 ფუნქციას"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS რეგისტრაციის სტატუსი"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"რეგისტრირებული"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"არარეგისტრირებული"</string>
 </resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 62df25e5fd801bb3ce2494a19c97f1f938d61b86..d75b6061a58673464fffaf7ee5d23647c63c28bc 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 30d6c342d08f12083211608feceea3a48126f100..faa67f526c92c6533b042a5ed43e74747038d8df 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) -->
@@ -235,7 +247,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD картасын медиа үшін тексеруде…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB жады оқу үшін ғана енгізілген."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD картасы оқу үшін ғана енгізілген."</string>
-    <string name="skip_label" msgid="47510779345218297">"Аттап өту"</string>
+    <string name="skip_label" msgid="47510779345218297">"Өткізіп жіберу"</string>
     <string name="next_label" msgid="4693520878012668114">"Келесі"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"Тілдер"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"Тіл параметрлері"</string>
@@ -285,7 +297,7 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Роуминг кезінде дерекқор қызметіне жалғау"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Дерекқор байланысын жоғалттыңыз, себебі үй желісінің дерекқор роуминг қызметін өшірулі күйінде қалдырғансыз."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Оны қосыңыз"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Сізден елеулі ақылар алынуы мүмкін."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Қомақты ақы алынуы мүмкін."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Дерекқор роумингіне рұқсат берілгенде сізден біршама роуминг төлемі талап етілуі мүмкін!\n\nБұл параметр осы планшеттегі барлық пайдаланушыларға әсер етеді."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Дерекқор роумингіне рұқсат берілгенде сізден біршама роуминг төлемі талап етілуі мүмкін!\n\nБұл параметр осы телефондағы барлық пайдаланушыларға әсер етеді."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Дерекқор роумингіне рұқсат берілсін бе?"</string>
@@ -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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Кейінірек"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Саусақ ізін орнатуды өткізіп жіберу керек пе?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Саусақ ізін пайдалануды телефон құлпын ашудың бір жолы ретінде таңдадыңыз. Қазір өткізіп жіберсеңіз, мұны кейінірек орнату керек. Орнату бір минутқа жақын уақыт алады."</string>
     <string name="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>
@@ -470,7 +483,7 @@
     <string name="current_screen_lock" msgid="4104091715420072219">"Ағымдағы экран құлпы"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Саусақ ізі + өрнек"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Саусақ ізі + PIN"</string>
-    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Саусақ ізі + кілтсөз"</string>
+    <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Саусақ ізі + құпия сөз"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Саусақ ізін пайдаланбау"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Телефон құлпын саусақ ізімен ашуға болады. Бұл опция қауіпсіздік мақсатында қосымша экран құлпын қажет етеді."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Әкімші, шифрлау саясаты немесе тіркелкі деректерінің жады өшірген"</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="1688030823464420974">"Келесі әрекет кезінде қате өрнек енгізсеңіз, бұл құрылғылардың деректері жойылады"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Келесі әрекет кезінде қате PIN кодын енгізсеңіз, бұл құрылғылардың деректері жойылады"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Келесі әрекет кезінде қате құпия сөз енгізсеңіз, бұл құрылғылардың деректері жойылады"</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="5047439819181833824">"Тым көп қате әрекет жасалды. Бұл құрылғылардың деректері жойылады."</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>
@@ -614,7 +635,7 @@
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> контактілерге және қоңыраулар тарихына қатынасқысы келеді."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth көмегімен жұптағысы келеді. Қосылған кезде бұл құрылғыда контактілеріңізге және қоңыраулар тарихына қатынас болады."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Жұптасқан құрылғылар"</string>
-    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Қол жетімді құрылғылар"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Қолжетімді құрылғылар"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Құрылғылар қол жетімді емес"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Жалғау"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Ажырату"</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>
@@ -646,7 +675,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Үндеткіш телефоны ретінде"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Музыка және медиа үшін"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Параметрлерді есте сақтау"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Трансляциялау"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Трансляция"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Сымсыз дисплейді қосу"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Маңайдан құрылғылар табылмады"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Қосылуда"</string>
@@ -663,16 +692,16 @@
     <string name="link_speed" msgid="8896664974117585555">"%1$d Мб/с"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi желісінің қосылуын сұрайды"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi желісінің өшірілуін сұрайды"</string>
-    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"ЖӨБ"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Планшет басқа құрылғымен қатынасқанда дерек алмастыруға рұқсат беру"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Телефон басқа құрылғымен қатынасқанда дерек алмастыру мүмкіндігін береді"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Телефон басқа құрылғымен байланысқанда, дерек алмасуға рұқсат беру"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC желісін қосу"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC арқылы бұл құрылғы басқа маңайдағы құрылғылармен не нысандармен, соның ішінде төлем терминалдарымен, кіру деректерін оқу құралдармен және интеративті жарнамалармен немесе тэгтермен деректер алмасады."</string>
-    <string name="android_beam_settings_title" msgid="7832812974600338649">"Android тарату функциясы"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Қолданба мазмұнын ЖӨБ арқылы жіберуге әзір"</string>
+    <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Қолданба мазмұнын NFC арқылы жіберуге әзір"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Өшірулі"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Қол жетімсіз себебі ЖӨБ өшірілген"</string>
-    <string name="android_beam_label" msgid="6257036050366775040">"Android тарату функциясы"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Қолжетімсіз, себебі NFC өшірілген"</string>
+    <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Бұл функция қосылғанда, құрылғыларды бір-біріне жақын орналастырып, қолданба мазмұнын басқа NFC орнатылған құрылғыға жіберуге болады. Мысалы, беттерді, YouTube бейнелерін, контактілерді және басқаларды жібере аласыз.\n\nҚұрылғыларды бірге қойып (артқы жақтарын түйістіріп), экранды түртіңіз. Қолданба жіберілетін мазмұндарды анықтайды."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi қосу"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi желісін автоматты түрде қосу"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi үйдегі желі секілді маңайдағы жоғары сапалы сақталған желіге қайта қосылады"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi сканерлеу функциясы өшірулі болғандықтан қолжетімді емес"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Пайдалану үшін желіні бағалау провайдерін таңдаңыз"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Нашар байланыстарды қолданбау"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Егер интернет байланысы жақсы болмаса Wi‑Fi желісін қолданбаңыз"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Тек жақсы интернет байланысы бар желілерді пайдалану"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Ашық желілерге қосылу"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Жоғары сапалы ашық желілерге автоматты қосылу"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Пайдалану үшін желіні бағалау провайдерін таңдаңыз"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Пайдалану үшін үйлесімді желіні бағалау провайдерін таңдаңыз"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттар орнату"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Орынды анықтау дәлдігін жақсарту үшін жүйелік қолданбалар мен қызметтер әлі де 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Орналасқан жер дәлірек анықталуы үшін <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>сканерлеу параметрлерінен<xliff:g id="LINK_END_1">LINK_END</xliff:g> Wi-Fi арқылы сканерлеуді қосыңыз."</string>
@@ -727,7 +759,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Желіні ұмыту"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Желіні өзгерту"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC белгісіне жазу"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Қол жетімді желілерді көру үшін Wi‑Fi байланысын қосыңыз."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Қолжетімді желілерді көру үшін Wi‑Fi байланысын қосыңыз."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi‑Fi желілерін іздеуде…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Wi‑Fi желісін өзгертуге рұқсатыңыз жоқ."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Басқа"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Әрдайым қосулы / Батарея заряды тезірек таусылады"</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="6978257596231155345">"Уақытты, хабарландыру белгішелерін және басқа ақпараттарды көрсету. Батарея заряды тезірек таусылады."</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 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Осы құрылғыда басқа пайдаланушылар бар.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mузыка"</li>\n<li>"Фотосуреттер"</li>\n<li>"Басқа пайдаланушы деректері"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM картасының операторлары"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Мұның нәтижесінде мобильдік қызмет жоспарыңыздан бас тартылмайды."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыка, фотосуреттер және басқа деректерді өшіру үшін, "<b>"USB жадын"</b>" өшіру қажет."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Музыка, фотосуреттер және басқа пайдаланушы деректерін тазалау үшін "<b>"SD картасы"</b>" өшірілуі тиіс."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB жадын өшіру"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Өрнек көрінетін болсын"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Профиль өрнегін көрінетін ету"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Түрткенде дірілдету"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Қуат түймесі бірден бекітіледі"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Қуат түймесімен құлыпталады"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ашық күйінде ұстап тұрмаса"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Бекітпе кескінін реттеу"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Бекітпені ашу кескінін өзгерту"</string>
@@ -1491,6 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Экранды оқу құралдары, дисплей, интерактивті пайдалануды басқару элементтері"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Көру параметрлері"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Бұл құрылғыны қажеттіліктерге сай реттей аласыз. Бұл арнайы мүмкіндіктерді кейінірек \"Параметрлер\" тармағында өзгертуге болады."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Қаріп өлшемін үлкейту"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Экранды оқу құралдары"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудиомазмұн және экранға шығатын мәтін"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"Телефоныңыз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP">%1$s</xliff:g> қолданбасы оны қосулы күйде ұстауда.\n\nБұл мәселені шешу үшін қолданбаны тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Планшетіңіз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP">%1$s</xliff:g> қолданбасы оны қосулы күйде ұстауда.\n\nБұл мәселені шешу үшін қолданбаны тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Құрылғыңыз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP">%1$s</xliff:g> қолданбасы оны қосулы күйде ұстауда.\n\nБұл мәселені шешу үшін қолданбаны тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Телефоныңыз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP_0">%1$s</xliff:g> қолданбасы құрылғыны қосулы күйде ұстайды.\n\nБұл мәселені шешу үшін <xliff:g id="APP_1">%1$s</xliff:g> қолданбасын тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Планшетіңіз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP_0">%1$s</xliff:g> қолданбасы құрылғыны қосулы күйде ұстайды.\n\nБұл мәселені шешу үшін <xliff:g id="APP_1">%1$s</xliff:g> қолданбасын тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Құрылғыңыз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP_0">%1$s</xliff:g> қолданбасы құрылғыны қосулы күйде ұстайды.\n\nБұл мәселені шешу үшін <xliff:g id="APP_1">%1$s</xliff:g> қолданбасын тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Қолданбаны тоқтату"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Фондық режимде пайдалануды өшіру және қолданбаны тоқтату керек пе?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Телефоныңыз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP_0">%1$s</xliff:g> қолданбасы құрылғыны қосулы күйде ұстайды.\n\nБұл мәселені шешу үшін <xliff:g id="APP_1">%1$s</xliff:g> қолданбасын тоқтатып, оның фондық режимде жұмыс істеуінің алдын алыңыз."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Планшетіңіз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP_0">%1$s</xliff:g> қолданбасы құрылғыны қосулы күйде ұстайды.\n\nБұл мәселені шешу үшін <xliff:g id="APP_1">%1$s</xliff:g> қолданбасын тоқтатып, оның фондық режимде жұмыс істеуінің алдын алыңыз."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Құрылғыңыз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP_0">%1$s</xliff:g> қолданбасы құрылғыны қосулы күйде ұстайды.\n\nБұл мәселені шешу үшін <xliff:g id="APP_1">%1$s</xliff:g> қолданбасын тоқтатып, оның фондық режимде жұмыс істеуінің алдын алыңыз."</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="7774807745601479888">"Телефоныңыз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP">%1$s</xliff:g> қолданбасы оны пайдаланбай жатқан кезде де орналасқан жеріңізді сұрауда.\n\nБұл мәселені шешу үшін қолданбадағы орналасқан жерді анықтау функциясын өшіріңіз."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Планшетіңіз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP">%1$s</xliff:g> қолданбасы оны пайдаланбай жатқан кезде де орналасқан жеріңізді сұрауда.\n\nБұл мәселені шешу үшін қолданбадағы орналасқан жерді анықтау функциясын өшіріңіз."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Құрылғыңыз батареяны қалыпты басқара алмайды, себебі <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Толық зарядталғаннан кейін пайдаланылғаны"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Соңғы толық зарядталуы"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Қалған батарея зарядының уақыты шамамен көрсетілген және оның тұтынылуына қарай өзгеруі мүмкін"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Батарея қолданысы туралы ақпарат шамамен берілген және пайдалануға байланысты өзгеруі мүмкін"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Белсенді пайдаланылатын кезде"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Фондық режимде болғанда"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Батарея зарядының тұтынылуы"</string>
@@ -2315,12 +2396,12 @@
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi‑Fi дерекқор шектеуін реттеу"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Этернет"</string>
-    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Ұялы"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мобильдік"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4Г"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2Г-3Г"</string>
-    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Ұялы"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Мобильдік"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Ешқандай"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Ұялы дерекқор"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Мобильдік дерек"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2Г-3Г дерекқор"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4Г дерекқор"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Алдыңғы фон:"</string>
@@ -2337,11 +2418,11 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Cіз интернетте есептік жазбаларыңызға енгізген кез келген өзгертулер телефоныңызға автоматты түрде көшіріледі.\n\nСондай-ақ, кейбір есептік жазбалар сіз телефонда енгізген кез келген өзгертулерді интернетке көшіре алады. Google есептік жазбасы осылай жұмыс істейді."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Автосинхрондау өшірілсін бе?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Бұл трафик пен батарея зарядын үнемдейді, бірақ соңғы ақпаратты жинау үшін әр есептік жазбаны қолмен синхрондау қажет болады. Сондай-ақ жаңартулар шыққанда, хабарландыру жіберілмейді."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Қолданыс айналымын қайта реттеу күні"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Статистиканы жаңадан бастау күні"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Әр айдың күні:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Параметрлер"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Дерекқор қолдану ескертуін орнату"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Дерекқор қолдану шектеуін анықтау"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Орнату"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Дерек қолдану ескертуін орнату"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Дерек шектеуін анықтау"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Деректер тасымалы шектеулі"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Орнатқан шекке жеткеннен кейін, планшет мобильдік деректерді өшіреді.\n\nПланшет деректерді пайдалану шегін белгілейтіндіктен және оператор трафикті басқаша есептеуі мүмкін болғандықтан, консервативті шекті қарастырыңыз."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Орнатқан шекке жеткеннен кейін, телефон мобильдік деректерді өшіреді.\n\nТелефон деректерді пайдалану шегін белгілейтіндіктен және оператор трафикті басқаша есептеуі мүмкін болғандықтан, консервативті шекті қарастырыңыз."</string>
@@ -2564,7 +2645,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>
@@ -2597,10 +2678,10 @@
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi және ұялы желілерді өзгертуге рұқсат беру"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth жұптаулары және параметрлерін өзгерту"</string>
-    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"ЖӨБ"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Осы <xliff:g id="DEVICE_NAME">%1$s</xliff:g> басқа NFC құрылғысына тигенде деректер алмасуға рұқсат ету"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Планшет басқа құрылғымен қатынасқанда дерек алмастыруға рұқсат беру"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Телефон басқа құрылғымен қатынасқанда дерек алмастыруға рұқсат беру"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Телефон басқа құрылғымен байланысқанда, дерек алмасуға рұқсат беру"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Орын"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Қолданбаға аймағыңызға қатысты ақпаратты қолдануға рұқсат беру"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Артқа"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"құлпын ашу үшін сырғыту, кілтсөз, өрнек, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"жұмыс профилін қорғау, жұмыс, профиль"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"жұмыс профилі, басқарылатын профиль, бірыңғайлау, жұмыс, профиль"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"қимыл"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"қимылдар"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"төлеу, түрту, төлемдер"</string>
     <string name="keywords_backup" msgid="470070289135403022">"сақтық көшірме, сақтық көшірме жасау"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"қимыл"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Тек жұлдызша қойылған контактілерден"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ешқандай"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Дабылдар"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Дабылдар әрқашан басым маңызға ие және дауыстап беріледі"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Еске салғыштар"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Оқиғалар"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Барлық қоңырау шалушылар"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3127,7 +3220,7 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Осы құрылғыны MIDI ретінде пайдалану"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB портын келесі үшін пайдалану"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Осы құрылғыны зарядтау"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Осы құрылғыны зарядтауда"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Қуат беру"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Файлдарды тасымалдау"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Суреттерді тасымалдау (PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Хабарландыруларды көру үшін саусақ ізі сканерін пайдалану"</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="assist_gesture_title" msgid="7746563137898655539">"Көмекші қимыл"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Сезгіштік"</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="gesture_setting_on" msgid="3455094265233870280">"Қосулы"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Өшірулі"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Операциялық жүйені жүктеу құралының құлпы ашылған"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Жұмыс деректерін автоматты түрде синхрондау"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Қолданбалардың деректерді автоматты жаңартуына рұқсат беру"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Есептік жазбаны синхрондау"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> / <xliff:g id="ID_1">%1$d</xliff:g> элемент үшін синхрондау қосулы"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Барлық элемент үшін синхрондау қосулы"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Барлық элемент үшін синхрондау өшірулі"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Басқарылатын құрылғы ақпараты"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Ұйым басқаратын өзгерістер мен параметрлер"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> басқаратын өзгерістер мен параметрлер"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Қандай қызық жаңа мүмкіндік бар?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Үздік 5 функцияны қараңыз"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS тіркеу күйі"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Тіркелген"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Тіркелмеген"</string>
 </resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 26ea3dd72a9b89ca30f7c90cb153b57eb8316ea6..11d8deebd8fd22a24e570b826e5054184177d0c2 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>
@@ -284,7 +274,7 @@
     <item msgid="7136963238377062018">"កម្រិត​សំឡេង​​"</item>
     <item msgid="4270236897655923007">"កម្រិត​សំឡេង​រោទ៍"</item>
     <item msgid="6325739889222559394">"កម្រិត​សំឡេង​មេឌៀ"</item>
-    <item msgid="5762123934816216821">"កម្រិត​សំឡេង​រោទ៍"</item>
+    <item msgid="5762123934816216821">"កម្រិត​សំឡេងម៉ោង​រោទ៍"</item>
     <item msgid="785049718065337473">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
     <item msgid="6700305533746877052">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
     <item msgid="2029227495214047094">"មិន​ដេក"</item>
@@ -351,7 +341,7 @@
     <item msgid="5660213838861789350">"កម្រិត​សំឡេង"</item>
     <item msgid="7983336752371254444">"កម្រិត​សំឡេង​រោទ៍"</item>
     <item msgid="7878027809189330917">"កម្រិត​សំឡេង​មេឌៀ"</item>
-    <item msgid="7260546305036218513">"កម្រិត​សំឡេង​រោទ៍"</item>
+    <item msgid="7260546305036218513">"កម្រិត​សំឡេងម៉ោង​រោទ៍"</item>
     <item msgid="9103719301075748925">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
     <item msgid="7025966722295861512">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
     <item msgid="4665183401128289653">"មិន​ដេក"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 7e22dc8ee8833764daa11a7dadb5a8c0531ffcb2..6ee511d40bb600acc149169ccc0e22c77ec40f08 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) -->
@@ -295,8 +307,8 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"កំណត់​កាលបរិច្ឆេទ និង​ពេលវេលា"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"កំណត់​កាលបរិច្ឆេទ ពេលវេលា តំបន់​ពេលវេលា &amp; ទ្រង់ទ្រាយ"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"កាលបរិច្ឆេទ និង ម៉ោង​ស្វ័យ​ប្រវត្តិ"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ប្រើ​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ប្រើ​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ប្រើ​ពេលវេលា​ដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ប្រើ​ពេលវេលា​ដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="zone_auto" msgid="334783869352026648">"តំបន់​ម៉ោង​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ប្រើ​តំបន់ម៉ោងដែល​​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ប្រើ​តំបន់​ម៉ោងដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
@@ -322,15 +334,15 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"បិទដោយអ្នកគ្រប់គ្រង"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"គ្មាន"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"ឧ. ទូរស័ព្ទ Android របស់ពិសិដ្ឋ។"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"ឧ. ទូរសព្ទ Android របស់ Joe ។"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ព័ត៌មាន​អ្នកប្រើ"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"បង្ហាញ​ព័ត៌មាន​​ប្រវត្តិរូប​លើ​អេក្រង់ចាក់សោ"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ព័ត៌មាន​ប្រវត្តិរូប"</string>
     <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="encryption_and_credential_settings_title" msgid="6514904533438791561">"ការ​អ៊ិនគ្រីប និងលិខិត​សម្គាល់"</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>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ចំណូលចិត្ត​អេក្រង់​ចាក់​សោ"</string>
@@ -354,41 +366,40 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ចុះឈ្មោះ​នៅ​ពេលក្រោយ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"រំលងការដំឡើងស្នាមម្រាមដៃឬទេ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"អ្នកបានជ្រើសរើសប្រើស្នាមម្រាមដៃរបស់អ្នកជាវិធីមួយក្នុងការដោះសោទូរស័ព្ទរបស់អ្នក។ ប្រសិនបើអ្នករំលងឥឡូវនេះ អ្នកត្រូវដំឡើងវានៅពេលក្រោយ។ ការដំឡើងចំណាយពេលបន្តិចប៉ុណ្ណោះ។"</string>
     <string name="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_error_dialog_title" msgid="3618021988442639280">"ការចុះឈ្មោះមិនបានបញ្ចប់នោះទេ"</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>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"បន្ថែមផ្សេងទៀត"</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="1688030823464420974">"ប្រសិនបើអ្នកបញ្ចូលលំនាំមិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ ទិន្នន័យរបស់ឧបករណ៍នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"ប្រសិនបើអ្នកបញ្ចូលកូដ PIN មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ ទិន្នន័យរបស់ឧបករណ៍នេះនឹងត្រូវបានលុប"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"ប្រសិនបើ​អ្នកបញ្ចូលពាក្យសម្ងាត់មិនត្រឹមត្រូវនៅក្នុងការព្យាយាមដោះសោបន្ទាប់ពីនេះ ទិន្នន័យរបស់ឧបករណ៍នេះនឹងត្រូវបានលុប"</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="5047439819181833824">"ដោយសារ​មាន​ការព្យាយាម​ដោះសោ​មិនត្រឹមត្រូវ​ច្រើនដងពេក ទិន្នន័យ​របស់​ឧបករណ៍នេះនឹងត្រូវបានលុប។"</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>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"បើក Wi‑Fi ដោយស្វ័យប្រវត្តិ"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi នឹងបើកឡើងវិញនៅក្បែរបណ្តាញដែលមានគុណភាពខ្ពស់ដែលបានរក្សាទុក ដូចជាបណ្តាញ​នៅ​ផ្ទះ​របស់អ្នក"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"មិនអាចប្រើបានទេ ដោយសារការស្កេន Wi‑Fi ត្រូវបានបិទ"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ដើម្បី​ប្រើ សូម​ជ្រើសរើស​ក្រុមហ៊ុនផ្តល់ការវាយតម្លៃបណ្តាញ​"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ជៀសវាង​ការ​តភ្ជាប់​ដែល​ខ្សោយ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"កុំ​ប្រើ​បណ្ដាញ​វ៉ាយហ្វាយ លុះ​ត្រា​វា​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ល្អ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ប្រើ​តែ​បណ្ដាញ​ដែល​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ល្អ"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ភ្ជាប់ទៅបណ្តាញចំហ"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ភ្ជាប់ទៅ​បណ្តាញសាធារណៈគុណភាពខ្ពស់ដោយស្វ័យប្រវត្តិ"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ដើម្បី​ប្រើ សូម​ជ្រើសរើស​ក្រុមហ៊ុនផ្តល់ការវាយតម្លៃបណ្តាញ​"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ដើម្បី​ប្រើ សូម​ជ្រើសរើស​ក្រុមហ៊ុនផ្តល់ការវាយតម្លៃបណ្តាញ​ដែលត្រូវគ្នា"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ដំឡើង​វិញ្ញាបនបត្រ"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ដើម្បីធ្វើឲ្យភាពសុក្រិតនៃទីតាំងមានភាពប្រសើរឡើង កម្មវិធី និងសេវាកម្មប្រព័ន្ធនៅតែអាចស្កេនរកបណ្តាញ 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="wifi_scan_notify_text" msgid="5593805423071186757">"ដើម្បីបង្កើនសុក្រឹតភាពនៃទីតាំង កម្មវិធី និងសេវាកម្មប្រព័ន្ធនៅតែអាចស្កេនរកបណ្តាញ 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ដើម្បី​ធ្វើឲ្យ​សុក្រឹតភាព​នៃទីកន្លែង​មានភាព​ប្រសើរ​ឡើង សូម​បើកការ​ស្កេន 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="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"កុំ​បង្ហាញ​ម្ដង​ទៀត"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"បើក Wi-Fi ​​អំឡុង​ពេល​ដេក"</string>
@@ -727,7 +759,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"បំភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"កែ​បណ្ដាញ"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"សរសេរ​ទៅ​ស្លាក​អិនអេហ្វស៊ី"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ដើម្បី​មើល​បណ្ដាញ​ដែល​មាន​ បើក​វ៉ាយហ្វាយ។"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ដើម្បី​មើល​បណ្ដាញ​ដែល​មាន​ សូមបើក Wi-Fi ។"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"កំពុង​ស្វែងរក​បណ្ដាញ​វ៉ាយហ្វាយ…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"អ្នក​មិន​មាន​សិទ្ធិ​ដើម្បី​ប្ដូរ​បណ្ដាញ​វ៉ាយហ្វាយ​ទេ។"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ច្រើន​ទៀត"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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,10 +878,18 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"តើ​អ្នក​ចង់​បោះបង់​ការ​អញ្ជើញ​ឲ្យ​តភ្ជាប់​ជា​មួយ <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_checkbox_text" msgid="7763495093333664887">"ហតស្ប៉ត Wi-Fi"</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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"បើក​ជានិច្ច / ប្រើ​ថាមពលថ្ម​ច្រើន​ជាងមុន"</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="6978257596231155345">"បង្ហាញ​ម៉ោង រូប​តំណាង​ការជូន​ដំណឹង និង​ព័ត៌មាន​ផ្សេងទៀត។ ប្រើ​ថាមពលថ្ម​ច្រើន​ជាងមុន។"</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>
@@ -1099,7 +1146,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"កម្លាំង​សញ្ញា"</string>
     <string name="status_roaming" msgid="2638800467430913403">"រ៉ូមីង"</string>
     <string name="status_operator" msgid="2274875196954742087">"បណ្ដាញ"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"អាសយដ្ឋាន​ MAC វ៉ាយហ្វាយ"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"អាសយដ្ឋាន​ MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"អាសយដ្ឋាន​ប៊្លូធូស"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"លេខ​ស៊េរី"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"មិន​មាន"</string>
@@ -1273,6 +1320,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>
@@ -1296,14 +1344,19 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"បច្ចុប្បន្ន​ អ្នក​បាន​ចូល​គណនី​ដូច​ខាង​ក្រោម៖ \n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"មានអ្នកផ្សេងច្រើនទៀតមានវត្តមាននៅលើឧបករណ៍នេះ។\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"តន្ត្រី"</li>\n<li>"រូបថត"</li>\n<li>"ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេង​ទៀត"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ក្រុមហ៊ុនបម្រើ​សេវាទូរសព្ទដែលប្រើ eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"វានឹងមិនបោះបង់គម្រោងសេវាកម្មទូរសព្ទរបស់អ្នកទេ។"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ដើម្បី​សម្អាត​តន្ត្រី រូបថត និង​ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេងៗ តម្រូវ​ឲ្យ​លុប"<b>"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</b>" ។"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ដើម្បី​សម្អាត​តន្ត្រី, រូបភាព និង​ទិន្នន័យ​អ្នកប្រើ​ផ្សេងទៀត "<b>"ចាំបាច់​ត្រូវ"</b>" លុប​កាត​អេសឌី។"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"លុប​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
     <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_button_text" product="default" msgid="7550632653343157971">"កំណត់​ទូរសព្ទ​ឡើងវិញ"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"លុបព័ត៌មានផ្ទាល់ខ្លួន និងកម្មវិធីដែលបានទាញយករបស់អ្នកទាំងអស់? អ្នកមិនអាចធ្វើសកម្មភាពនេះវិញបានទេ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"លុប​អ្វីៗ​ទាំងអស់"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"គ្មាន​ការ​កំណត់​ឡើងវិញ​ត្រូវ​បាន​អនុវត្ត ព្រោះ​សេវាកម្ម​សម្អាត​ប្រព័ន្ធ​មិន​អាច​ប្រើ​បាន។"</string>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1413,7 +1455,7 @@
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"កម្មវិធី​ផ្ដល់​សេវា​រូបភាព​ផ្កាយ​រណប​៖\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"ឯកសារណែនាំ"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"មានបញ្ហាក្នុងការបើកឯកសារណែនាំ"</string>
-    <string name="settings_license_activity_title" msgid="8525014571806471216">"អាជ្ញាប័ណ្ណភាគីទីបី"</string>
+    <string name="settings_license_activity_title" msgid="8525014571806471216">"អាជ្ញាបណ្ណភាគីទីបី"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"មាន​បញ្ហា​ក្នុង​ការ​ផ្ទុក​អាជ្ញាប័ណ្ណ។"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"កំពុង​ផ្ទុក..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"ព័ត៌មាន​សុវត្ថិភាព"</string>
@@ -1421,8 +1463,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>
@@ -1455,8 +1500,8 @@
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ដក​ម្រាមដៃ​​ពេល​រួចរាល់។"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ភ្ជាប់​ចំណុច​យ៉ាង​ហោច​ណាស់ <xliff:g id="NUMBER">%d</xliff:g> ។ ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"បាន​កត់ត្រា​លំនាំ។"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"គូរ​លំនាំ​ម្ដង​ទៀត ដើម្បី​បញ្ជាក់៖"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"លំនាំ​ដោះ​សោ​ថ្មី​របស់​អ្នក៖"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"គូរ​លំនាំ​ម្ដង​ទៀត ដើម្បី​បញ្ជាក់"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"លំនាំ​ដោះ​សោ​ថ្មី​របស់​អ្នក"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"បញ្ជាក់"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"គូរ​ឡើងវិញ"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"សម្អាត"</string>
@@ -1491,6 +1536,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 +1707,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>
@@ -1677,7 +1729,7 @@
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"កម្មវិធី​ពិនិត្យ​អក្ខរាវិរុទ្ធ​នេះ​អាច​ប្រមូល​អត្ថបទ​​ទាំងអស់​ដែល​អ្នក​វាយ រួមមាន ទិន្នន័យ​​ផ្ទាល់​ខ្លួន​ ដូច​ជា​ពាក្យ​សម្ងាត់ និង​លេខ​កាត​ឥណទាន។ វា​បាន​មក​ពី​កម្មវិធី <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ។ ប្រើ​កម្មវិធី​ពិនិត្យ​អក្ខរាវិរុទ្ធ​នេះ?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"ការ​កំណត់"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ភាសា"</string>
-    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"ក្តារចុច និងការបញ្ចូល"</string>
+    <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"ក្តារចុច និងធាតុចូល"</string>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"ក្ដារ​ចុច​និម្មិត"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"ក្តារចុចនិម្មិតអាចប្រើបាន"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"គ្រប់គ្រងក្តារចុច"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"កម្មវិធីអានអេក្រង់ ការបង្ហាញ ការគ្រប់គ្រងអន្តរកម្ម"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ការកំណត់គំហើញ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"អ្នកអាចកែសម្រួលឧបករណ៍នេះឲ្យសមតាម​តម្រូវការរបស់អ្នក។ មុខងារនៃភាព​ងាយស្រួលទាំងនេះអាចផ្លាស់​ប្តូរពេលក្រោយបាននៅក្នុងការកំណត់។"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"បង្កើន​ទំហំ​ពុម្ព​អក្សរ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"កម្មវិធី​អានអេក្រង់"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"សំឡេង និងអក្សរ​នៅលើអេក្រង់"</string>
     <string name="display_category_title" msgid="685461049938269166">"បង្ហាញ"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"ទូរសព្ទ​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើឲ្យទូរសព្ទ​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បញ្ឈប់​កម្មវិធី​នេះ​។\n\nប្រសិនបើ​បញ្ហា​នេះ​នៅតែបន្ត​កើត​ឡើង អ្នក​គួរ​តែលុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"ថេប្លេត​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើឲ្យថេប្លេត​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បញ្ឈប់​កម្មវិធី​នេះ​។\n\nប្រសិនបើ​បញ្ហា​នេះ​នៅតែបន្ត​កើត​ឡើង អ្នក​គួរ​តែលុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"ឧបករណ៍​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើឲ្យឧបករណ៍​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បញ្ឈប់​កម្មវិធី​នេះ​។\n\nប្រសិនបើ​បញ្ហា​នេះ​នៅតែបន្ត​កើត​ឡើង អ្នក​គួរតែ​លុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"ទូរសព្ទ​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP_0">%1$s</xliff:g> បន្ត​ដាស់ទូរសព្ទ​របស់អ្នក។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នកអាចបញ្ឈប់ <xliff:g id="APP_1">%1$s</xliff:g> ។\n\nប្រសិនបើ​បញ្ហា​នេះនៅតែ​បន្ត​កើត​ឡើង អ្នក​គួរ​តែលុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"ថេប្លេត​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP_0">%1$s</xliff:g> បន្ត​ដាស់ថេប្លេត​របស់អ្នក​។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នកអាចបញ្ឈប់ <xliff:g id="APP_1">%1$s</xliff:g> ។\n\nប្រសិនបើ​បញ្ហា​នេះនៅតែ​បន្ត​កើត​ឡើង អ្នក​គួរ​តែលុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"ឧបករណ៍​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP_0">%1$s</xliff:g> បន្ត​ដាស់ឧបករណ៍​របស់អ្នក​។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នកអាចបញ្ឈប់ <xliff:g id="APP_1">%1$s</xliff:g> ។\n\nប្រសិនបើ​បញ្ហា​នេះ​នៅតែបន្ត​កើត​ឡើង អ្នក​គួរ​តែលុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"បញ្ឈប់កម្មវិធី"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"បិទ​ការប្រើប្រាស់​នៅផ្ទៃខាងក្រោយ ហើយ​បញ្ឈប់​កម្មវិធី​?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"ទូរសព្ទ​របស់អ្នក​មិន​អាចគ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP_0">%1$s</xliff:g> បន្ត​ដាស់ទូរសព្ទ​របស់អ្នក។\n\nដើម្បី​ព្យាយាមដោះស្រាយបញ្ហានេះ អ្នកអាច​បញ្ឈប់ <xliff:g id="APP_1">%1$s</xliff:g> និងរារាំង​វា​មិនឲ្យ​ដំណើរការ​នៅផ្ទៃខាងក្រោយ។"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"ថេប្លេត​របស់អ្នក​មិន​អាចគ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP_0">%1$s</xliff:g> បន្តដាស់ថេប្លេត​របស់អ្នក។\n\nដើម្បី​ព្យាយាមដោះស្រាយបញ្ហានេះ អ្នកអាច​បញ្ឈប់ <xliff:g id="APP_1">%1$s</xliff:g> និងរារាំង​វា​មិនឲ្យ​ដំណើរការ​នៅផ្ទៃខាងក្រោយ។"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"ឧបករណ៍​របស់អ្នក​មិន​អាចគ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP_0">%1$s</xliff:g> បន្ត​ដាស់​ឧបករណ៍​របស់អ្នក​។\n\nដើម្បី​ព្យាយាមដោះស្រាយបញ្ហានេះ អ្នកអាច​បញ្ឈប់ <xliff:g id="APP_1">%1$s</xliff:g> និងរារាំង​វា​មិនឲ្យ​ដំណើរការ​នៅផ្ទៃខាងក្រោយ។"</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="7774807745601479888">"ទូរសព្ទ​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP">%1$s</xliff:g> បន្ត​ស្នើ​សុំ​ទីកន្លែងរបស់អ្នក​ នៅពេលដែល​អ្នក​មិន​កំពុង​ប្រើ​កម្មវិធី​នេះ។\n\nដើម្បី​ដោះស្រាយ​បញ្ហា​នេះ អ្នក​អាច​បិទ​ទីកន្លែង​សម្រាប់​កម្មវិធីនេះ។"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"ថេប្លេត​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP">%1$s</xliff:g> បន្ត​ស្នើ​សុំ​ទីកន្លែងរបស់អ្នក​ នៅពេលដែល​អ្នក​មិន​កំពុង​ប្រើ​កម្មវិធី​នេះ។\n\nដើម្បី​ដោះស្រាយ​បញ្ហា​នេះ អ្នក​អាច​បិទ​ទីកន្លែង​សម្រាប់​កម្មវិធីនេះ។"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"ឧបករណ៍​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ព័ត៌មានលម្អិតចាប់​តាំងពី​សាកថ្ម​ពេញ​លើកចុងក្រោយ"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"សាកថ្មពេញលើកចុងក្រោយ"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ម៉ោងថ្មនៅសល់គឺជាតួលេខប្រហាក់ប្រហែល ហើយវាអាចផ្លាស់ប្តូរទៅតាមការប្រើប្រាស់"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ទិន្នន័យ​ប្រើប្រាស់​ថ្មគឺជា​ចំនួន​ប្រហាក់ប្រហែល និងអាច​មានការប្រែប្រួលទៅតាមការប្រើប្រាស់"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"ពេល​កំពុងប្រើប្រាស់​"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"ខណៈពេលនៅផ្ទៃខាងក្រោយ"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ការប្រើប្រាស់ថ្ម"</string>
@@ -2103,7 +2184,7 @@
     <string name="gadget_state_off" msgid="5220212352953066317">"បិទ"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"បើក"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"បិទ"</string>
-    <string name="gadget_wifi" msgid="4712584536500629417">"វ៉ាយហ្វាយ"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ប៊្លូធូស"</string>
     <string name="gadget_location" msgid="2974757497945178165">"ទី​តាំង​"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ធ្វើ​សម​កាល​កម្ម"</string>
@@ -2334,13 +2415,13 @@
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"ការ​ដាក់​កំហិតលើ​ទិន្នន័យ​ផ្ទៃ​ខាង​ក្រោយ​អាច​ធ្វើ​បាន​ លុះត្រាតែ​អ្នក​បាន​កំណត់​កម្រិត​ទិន្នន័យចល័ត​ហើយប៉ុណ្ណោះ។"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"បើក​ការ​ធ្វើ​សម​កាល​កម្ម​ទិន្នន័យ​ស្វ័យ​ប្រវត្តិ?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ការ​ផ្លាស់ប្ដូរ​ណា​មួយ​​ដែល​អ្នក​ធ្វើ​ចំពោះ​គណនី​របស់​អ្នក​នៅ​លើ​បណ្ដាញ​នឹង​ត្រូវ​បាន​ចម្លង​ដោយ​ស្វ័យ​ប្រវត្តិ​​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក។​\n\nគណនី​មួយ​ចំនួន​ក៏​អាច​ចម្លង​ការ​ផ្លាស់ប្ដូរ​ដោយ​ស្វ័យ​ប្រវត្តិ​ផង​ដែរ ពេល​អ្នក​ធ្វើ​លើ​​កុំព្យូទ័រ​បន្ទះ​ទៅ​បណ្ដាញ។ គណនី Google ធ្វើការ​តាម​វិធី​នេះ។"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ការ​ផ្លាស់ប្ដូរ​ណា​មួយ​ដែល​អ្នក​ធ្វើ​ចំពោះ​គណនី​របស់​អ្នក​នៅ​លើ​បណ្ដាញ នឹង​ត្រូវ​បាន​ចម្លង​ដោយ​ស្វ័យ​ប្រវត្តិ​ទៅ​ទូរស័ព្ទ​របស់​អ្នក។​\n\nគណនី​មួយ​ចំនួន​ក៏​អាច​ចម្លង​ការ​ផ្លាស់ប្ដូរ​ដោយ​ស្វ័យ​ប្រវត្តិ​ផង​ដែរ ពេល​អ្នក​ធ្វើ​លើ​ទូរស័ព្ទ​ទៅ​បណ្ដាញ។ គណនី Google ធ្វើការ​តាម​វិធី​នេះ។"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ការ​ផ្លាស់ប្ដូរ​ណា​មួយ​ដែល​អ្នក​ធ្វើ​ឡើងចំពោះ​គណនី​របស់​អ្នក​នៅ​លើ​បណ្ដាញ នឹង​ត្រូវ​បាន​ចម្លង​ដោយ​ស្វ័យ​ប្រវត្តិ​ទៅ​ទូរសព្ទ​របស់​អ្នក។​\n\nគណនី​មួយ​ចំនួន​ក៏​អាច​ចម្លង​ការ​ផ្លាស់ប្ដូរ​របស់អ្នក​នៅលើ​ទូរសព្ទ​ទៅ​បណ្ដាញដោយ​ស្វ័យ​ប្រវត្តិផងដែរ។ គណនី Google ដំណើរការ​តាម​វិធី​នេះ។"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"បិទ​ការ​ធ្វើ​សម​កាល​កម្ម​ទិន្នន័យ​ស្វ័យ​ប្រវត្តិ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"វា​នឹង​សន្សំ​ការ​ប្រើ​ទិន្នន័យ និង​ថ្ម ប៉ុន្តែ​អ្នក​ត្រូវ​តែ​ធ្វើ​សម​កាល​កម្ម​គណនី​នីមួយៗ​ដោយ​ខ្លួនឯង ដើម្បី​ប្រមូល​​ព័ត៌មាន​ថ្មីៗ។ អ្នក​នឹង​មិន​ទទួល​ការ​ជូន​ដំណឹង​ពេល​មាន​បច្ចុប្បន្នភាព​​ទេ។"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"កាលបរិច្ឆេទ​កំណត់​ខួប​​ប្រើ​ឡើង​វិញ"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"កាលបរិច្ឆេទ​នៃ​ខែ​នីមួយៗ៖"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"កំណត់"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"កំណត់​ការ​ព្រមាន​ការ​ប្រើ​ទិន្នន័យ"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"កំណត់​ការ​ព្រមានពី​ការ​ប្រើ​ទិន្នន័យ"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"កំណត់​ដែន​កំណត់​ប្រើទិន្នន័យ"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"កម្រិត​ការ​ប្រើ​ទិន្នន័យ"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ថេប្លេត​របស់​អ្នក​នឹង​បិទ​ទិន្នន័យ​ចល័ត ​នៅ​ពេល​ដែល​វា​ឈាន​ដល់កម្រិតដែល​អ្នក​បាន​កំណត់។\n\nដោយសារ​តែ​ការ​ប្រើ​ប្រាស់​ទិន្នន័យ​ត្រូវ​បាន​វាស់​ស្ទង់ដោយ​ថេប្លេតរបស់អ្នក ​ហើយក្រុមហ៊ុនបម្រើសេវាទូរសព្ទរបស់​អ្នកអាចគណនាលើការប្រើប្រាស់​ខុសពីនោះ សូមពិចារណា​លើការកំណត់កម្រិត​ដែលមានស្រាប់។"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"អ្នកអាចចែករំលែកឧបករណ៍នេះជាមួយមនុស្សផ្សេងទៀតដោយការបង្កើតអ្នកប្រើបន្ថែម។ អ្នកប្រើនីមួយៗមានចន្លោះប្រើផ្ទាល់ខ្លួន ដែលពួកគេអាចប្តូរតាមបំណងជាមួយកម្មវិធី ផ្ទាំងរូបភាព និងរបស់ផ្សេងទៀត។ អ្នកប្រើក៏អាចកែតម្រូវការកំណត់ឧបករណ៍ដូចជា Wi-Fi ផងដែរ ដែលវាប៉ះពាល់ដល់អ្នកប្រើផ្សេងទៀត។\n\nនៅពេលដែលអ្នកបន្ថែមអ្នកប្រើថ្មី បុគ្គលនោះត្រូវដំឡើងចន្លោះប្រើផ្ទាល់ខ្លួនរបស់គេ។\n\nអ្នកប្រើទាំងអស់អាចធ្វើបច្ចុប្បន្នភាពកម្មវិធីសម្រាប់អ្នកប្រើប្រាស់ផ្សេងទៀត។"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ពេល​អ្នក​បញ្ចូល​​អ្នកប្រើប្រាស់​​ថ្មី អ្នកប្រើ​ប្រាស់​នោះ​ត្រូវ​កំណត់​ទំហំ​ផ្ទាល់​របស់​គេ។\n\nអ្នកប្រើ​ប្រាស់​ណាក៏​​​អាច​ដំឡើងជំនាន់​​កម្មវិធី​សម្រាប់​អ្នកប្រើប្រាស់​​ផ្សេង​ទាំងអស់បានដែរ។"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"រៀបចំ​អ្នក​ប្រើ​ឥឡូវ?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"សូម​ប្រាកដ​ថា​​អ្នក​ប្រើ​នេះ​អាច​យក​​ឧបករណ៍ ​និង​រៀបចំ​​ទំហំ​របស់​គេ"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"សូម​ប្រាកដ​ថា​​អ្នក​ប្រើ​នេះ​អាច​យក​​ឧបករណ៍ ​និង​រៀបចំ​​ទំហំ​របស់​គេបាន"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"រៀបចំ​ប្រវត្តិរូប​ឥឡូវ?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"រៀបចំ​ឥឡូវ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"កុំអាល"</string>
@@ -2534,7 +2615,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"ប្រវត្តិ​ហៅ​នឹង​ត្រូវ​បាន​ចែករំលែក​ជា​មួយ​អ្នក​ប្រើ​នេះ។"</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"បើកការហៅទូរសព្ទ និងសារ SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ប្រវត្តិ​ហៅ និង​សារ SMS នឹង​ត្រូវ​បាន​ចែករំលែក​ជា​មួយ​អ្នកប្រើ​នេះ។"</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"ព័ត៌មានបន្ទាន់"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"ព័ត៌មានសង្រ្គោះបន្ទាន់"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"ព័ត៌មាន និង​ទំនាក់​ទំនង​សម្រាប់ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"អនុញ្ញាត​កម្មវិធី និង​មាតិកា"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"កម្មវិធី​មាន​ការ​ដាក់កម្រិត"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"អូសដើម្បីដោះសោ, ពាក្យសម្ងាត់, លំនាំ, កូដ PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"បញ្ហាប្រឈមក្នុងការងារ ការងារ ប្រវត្តិរូប"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ប្រវត្តិរូបការងារ ប្រវត្តិរូបដែលត្រូវបានគ្រប់គ្រង រួមបញ្ចូល ការរួមបញ្ចូល ការងារ ប្រវត្តិរូប"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"កាយវិការ"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ចលនា"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"បង់​ប្រាក់, ចុច, ការ​បង់​ប្រាក់"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ការបម្រុងទុក បម្រុងទុក"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ចលនា"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ប៉ះ​ស្លាក​ដើម្បី​សរសេរ..."</string>
@@ -2783,7 +2868,7 @@
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"នៅលើអេក្រង់ជាប់សោ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"បង្ហាញ​ខ្លឹមសារនៃការ​ជូនដំណឹង​ទាំងអស់"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"លាក់​ខ្លឹមសារ​​ជូនដំណឹង​​ដែលមានលក្ខណៈរសើប"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង​"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង​ឱ្យសោះ"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"នៅ​ពេល​ឧបករណ៍​របស់​អ្នក​ជាប់​សោ តើ​អ្នក​ចង់​ឲ្យ​ការ​ជូន​ដំណឹង​បង្ហាញ​ដោយ​របៀប​ណា?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"ការជូនដំណឹង"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"បង្ហាញមាតិកាការជូនដំណឹងការងារទាំងអស់"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ពីទំនាក់ទំនងមានផ្កាយតែប៉ុណ្ណោះ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"គ្មាន"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ម៉ោងរោទ៍"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ម៉ោងរោទ៍មានអាទិភាព​ និងមានបន្លឺសំឡេងជានិច្ច"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"កម្មវិធីរំលឹក"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ព្រឹត្តិការណ៍"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"អ្នកហៅទូរស័ព្ទទាំងអស់"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3290,14 +3392,13 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ការប្រើប្រាស់ទិន្នន័យអ៊ីសឺរណិត"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"អ៊ីសឺរណិត"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"ទិន្នន័យ​ចល័ត <xliff:g id="AMOUNT">^1</xliff:g>"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"ទិន្នន័យទូរសព្ទ​ចល័ត <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"ទិន្នន័យ Wi-Fi <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"ទិន្នន័យអ៊ីសឺរណិត <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <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>
@@ -3305,7 +3406,7 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"ការគណនាទិន្នន័យរបស់ក្រុមហ៊ុនបម្រើសេវាទូរសព្ទអាចនឹងខុសគ្នាពីការគណនាទិន្នន័យរបស់ឧបករណ៍"</string>
     <string name="data_used_template" msgid="3245919669966296505">"បានប្រើ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"កំណត់ការព្រមានពីការប្រើប្រាស់ទិន្នន័យ"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"កំណត់ការព្រមានពីការប្រើទិន្នន័យ"</string>
     <string name="data_warning" msgid="209133958008062117">"ការព្រមានពីការប្រើទិន្នន័យ"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"កំណត់ដែនកំណត់ទិន្នន័យ"</string>
     <string name="data_limit" msgid="1885406964934590552">"ដែនកំណត់ទិន្នន័យ"</string>
@@ -3317,7 +3418,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>
@@ -3338,7 +3439,7 @@
     <string name="not_battery_optimizing" msgid="5362861851864837617">"មិនប្រើការបង្កើនប្រសិទ្ធភាពថ្មទេ"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"ពេលឧបករណ៍ជាប់សោ ទប់ស្កាត់ការវាយអក្សរឆ្លើយតប ឬអត្ថបទផ្សេងទៀតនៅក្នុងការជូនដំណឹង"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"កម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធលំនាំដើម"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"ជ្រើសកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"ជ្រើសរើសកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"មិនបានជ្រើស"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(គ្មាន)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">"៖ "</string>
@@ -3381,8 +3482,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>
@@ -3452,26 +3552,33 @@
     <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_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="assist_gesture_title" msgid="7746563137898655539">"ចលនា​បើកកម្មវិធីជំនួយ"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"កម្រិតរំញោច"</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="gesture_setting_on" msgid="3455094265233870280">"បើក"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"បិទ"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader ត្រូវបានដោះសោរួចហើយ"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ធ្វើ​សមកាលកម្ម​ទិន្នន័យ​ការងារ​ដោយស្វ័យប្រវត្តិ"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"អនុញ្ញាតឲ្យ​កម្មវិធី​ផ្ទុក​ទិន្នន័យ​ឡើងវិញ​ដោយស្វ័យប្រវត្តិ"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"ធ្វើសមកាលកម្មគណនី"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"បើក​សមកាលកម្មសម្រាប់ធាតុ <xliff:g id="ID_1">%1$d</xliff:g> ក្នុងចំណោម <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"បើក​សមកាលកម្ម​សម្រាប់ធាតុ​ទាំងអស់"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"បិទ​សមកាលកម្ម​សម្រាប់ធាតុ​ទាំងអស់"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"ព័ត៌មាន​ឧបករណ៍​ដែល​ស្ថិតក្រោម​ការគ្រប់គ្រង"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"ការផ្លាស់ប្តូរ និង​ការកំណត់​ដែល​ស្ថិត​ក្រោម​ការ​គ្រប់គ្រង​របស់ស្ថាប័ន​អ្នក"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"ការផ្លាស់ប្តូរ និង​ការកំណត់ដែលស្ថិត​ក្រោមការគ្រប់គ្រងរបស់ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"តើមានអ្វីដែលថ្មី និងគួរឲ្យចាប់អារម្មណ៍ដែរទេ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"សូមពិនិត្យមើលមុខងារពេញនិយមទាំង 5"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"ស្ថានភាព​នៃការ​ចុះឈ្មោះ IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"បាន​ចុះឈ្មោះ"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"មិនបាន​ចុះឈ្មោះ"</string>
 </resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index bcd6f00008ba20fc93438770b151243953975a16..3dcbee46e62c32202e6b3bdc810587e9092b8783 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -21,7 +21,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="timezone_filters">
-    <item msgid="5296756001147094692">"ಅಮೆರಿಕಾ"</item>
+    <item msgid="5296756001147094692">"ಅಮೆರಿಕ"</item>
     <item msgid="3005562397632768392">"ಯೂರೋಪ್"</item>
     <item msgid="5696915123093701218">"ಆಫ್ರಿಕಾ"</item>
     <item msgid="4439789052790868249">"ಏಷ್ಯಾ"</item>
@@ -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 71d09eddba4f9ed8b94f214b3a32310dca950ce5..8e317d15a09703a36f677e9324a9b4522014550d 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>
@@ -86,12 +88,12 @@
     <string name="font_size_preview_text_headline" msgid="7955317408475392247">"ಮಾದರಿ ಪಠ್ಯ"</string>
     <string name="font_size_preview_text_title" msgid="1310536233106975546">"Oz ನ ಅದ್ಭುತವಾದ ವಿಜಾರ್ಡ್‌"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"ಅಧ್ಯಾಯ 11: Oz ನ ಅದ್ಭುತವಾದ ಎಮೆರಾಲ್ಡ್ ಸಿಟಿ"</string>
-    <string name="font_size_preview_text_body" msgid="2846183528684496723">"ಹಸಿರು ಕನ್ನಡಕಗಳ ಮೂಲಕ ಕಣ್ಣುಗಳನ್ನು ರಕ್ಷಿಸಿಕೊಳ್ಳುತ್ತಲೇ ಡರೋಥಿ ಹಾಗೂ ಅವರ  ಸ್ನೇಹಿತರು ಮೊದಲ ಬಾರಿಗೆ ಅದ್ಭುತ ನಗರದ ವೈಭವ ಕಂಡು ವಿಸ್ಮಯಗೊಂಡರು. ಬೀದಿಗಳ ಅಕ್ಕಪಕ್ಕ ಸುಂದರವಾದ ಮನೆಗಳಿದ್ದವು. ಎಲ್ಲವನ್ನೂ ಹಸಿರು ಅಮೃತ ಶಿಲೆಯಿಂದ ಕಟ್ಟಲಾಗಿತ್ತು ಹಾಗೂ ಹೊಳೆಯುವ ಪಚ್ಚೆಗಳಿಂದ ಎಲ್ಲೆಡೆ ಅಲಂಕರಿಸಲಾಗಿತ್ತು. ಅವರು ಅದೇ ಹಸಿರು ಅಮೃತ ಶಿಲೆ ಮತ್ತು ಪಚ್ಚೆಗಳ ಸಾಲುಗಳಿಂದ ಒಟ್ಟಿಗೆ ಕೂಡಿರುವ ರಸ್ತೆಗಳು, ಹತ್ತಿರ-ಹತ್ತಿರವಾಗಿ ಹೊಂದಿಸಲಾದ ಮತ್ತು ಸೂರ್ಯನ ಪ್ರಕಾಶತೆಯಲ್ಲಿ ಹೊಳೆಯುತ್ತಿರುವ ಕಾಲುಹಾದಿಯಲ್ಲಿ ನಡೆದರು. ಕಿಟಕಿಯ ಫಲಕಗಳನ್ನು ಹಸಿರು ಗಾಜಿನಿಂದ ಮಾಡಲಾಗಿತ್ತು; ಅಲ್ಲದೆ ನಗರದ ಆಕಾಶವೂ ಹಸಿರು ಛಾಯೆಯಿಂದ ಕೂಡಿತ್ತು ಮತ್ತು ಸೂರ್ಯನ ಕಿರಣಗಳು ಹಸಿರಿನಿಂದ ಕಂಗೊಳಿಸುತ್ತಿದ್ದವು. \n\nಅನೇಕ ಜನರು, ಪುರುಷರು, ಮಹಿಳೆಯರು ಮತ್ತು ಮಕ್ಕಳು ಬಂದಿದ್ದರು, ನಡೆದಾಡುತ್ತಿದ್ದರು ಹಾಗೂ ಈ ಎಲ್ಲರೂ ಹಸಿರು ಬಟ್ಟೆಯನ್ನು ಧರಿಸಿದ್ದರು ಜೊತೆಗೆ ಹಸಿರು ಚರ್ಮ ಹೊಂದಿದ್ದರು. ಅವರು ಡರೊಥಿಯನ್ನು ನೋಡಿದರು ಮತ್ತು ಅವರು ತಮ್ಮ ಚಕಿತಗೊಳ್ಳುವ ಕಣ್ಣುಗಳಿಂದ ಕಂಪನಿಯನ್ನು ಆಶ್ಚರ್ಯದಿಂದ ನೋಡುತ್ತಿದ್ದರು ಮತ್ತು ಎಲ್ಲಾ ಮಕ್ಕಳು ಸಿಂಹವನ್ನು ನೋಡಿದ ರೀತಿಯಲ್ಲಿ ತಮ್ಮ ತಾಯಿ ಹಿಂದೆ ಅಡಗಿಕೊಂಡವು; ಆದರೆ ಯಾರೊಬ್ಬರೂ ಇವರೊಂದಿಗೆ ಮಾತನಾಡಲಿಲ್ಲ. ಅನೇಕ ಅಂಗಡಿಗಳು ಬೀದಿಯಲ್ಲಿದ್ದವು, ಡರೊಥಿ ಮೂಲಕ ನೋಡಿದಾಗ ಅವುಗಳಲ್ಲಿ ಎಲ್ಲವೂ ಹಸಿರಾಗಿ ಕಂಡಿತು. ಮಾರಾಟಕ್ಕಿಡಲಾದ ಹಸಿರು ಕ್ಯಾಂಡಿ ಮತ್ತು ಹಸಿರು ಪಾಪ್‌-ಕಾರ್ನ್‌, ಜೊತೆಗೆ ಹಸಿರು ಶೂ, ಹಸಿರು ಟೋಪಿಗಳು ಮತ್ತು ಎಲ್ಲ ವಿಂಗಡನೆಗಳ ಹಸಿರು ಬಟ್ಟೆಗಳು ಮತ್ತು ಒಂದು ಸ್ಥಳದಲ್ಲಿ ಒಬ್ಬ ವ್ಯಕ್ತಿ ಹಸಿರು ನಿಂಬೆ ಪಾನಕ ಮಾರಾಟ ಮಾಡುತ್ತಿದ್ದನು ಮತ್ತು ಇದನ್ನು ಮಕ್ಕಳು ಖರೀದಿಸಿದಾಗ ಅವರು ಹಸಿರು ನಾಣ್ಯಗಳನ್ನು ಕೊಟ್ಟು ಖರೀದಿಸುತ್ತಿರುವುದನ್ನು ನೋಡಲಾಯಿತು. \n\nಯಾವುದೇ ಕುದುರೆಗಳು ಅಥವಾ ಯಾವುದೇ ರೀತಿಯ ಪ್ರಾಣಿಗಳು ಅಲ್ಲಿ ಕಾಣುತ್ತಿರಲಿಲ್ಲ; ಮಕ್ಕಳು ಬಂಡಿಯನ್ನು ತಳ್ಳುವುದಕ್ಕೂ ಮೊದಲು, ಒಬ್ಬ ವ್ಯಕ್ತಿಯು ಸಣ್ಣ ಹಸಿರು ಬಂಡಿಗಳಲ್ಲಿ ಸುತ್ತಮುತ್ತಲಿನ ವಸ್ತುಗಳನ್ನು ಸಾಗಿಸುತ್ತಿರುವುದು ಕಂಡುಬಂದಿತು. ಎಲ್ಲರೂ ಸಂತೋಷ ಮತ್ತು ತೃಪ್ತಿ ಹಾಗೂ ಸಮೃಧ್ಧ ಭಾವನೆಯಿಂದ ಇರುವಂತೆ ತೋರುತ್ತಿತ್ತು."</string>
+    <string name="font_size_preview_text_body" msgid="2846183528684496723">"ಹಸಿರು ಕನ್ನಡಕಗಳ ಮೂಲಕ ಕಣ್ಣುಗಳನ್ನು ರಕ್ಷಿಸಿಕೊಳ್ಳುತ್ತಲೇ ಡರೋಥಿ ಹಾಗೂ ಅವರ ಸ್ನೇಹಿತರು ಮೊದಲ ಬಾರಿಗೆ ಅದ್ಭುತ ನಗರದ ವೈಭವ ಕಂಡು ವಿಸ್ಮಯಗೊಂಡರು. ಬೀದಿಗಳ ಅಕ್ಕಪಕ್ಕ ಸುಂದರವಾದ ಮನೆಗಳಿದ್ದವು. ಎಲ್ಲವನ್ನೂ ಹಸಿರು ಅಮೃತ ಶಿಲೆಯಿಂದ ಕಟ್ಟಲಾಗಿತ್ತು ಹಾಗೂ ಹೊಳೆಯುವ ಪಚ್ಚೆಗಳಿಂದ ಎಲ್ಲೆಡೆ ಅಲಂಕರಿಸಲಾಗಿತ್ತು. ಅವರು ಅದೇ ಹಸಿರು ಅಮೃತ ಶಿಲೆ ಮತ್ತು ಪಚ್ಚೆಗಳ ಸಾಲುಗಳಿಂದ ಒಟ್ಟಿಗೆ ಕೂಡಿರುವ ರಸ್ತೆಗಳು, ಹತ್ತಿರ-ಹತ್ತಿರವಾಗಿ ಹೊಂದಿಸಲಾದ ಮತ್ತು ಸೂರ್ಯನ ಪ್ರಕಾಶತೆಯಲ್ಲಿ ಹೊಳೆಯುತ್ತಿರುವ ಕಾಲುಹಾದಿಯಲ್ಲಿ ನಡೆದರು. ಕಿಟಕಿಯ ಫಲಕಗಳನ್ನು ಹಸಿರು ಗಾಜಿನಿಂದ ಮಾಡಲಾಗಿತ್ತು; ಅಲ್ಲದೆ ನಗರದ ಆಕಾಶವೂ ಹಸಿರು ಛಾಯೆಯಿಂದ ಕೂಡಿತ್ತು ಮತ್ತು ಸೂರ್ಯನ ಕಿರಣಗಳು ಹಸಿರಿನಿಂದ ಕಂಗೊಳಿಸುತ್ತಿದ್ದವು. \n\nಅನೇಕ ಜನರು, ಪುರುಷರು, ಮಹಿಳೆಯರು ಮತ್ತು ಮಕ್ಕಳು ಬಂದಿದ್ದರು, ನಡೆದಾಡುತ್ತಿದ್ದರು ಹಾಗೂ ಈ ಎಲ್ಲರೂ ಹಸಿರು ಬಟ್ಟೆಯನ್ನು ಧರಿಸಿದ್ದರು ಜೊತೆಗೆ ಹಸಿರು ಚರ್ಮ ಹೊಂದಿದ್ದರು. ಅವರು ಡರೊಥಿಯನ್ನು ನೋಡಿದರು ಮತ್ತು ಅವರು ತಮ್ಮ ಚಕಿತಗೊಳ್ಳುವ ಕಣ್ಣುಗಳಿಂದ ಕಂಪನಿಯನ್ನು ಆಶ್ಚರ್ಯದಿಂದ ನೋಡುತ್ತಿದ್ದರು ಮತ್ತು ಎಲ್ಲಾ ಮಕ್ಕಳು ಸಿಂಹವನ್ನು ನೋಡಿದ ರೀತಿಯಲ್ಲಿ ತಮ್ಮ ತಾಯಿ ಹಿಂದೆ ಅಡಗಿಕೊಂಡವು; ಆದರೆ ಯಾರೊಬ್ಬರೂ ಇವರೊಂದಿಗೆ ಮಾತನಾಡಲಿಲ್ಲ. ಅನೇಕ ಅಂಗಡಿಗಳು ಬೀದಿಯಲ್ಲಿದ್ದವು, ಡರೊಥಿ ಮೂಲಕ ನೋಡಿದಾಗ ಅವುಗಳಲ್ಲಿ ಎಲ್ಲವೂ ಹಸಿರಾಗಿ ಕಂಡಿತು. ಮಾರಾಟಕ್ಕಿಡಲಾದ ಹಸಿರು ಕ್ಯಾಂಡಿ ಮತ್ತು ಹಸಿರು ಪಾಪ್‌-ಕಾರ್ನ್‌, ಜೊತೆಗೆ ಹಸಿರು ಶೂ, ಹಸಿರು ಟೋಪಿಗಳು ಮತ್ತು ಎಲ್ಲ ವಿಂಗಡನೆಗಳ ಹಸಿರು ಬಟ್ಟೆಗಳು ಮತ್ತು ಒಂದು ಸ್ಥಳದಲ್ಲಿ ಒಬ್ಬ ವ್ಯಕ್ತಿ ಹಸಿರು ನಿಂಬೆ ಪಾನಕ ಮಾರಾಟ ಮಾಡುತ್ತಿದ್ದನು ಮತ್ತು ಇದನ್ನು ಮಕ್ಕಳು ಖರೀದಿಸಿದಾಗ ಅವರು ಹಸಿರು ನಾಣ್ಯಗಳನ್ನು ಕೊಟ್ಟು ಖರೀದಿಸುತ್ತಿರುವುದನ್ನು ನೋಡಲಾಯಿತು. \n\nಯಾವುದೇ ಕುದುರೆಗಳು ಅಥವಾ ಯಾವುದೇ ರೀತಿಯ ಪ್ರಾಣಿಗಳು ಅಲ್ಲಿ ಕಾಣುತ್ತಿರಲಿಲ್ಲ; ಮಕ್ಕಳು ಬಂಡಿಯನ್ನು ತಳ್ಳುವುದಕ್ಕೂ ಮೊದಲು, ಒಬ್ಬ ವ್ಯಕ್ತಿಯು ಸಣ್ಣ ಹಸಿರು ಬಂಡಿಗಳಲ್ಲಿ ಸುತ್ತಮುತ್ತಲಿನ ವಸ್ತುಗಳನ್ನು ಸಾಗಿಸುತ್ತಿರುವುದು ಕಂಡುಬಂದಿತು. ಎಲ್ಲರೂ ಸಂತೋಷ ಮತ್ತು ತೃಪ್ತಿ ಹಾಗೂ ಸಮೃಧ್ಧ ಭಾವನೆಯಿಂದ ಇರುವಂತೆ ತೋರುತ್ತಿತ್ತು."</string>
     <string name="font_size_save" msgid="3450855718056759095">"ಸರಿ"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB ಸಂಗ್ರಹಣೆ"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD ಕಾರ್ಡ್"</string>
     <string name="bluetooth" msgid="5549625000628014477">"ಬ್ಲೂಟೂತ್‌‌"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ಹತ್ತಿರದ ಎಲ್ಲ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳಿಗೆ ಗೋಚರಿಸುತ್ತದೆ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ಹತ್ತಿರದ ಎಲ್ಲ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳಿಗೆ ಗೋಚರಿಸುತ್ತದೆ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ಹತ್ತಿರದ ಎಲ್ಲ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳಿಗೆ ಗೋಚರಿಸುತ್ತದೆ"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ಇತರೆ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳಿಗೆ ಗೋಚರಿಸುವುದಿಲ್ಲ"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ಜೋಡಣೆಗೊಂಡ ಸಾಧನಗಳಿಗೆ ಮಾತ್ರ ಗೋಚರಿಸುತ್ತದೆ"</string>
@@ -104,12 +106,19 @@
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"ಪ್ರೊಫೈಲ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"ಯಾವುದೇ ಹೆಸರನ್ನು ಹೊಂದಿಸಿಲ್ಲ, ಖಾತೆಯ ಹೆಸರನ್ನು ಬಳಸಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"ಸಾಧನಗಳಿಗಾಗಿ ಸ್ಕ್ಯಾನ್ ಮಾಡು"</string>
-    <string name="bluetooth_rename_device" msgid="4352483834491958740">"ಈ ಸಾಧನವನ್ನು ಮರುಹೆಸರಿಸು"</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) -->
@@ -210,7 +222,7 @@
     <string name="ping_test_label" msgid="579228584343892613">"ಪಿಂಗ್ ಪರೀಕ್ಷೆ ರನ್ ಮಾಡಿ"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
     <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"ಅಪ್‌ಡೇಟ್‌ ಮಾಡು"</string>
-    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"ರೀಫ್ರೆಶ್ ಮಾಡಿ"</string>
+    <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS ಪರಿಶೀಲನೆ ಟಾಗಲ್ ಮಾಡಿ"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-ನಿರ್ದಿಷ್ಟ ಮಾಹಿತಿ/ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="band_mode_title" msgid="4071411679019296568">"ರೇಡಿಯೋ ಬ್ಯಾಂಡ್ ಮೋಡ್ ಹೊಂದಿಸಿ"</string>
@@ -274,7 +286,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"ಇನ್ನಷ್ಟು"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ವಯರ್‌ಲೆಸ್ &amp; ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, ಬ್ಲೂಟೂತ್‌‌, ಏರೋಪ್ಲೇನ್ ಮೋಡ್, ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗಳು, &amp; VPN ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"ವೈ-ಫೈ, ಬ್ಲೂಟೂತ್, ಏರೋಪ್ಲೇನ್ ಮೋಡ್, ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗಳು, &amp; VPN ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"ಮೊಬೈಲ್ ಡೇಟಾ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ಕರೆಗಳು"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS ಸಂದೇಶಗಳು"</string>
@@ -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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ನಂತರ ಮಾಡಿ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ಬೆರಳಚ್ಚು ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಒಂದು ಮಾರ್ಗವಾಗಿ ನಿಮ್ಮ ಬೆರಳಚ್ಚು ಅನ್ನು ಬಳಸಲು ನೀವು ಆಯ್ಕೆಮಾಡಿರುವಿರಿ. ನೀವು ಇದೀಗ ಸ್ಕಿಪ್ ಮಾಡಿದರೆ, ನೀವು ಇದನ್ನು ನಂತರ ಹೊಂದಿಸುವ ಅಗತ್ಯವಿರುತ್ತದೆ. ಸೆಟಪ್ ಕೇವಲ ನಿಮಿಷದಷ್ಟು ಸಮಯವನ್ನು ತೆಗೆದುಕೊಳ್ಳುತ್ತದೆ."</string>
     <string name="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="1688030823464420974">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪ್ಯಾಟರ್ನ್‌ ನಮೂದಿಸಿದರೆ, ಈ ಸಾಧನದ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಿನ್ ನಮೂದಿಸಿದರೆ, ಈ ಸಾಧನದ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"ಮುಂದಿನ ಬಾರಿ ನೀವು ತಪ್ಪಾದ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸಿದರೆ, ಈ ಸಾಧನದ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು"</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="5047439819181833824">"ಹಲವಾರು ಬಾರಿ ತಪ್ಪಾಗಿ ಪ್ರಯತ್ನಿಸಿದ್ದೀರಿ. ಈ ಸಾಧನದ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</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>
@@ -612,7 +633,7 @@
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ಈ ಸಾಧನದ ಜೊತೆಗೆ ಜೋಡಿ ಮಾಡುವುದೇ?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ಫೋನ್ ಪುಸ್ತಕವನ್ನು ಹಂಚಿಕೊಳ್ಳುವುದೇ?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆಯ ಇತಿಹಾಸವನ್ನು ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"ಬ್ಲೂಟೂತ್ ಜೊತೆಗೆ ಜೋಡಿಸಲು <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಬಯಸುತ್ತದೆ. ಸಂಪರ್ಕಪಡಿಸಿದಾಗ, ಅದು ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಪಡೆಯುತ್ತದೆ."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"ಬ್ಲೂಟೂತ್ ಜೊತೆಗೆ ಜೋಡಿಸಲು <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಬಯಸುತ್ತದೆ. ಸಂಪರ್ಕಗೊಳಿಸಿದಾಗ, ಅದು ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಪಡೆಯುತ್ತದೆ."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ಜೋಡಿ ಮಾಡಲಾದ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"ಲಭ್ಯವಿರುವ ಸಾಧನಗಳು"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"ಯಾವುದೇ ಸಾಧನಗಳು ಲಭ್ಯವಿಲ್ಲ"</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>
@@ -691,12 +720,15 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"ವೈ-ಫೈ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಿ"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ಉಳಿಸಿರುವ ಅಧಿಕ-ಗುಣಮಟ್ಟದ ನೆಟ್‌ವರ್ಕ್‌ಗಳ ಸಮೀಪದಲ್ಲಿರುವಾಗ, ಉದಾಹರಣೆಗೆ ನಿಮ್ಮ ಮನೆಯ ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ವೈ-ಫೈ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್ ಆಫ್ ಆಗಿರುವ ಕಾರಣ ಇದು ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ಬಳಸಲು, ನೆಟ್‌ವರ್ಕ್ ರೇಟಿಂಗ್ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ಕಳಪೆ ಸಂಪರ್ಕಗಳಿಂದ ದೂರವಿರು"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Wi‑Fi ನೆಟ್‌ವರ್ಕ್‌ ಉತ್ತಮ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಹೊಂದಿಲ್ಲದಿದ್ದರೆ ಅದನ್ನು ಬಳಸಬೇಡ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ಉತ್ತಮ ಇಂಟರ್ನೆಟ್‌ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿರುವ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಮಾತ್ರ ಬಳಸಿ"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ಮುಕ್ತ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ಅಧಿಕ-ಗುಣಮಟ್ಟದ ಸಾರ್ವಜನಿಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಪರ್ಕಿಸಿ"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸು"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ಬಳಸಲು, ನೆಟ್‌ವರ್ಕ್ ರೇಟಿಂಗ್ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ಬಳಸಲು, ಹೊಂದಾಣಿಕೆಯ ನೆಟ್‌ವರ್ಕ್ ರೇಟಿಂಗ್ ಒದಗಿಸುವವರನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಲು, ಸಿಸ್ಟಂ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳು ಇನ್ನೂ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸ್ಕ್ಯಾನ್ ಮಾಡಬಹುದು. ನೀವು ಇದನ್ನು <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ಸ್ಕ್ಯಾನ್‌ ಮಾಡುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು<xliff:g id="LINK_END_1">LINK_END</xliff:g> ನಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ಸ್ಥಳದ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ಸ್ಕ್ಯಾನಿಂಗ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್ ಆನ್ ಮಾಡಿ."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ಮತ್ತೊಮ್ಮೆ ತೋರಿಸಬೇಡ"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -845,17 +877,25 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ಆಹ್ವಾನವನ್ನು ರದ್ದುಪಡಿಸುವುದೇ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಆಹ್ವಾನವನ್ನು ರದ್ದುಪಡಿಸಲು ನೀವು ಬಯಸುತ್ತೀರಾ?"</string>
     <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_tether_checkbox_text" msgid="1847167643625779136">"ಪೋರ್ಟಬಲ್ ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್"</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>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"ಪೋರ್ಟಬಲ್ Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌ ದೋಷ ಎದುರಾಗಿದೆ"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌‌ ಹೊಂದಿಸಿ"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಸೆಟಪ್"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"ಪೋರ್ಟಬಲ್ ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ದೋಷ ಎದುರಾಗಿದೆ"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಹೊಂದಿಸಿ"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ಸೆಟಪ್"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ಹಾಟ್‌ಸ್ಪಾಟ್"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"ಯಾವಾಗಲೂ ಆನ್ / ಅಧಿಕ ಬ್ಯಾಟರಿ ಬಳಕೆ"</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="6978257596231155345">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್‌ಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ. ಅಧಿಕ ಬ್ಯಾಟರಿ ಬಳಕೆ."</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>
@@ -1152,7 +1199,7 @@
     <string name="storage_low_summary" msgid="7737465774892563129">"ಸಿಂಕ್‌ ಮಾಡುವುದರಂತಹ ಕೆಲವು ಸಿಸ್ಟಂ ಕ್ರಿಯೆಗಳು ಸೂಕ್ತ ರೀತಿಯಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು. ಅಪ್ಲಿಕೇಶನ್‌ ಅಥವಾ ಮಾಧ್ಯಮ ವಿಷಯದಂತಹ ಐಟಂಗಳನ್ನು ಅಳಿಸಿಹಾಕಿ ಅಥವಾ ಅನ್‌ಪಿನ್‌ ಮಾಡುವ ಮೂಲಕ ಸ್ಥಳವನ್ನು ಖಾಲಿಯಾಗಿರಿಸುವಂತೆ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"ಮರುಹೆಸರಿಸು"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"ಅಳವಡಿಸಿ"</string>
-    <string name="storage_menu_unmount" msgid="681485356885955898">"ಎಜೆಕ್ಟ್‌‌"</string>
+    <string name="storage_menu_unmount" msgid="681485356885955898">"ಇಜೆಕ್ಟ್‌‌"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"ಫಾರ್ಮ್ಯಾಟ್‌"</string>
     <string name="storage_menu_format_public" msgid="7464714208010125682">"ಪೋರ್ಟಬಲ್‌ನಂತೆ ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿ"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"ಆಂತರಿಕವಾಗಿ ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿ"</string>
@@ -1180,15 +1227,15 @@
     <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> ಅಳವಡಿಸಲಾಗಿದೆ"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"<xliff:g id="NAME">%1$s</xliff:g> ಅಳವಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> ಸುರಕ್ಷಿತವಾಗಿ ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string>
-    <string name="storage_unmount_failure" msgid="5758387106579519489">"<xliff:g id="NAME">%1$s</xliff:g> ಸುರಕ್ಷಿತವಾಗಿ ಎಜೆಕ್ಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
+    <string name="storage_unmount_failure" msgid="5758387106579519489">"<xliff:g id="NAME">%1$s</xliff:g> ಸುರಕ್ಷಿತವಾಗಿ ಇಜೆಕ್ಟ್‌ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"<xliff:g id="NAME">%1$s</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"ಸಂಗ್ರಹಣೆಯನ್ನು ಮರುಹೆಸರಿಸಿ"</string>
-    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"<xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಎಜೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ ಇನ್ನೂ ಲಭ್ಯವಿದೆ. \n\n <xliff:g id="NAME_1">^1</xliff:g> ಅನ್ನು ಬಳಸಲು, ನೀವು ಮೊದಲಿಗೆ ಅದನ್ನು ಅಳವಡಿಸಬೇಕು."</string>
+    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"<xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಇಜೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ ಇನ್ನೂ ಲಭ್ಯವಿದೆ. \n\n <xliff:g id="NAME_1">^1</xliff:g> ಅನ್ನು ಬಳಸಲು, ನೀವು ಮೊದಲಿಗೆ ಅದನ್ನು ಅಳವಡಿಸಬೇಕು."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"ಇದು <xliff:g id="NAME_0">^1</xliff:g> ದೋಷಪೂರಿತವಾಗಿದೆ. \n\nಇದನ್ನು ಬಳಸಲು <xliff:g id="NAME_1">^1</xliff:g>, ಮೊದಲಿಗೆ ನೀವು ಅದನ್ನು ಹೊಂದಿಸಬೇಕು."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"ಈ ಸಾಧನವು <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. \n\nಈ ಸಾಧನದೊಂದಿಗೆ <xliff:g id="NAME_1">^1</xliff:g> ಅನ್ನು ಬಳಸಲು, ಮೊದಲಿಗೆ ನೀವು ಇದನ್ನು ಹೊಂದಿಸಬೇಕು."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿದ ನಂತರ, ನೀವು ಈ <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಇತರ ಸಾಧನಗಳಲ್ಲಿ ಬಳಸಬಹುದು. \n\n<xliff:g id="NAME_1">^1</xliff:g> ರಲ್ಲಿನ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು. ಮೊದಲು ಬ್ಯಾಕಪ್ ಮಾಡುವುದನ್ನು ಪರಿಗಣಿಸಿ. \n\n"<b>"ಫೋಟೋಗಳು &amp; ಇತರ ಮಾಧ್ಯಮವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ"</b>" \nನಿಮ್ಮ ಮಾಧ್ಯಮ ಫೈಲ್‌ಗಳನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಪರ್ಯಾಯ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ ಅಥವಾ USB ಕೇಬಲ್ ಬಳಸುವ ಮೂಲಕ ಅವುಗಳನ್ನು ಕಂಪ್ಯೂಟರ್‌ಗೆ ವರ್ಗಾಯಿಸಿ. \n\n"<b>"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ"</b>" \nಈ <xliff:g id="NAME_6">^1</xliff:g> ರಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಸ್ಥಾಪಿಸಲಾಗುವುದು ಮತ್ತು ಅವುಗಳ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುವುದು. ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಇರಿಸಿಕೊಳ್ಳಲು, ಅವುಗಳನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಪರ್ಯಾಯ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ."</string>
-    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"ನೀವು <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಎಜೆಕ್ಟ್ ಮಾಡಿದಾಗ, ಅದರಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸುತ್ತವೆ ಮತ್ತು ಅದರಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಮಾಧ್ಯಮ ಫೈಲ್‌ಗಳು ಅದನ್ನು ಮರು ಸೇರಿಸುವವರಗೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ಇದನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ ಕಾರ್ಯನಿರ್ವಹಿಸಲು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗಿದೆ. ಇದು ಯಾವುದೇ ಇತರ ಸಾಧನಗಳಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"ನೀವು <xliff:g id="NAME_0">^1</xliff:g> ಅನ್ನು ಇಜೆಕ್ಟ್ ಮಾಡಿದಾಗ, ಅದರಲ್ಲಿ ಸಂಗ್ರಹವಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸುವುದನ್ನು ನಿಲ್ಲಿಸುತ್ತವೆ ಮತ್ತು ಅದರಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಮಾಧ್ಯಮ ಫೈಲ್‌ಗಳು ಅದನ್ನು ಮರು ಸೇರಿಸುವವರಗೆ ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g> ಇದನ್ನು ಈ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ ಕಾರ್ಯನಿರ್ವಹಿಸಲು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗಿದೆ. ಇದು ಯಾವುದೇ ಇತರ ಸಾಧನಗಳಲ್ಲಿ ಕಾರ್ಯನಿರ್ವಹಿಸುವುದಿಲ್ಲ."</string>
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಫೋಟೋಗಳು ಅಥವಾ ಡೇಟಾ ಬಳಸಲು ಇದು <xliff:g id="NAME">^1</xliff:g> ಹೊಂದಿರುತ್ತದೆ, ಅದನ್ನು ಮರುಸೇರಿಸಿ. \n\nಪರ್ಯಾಯವಾಗಿ, ಸಾಧನವು ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ ಸಂಗ್ರಹಣೆಯನ್ನು ಮರೆತುಬಿಡು ಅನ್ನು ನೀವು ಆಯ್ಕೆ ಮಾಡಬಹುದು. \n\nನೀವು ಮರೆತುಬಿಡು ಆಯ್ಕೆಮಾಡಿದರೆ, ಸಾಧನ ಹೊಂದಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ. \n\nನೀವು ನಂತರದಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಬಹುದು, ಆದರೆ ಈ ಸಾಧನದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾದ ಅದರ ಡೇಟಾ ಕಳೆದು ಹೋಗುತ್ತದೆ."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ಮರೆತುಹೋಯಿತೇ?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಫೋಟೋಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಈ <xliff:g id="NAME">^1</xliff:g> ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಿದರೆ ಶಾಶ್ವತವಾಗಿ ಕಳೆದುಹೋಗುತ್ತದೆ."</string>
@@ -1200,7 +1247,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"ಇತರೆ"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"ಸಿಸ್ಟಂ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಉಳಿಸಿರುವ ಹಂಚಿದ ಫೈಲ್‌ಗಳು, ಇಂಟರ್ನೆಟ್ ಅಥವಾ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಫೈಲ್‌ಗಳು, Android ಫೈಲ್‌ಗಳು ಹಾಗೂ ಇನ್ನಷ್ಟು ಇತರವುಗಳು ಒಳಗೊಂಡಿರುತ್ತವೆ. \n\n<xliff:g id="NAME">^1</xliff:g> ಇದರ ಗೋಚರಿಸುವ ವಿಷಯಗಳನ್ನು ವೀಕ್ಷಿಸಲು, ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಉಳಿಸಿರುವ ಹಂಚಿದ ಫೈಲ್‌ಗಳು, ಇಂಟರ್ನೆಟ್ ಅಥವಾ ಬ್ಲೂಟೂತ್ ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಫೈಲ್‌ಗಳು, Android ಫೈಲ್‌ಗಳು ಹಾಗೂ ಇನ್ನಷ್ಟು ಇತರವುಗಳು ಒಳಗೊಂಡಿರುತ್ತವೆ. \n\n ಇದರ ಗೋಚರಿಸುವ ವಿಷಯಗಳನ್ನು ವೀಕ್ಷಿಸಲು <xliff:g id="NAME">^1</xliff:g>, ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"Android ಆವೃತ್ತಿ <xliff:g id="VERSION">%s</xliff:g> ರನ್ ಮಾಡಲು ಬಳಸುವ ಫೈಲ್‌ಗಳನ್ನು ಸಿಸ್ಟಂ ಒಳಗೊಂಡಿದೆ"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ಅವರು <xliff:g id="SIZE">^2</xliff:g> ಸಂಗ್ರಹಣೆ ಬಳಸಿ ಫೋಟೋಗಳು, ಸಂಗೀತ, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಥವಾ ಇತರ ಡೇಟಾವನ್ನು ಉಳಿಸಿರಬಹುದು. \n\nವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಲು <xliff:g id="USER_1">^1</xliff:g> ಗೆ ಬದಲಾಯಿಸಿ."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ನಿಮ್ಮ <xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಹೊಂದಿಸಿ"</string>
@@ -1242,7 +1289,7 @@
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"ಪ್ರಾಕ್ಸಿ"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"ಪೋರ್ಟ್"</string>
-    <string name="apn_user" msgid="455637547356117761">"ಬಳಕೆದಾರಹೆಸರು"</string>
+    <string name="apn_user" msgid="455637547356117761">"ಬಳಕೆದಾರರಹೆಸರು"</string>
     <string name="apn_password" msgid="5412301994998250968">"ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="apn_server" msgid="2436185314756372858">"ಸರ್ವರ್"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ನೀವು ಪ್ರಸ್ತುತ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ಈ ಸಾಧನದಲ್ಲಿ ಪ್ರಸ್ತುತ ಇತರ ಬಳಕೆದಾರರಿದ್ದಾರೆ.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ಸಂಗೀತ"</li>\n<li>"ಫೋಟೋಗಳು"</li>\n<li>"ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM ನಲ್ಲಿನ ವಾಹಕಗಳು"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"USB ಸಂಗ್ರಹಣೆಯನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರೆ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"SD ಕಾರ್ಡ್‌ ಅನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಿ"</string>
     <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 +1377,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,22 +1418,22 @@
     <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>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಂ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಂ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಥಳ"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"ವೈ-ಫೈ,ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಥಳ"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಅತಿ ವೇಗವಾಗಿ ಅಂದಾಜು ಮಾಡಲು Google ನ ಸ್ಥಳ ಸೇವೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿ. ಅನಾಮಧೇಯ ಸ್ಥಳದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುವುದು ಮತ್ತು Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದು."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ವೈ-ಫೈ ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS ಉಪಗ್ರಹಗಳು"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಗುರುತಿಸುವ ಸಲುವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ನಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು GPS ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಗುರುತಿಸುವ ಸಲುವಾಗಿ ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು GPS ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"ಸಹಾಯಕ GPS ಬಳಸು"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ಗೆ ನೆರವಾಗಲು ಸರ್ವರ್‌ ಅನ್ನು ಬಳಸಿ (ನೆಟ್‌ವರ್ಕ್‌ ಬಳಕೆಯನ್ನು ಕಡಿಮೆ ಮಾಡಲು ಗುರುತು ತೆಗೆಯಿರಿ)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ಗೆ ನೆರವಾಗಲು ಸರ್ವರ್‌ ಬಳಸಿ (GPS ಕೆಲಸ ನಿರ್ವಹಣೆಯನ್ನು ಸುಧಾರಿಸಲು ಗುರುತು ತೆಗೆಯಿರಿ)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"ಸ್ಥಳ &amp; Google ಹುಡುಕಾಟ"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"ಸ್ಥಾನ &amp; Google ಹುಡುಕಾಟ"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"ಹುಡುಕಾಟ ಫಲಿತಾಂಶಗಳು ಮತ್ತು ಇತರೆ ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸುವುದಕ್ಕಾಗಿ ನಿಮ್ಮ ಸ್ಥಾನವನ್ನು ಬಳಸಲು Google ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡಿ"</string>
     <string name="location_access_title" msgid="7064108942964081243">"ನನ್ನ ಸ್ಥಳಕ್ಕೆ ಪ್ರವೇಶ"</string>
     <string name="location_access_summary" msgid="69031404093194341">"ನಿಮ್ಮ ಅನುಮತಿಯನ್ನು ಕೇಳುವ ಅಪ್ಲಿಕೇಶನ್‌‌ಗೆ ನಿಮ್ಮ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
@@ -1421,8 +1463,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>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"ಪ್ಯಾಟರ್ನ್ ಕಾಣಿಸುವಂತೆ ಮಾಡು"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"ಪ್ರೊಫೈಲ್ ಪ್ಯಾಟರ್ನ್ ಕಾಣಿಸುವಂತೆ ಮಾಡಿ"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ವೈಬ್ರೇಟ್‌ ಆಗು"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ಪವರ್ ಬಟನ್ ಲಾಕ್ ಆಗು"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ಪವರ್ ಬಟನ್ ಲಾಕ್ ಆಗುತ್ತದೆ"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ಮೂಲಕ ಅನ್‌ಲಾಕ್ ಮಾಡಿದ ಸ್ಥಿತಿಯನ್ನು ಹೊರತುಪಡಿಸಿ"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಬದಲಾಯಿಸಿ"</string>
@@ -1491,6 +1536,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>
@@ -1501,9 +1549,9 @@
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ಡೀಫಾಲ್ಟ್‌ಗಳು"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"ಪರದೆಯ ಹೊಂದಾಣಿಕೆ"</string>
     <string name="permissions_label" msgid="2605296874922726203">"ಅನುಮತಿಗಳು"</string>
-    <string name="cache_header_label" msgid="1877197634162461830">"ಸಂಗ್ರಹ"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ಸಂಗ್ರಹ ಅಳಿಸಿ"</string>
-    <string name="cache_size_label" msgid="7505481393108282913">"ಸಂಗ್ರಹ"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"ಕ್ಯಾಷ್"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ಕ್ಯಾಷ್ ಅಳಿಸಿ"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"ಕ್ಯಾಷ್"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
       <item quantity="one">%d ಐಟಂಗಳು</item>
       <item quantity="other">%d ಐಟಂಗಳು</item>
@@ -1517,13 +1565,13 @@
     <string name="data_size_label" msgid="6117971066063850416">"ಬಳಕೆದಾರರ ಡೇಟಾ"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB ಸಂಗ್ರಹಣೆ ಡೇಟಾ"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD ಕಾರ್ಡ್"</string>
-    <string name="uninstall_text" msgid="3644892466144802466">"ಅಸ್ಥಾಪಿಸು"</string>
-    <string name="uninstall_all_users_text" msgid="851857393177950340">"ಎಲ್ಲ ಬಳಕೆದಾರರಿಗಾಗಿ ಅಸ್ಥಾಪಿಸು"</string>
-    <string name="install_text" msgid="884360662922471113">"ಸ್ಥಾಪಿಸು"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"ಎಲ್ಲ ಬಳಕೆದಾರರಿಗಾಗಿ ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
+    <string name="install_text" msgid="884360662922471113">"ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="disable_text" msgid="6544054052049395202">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="enable_text" msgid="9217362512327828987">"ಸಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"ಡೇಟಾ ಅಳಿಸಿ"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"ನವೀಕರಣಗಳನ್ನು ಅಸ್ಥಾಪಿಸಿ"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"ನವೀಕರಣಗಳನ್ನು ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"ಕೆಲವು ಕ್ರಮಗಳಿಗಾಗಿ ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಡಿಫಾಲ್ಟ್ ಆಗಿ ಪ್ರಾರಂಭಿಸಲು ನೀವು ಆಯ್ಕೆ ಮಾಡಿರುವಿರಿ."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅನುಮತಿಸಲು ನೀವು ವಿಜೆಟ್‌ಗಳನ್ನು ರಚಿಸಲು ಮತ್ತು ಅವುಗಳ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲು ಆಯ್ಕೆಮಾಡಿಕೊಂಡಿರುವಿರಿ."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ."</string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ಪರದೆ ರೀಡರ್‌ಗಳು, ಡಿಸ್‌ಪ್ಲೇ, ಸಂವಾದ ನಿಯಂತ್ರಕಗಳು"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ವಿಷನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ನಿಮ್ಮ ಅಗತ್ಯಗಳಿಗೆ ಸರಿಹೊಂದುವಂತೆ ಈ ಸಾಧನವನ್ನು ನೀವು ಕಸ್ಟಮೈಸ್ ಮಾಡಬಹುದು. ಈ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನಂತರ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ಫಾಂಟ್ ಗಾತ್ರವನ್ನು ಹೆಚ್ಚಿಸಿ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ಪರದೆ ರೀಡರ್‌ಗಳು"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ಆಡಿಯೋ ಮತ್ತು ಪರದೆಯ ಮೇಲಿನ ಪಠ್ಯ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ಪ್ರದರ್ಶನ"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಸಾಧನವನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಸಾಧನ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g>ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, <xliff:g id="APP_1">%1$s</xliff:g> ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g>ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, <xliff:g id="APP_1">%1$s</xliff:g>ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g>ನಿಮ್ಮ ಸಾಧನವನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಸಾಧನ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, <xliff:g id="APP_1">%1$s</xliff:g> ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಲ್ಲಿಸಿ"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"ಹಿನ್ನೆಲೆ ಬಳಕೆಯನ್ನು ಆಫ್ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಗಿತಗೊಳಿಸಬೇಕೆ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಬಗೆಹರಿಸಲು ಪ್ರಯತ್ನಿಸಲು, ನೀವು <xliff:g id="APP_1">%1$s</xliff:g> ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು ಮತ್ತು ಅದು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಕೆಲಸ ಮಾಡುವುದನ್ನು ತಡೆಯಬಹುದು."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಬಗೆಹರಿಸಲು ಪ್ರಯತ್ನಿಸಲು, ನೀವು <xliff:g id="APP_1">%1$s</xliff:g> ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು ಮತ್ತು ಅದು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಕೆಲಸ ಮಾಡುವುದನ್ನು ತಡೆಯಬಹುದು."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> ನಿಮ್ಮ ಸಾಧನವನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಸಾಧನವು ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಬಗೆಹರಿಸಲು ಪ್ರಯತ್ನಿಸಲು, ನೀವು <xliff:g id="APP_1">%1$s</xliff:g> ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು ಮತ್ತು ಅದು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಕೆಲಸ ಮಾಡುವುದನ್ನು ತಡೆಯಬಹುದು."</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="7774807745601479888">"<xliff:g id="APP">%1$s</xliff:g> ಅನ್ನು ನೀವು ಬಳಸದೇ ಇರುವಾಗ ಅದು ನಿಮ್ಮ ಸ್ಥಳ ವಿನಂತಿಯನ್ನು ಮಾಡುತ್ತಲೇ ಇರುವುದರಿಂದ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್‌ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಈ ಅಪ್ಲಿಕೇಶನ್‌ನ ಸ್ಥಳವನ್ನು ಆಫ್‌ ಮಾಡಬಹುದು."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"<xliff:g id="APP">%1$s</xliff:g> ಅನ್ನು ನೀವು ಬಳಸದೇ ಇದ್ದಾಗ ಅದು ನಿಮ್ಮ ಸ್ಥಳ ವಿನಂತಿಯನ್ನು ಮಾಡುತ್ತಲೇ ಇರುವುದರಿಂದ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ಗೆ ಬ್ಯಾಟರಿಯನ್ನು ನಿಭಾಯಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಈ ಆಪ್‌ಗಾಗಿ ಸ್ಥಳವನ್ನು ಆಫ್‌ ಮಾಡಬಹುದು."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"<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 +2033,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>
@@ -1996,7 +2076,7 @@
     <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"ನೀವು ಬ್ಲೂಟೂತ್‌‌ ಅನ್ನು ಬಳಸದಿರುವಾಗ ಅದನ್ನು ಆಫ್ ಮಾಡಿ"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ಬೇರೆ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಗೊಳಿಸಲು ಪ್ರಯತ್ನಿಸಿ"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ಅಪ್ಲಿಕೇಶನ್‌ ಬಳಸಿದ ಬ್ಯಾಟರಿ"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಲ್ಲಿಸಿ ಅಥವಾ ಅಸ್ಥಾಪಿಸಿ"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಲ್ಲಿಸಿ ಅಥವಾ ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ಬ್ಯಾಟರಿ ಉಳಿಸುವ ಮೋಡ್‌‌ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ಬ್ಯಾಟರಿಯ ಬಳಕೆ ಕಡಿಮೆಗೊಳಿಸಲು ಸೆಟ್ಟಿಂಗ್‌ಗಳಿಗೆ ಅಪ್ಲಿಕೇಶನ್ ಅವಕಾಶ ಮಾಡಿಕೊಡಬಹುದು"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ಬಳಕೆದಾರ ಬಳಸಿದ ಬ್ಯಾಟರಿ"</string>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ಕೊನೆಯ ಬಾರಿ ಚಾರ್ಜ್‌ ಆದ ನಂತರದ ಬಳಕೆಯ ವಿವರ"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"ಕೊನೆಯ ಬಾರಿ ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದ್ದು"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ಉಳಿದಿರುವ ಬ್ಯಾಟರಿ ಸಮಯವನ್ನು ಅಂದಾಜು ಮಾಡಲಾಗಿರುತ್ತದೆ. ಬಳಕೆಯನ್ನು ಆಧಾರದ ಮೇಲೆ ಅದು ಬದಲಾಗಬಹುದು"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆ ಡೇಟಾವನ್ನು ಅಂದಾಜು ಮಾಡಲಾಗಿರುತ್ತದೆ ಮತ್ತು ಬಾಳಿಕೆಯ ಆಧಾರದ ಮೇಲೆ ಅದು ಬದಲಾಗಬಹುದು"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"ಸಕ್ರಿಯ ಬಳಕೆಯಲ್ಲಿರುವಾಗ"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಇರುವಾಗ"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
@@ -2023,7 +2104,7 @@
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ಅನ್‌ಪ್ಲಗ್ ಮಾಡಿದಾಗಿನಿಂದ"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> ಗೆ ಕಳೆದ ಬಾರಿ ಅನ್‌ಪ್ಲಗ್ ಮಾಡಿದಾಗ"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"ಬಳಕೆಯ ಮೊತ್ತ"</string>
-    <string name="menu_stats_refresh" msgid="1676215433344981075">"ರೀಫ್ರೆಶ್ ಮಾಡಿ"</string>
+    <string name="menu_stats_refresh" msgid="1676215433344981075">"ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"ಮಾಧ್ಯಮಸರ್ವರ್"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ಅಪ್ಲಿಕೇಶನ್ ಆಪ್ಟಿಮೈಸೇಷನ್‌"</string>
@@ -2114,10 +2195,10 @@
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"ಆಫ್"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆ"</string>
-    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ಸಂಗ್ರಹಣೆಯಿಂದ ಸ್ಥಾಪಿಸು"</string>
-    <string name="credentials_install" product="default" msgid="953914549998062317">"SD ಕಾರ್ಡ್‌ನಿಂದ ಸ್ಥಾಪಿಸು"</string>
+    <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ಸಂಗ್ರಹಣೆಯಿಂದ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"SD ಕಾರ್ಡ್‌ನಿಂದ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ಸಂಗ್ರಹಣೆಯಿಂದ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸಿ"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD ಕಾರ್ಡ್‌ನಿಂದ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸು"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD ಕಾರ್ಡ್‌ನಿಂದ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"ರುಜುವಾತುಗಳನ್ನು ತೆರವುಗೊಳಿಸು"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ಎಲ್ಲ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ತೆಗೆದುಹಾಕು"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ವಿಶ್ವಾಸಾರ್ಹ ರುಜುವಾತುಗಳು"</string>
@@ -2146,7 +2227,7 @@
     <string name="usage_access_title" msgid="332333405495457839">"ಬಳಕೆಯ ಪ್ರವೇಶದ ಆಪ್‌‌"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"ತುರ್ತು ಟೋನ್"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"ತುರ್ತು ಕರೆ ಮಾಡಿದಾಗ ಕಾರ್ಯ ರೀತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"ಬ್ಯಾಕ್ ಅಪ್"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"ಬ್ಯಾಕಪ್"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ಬ್ಯಾಕಪ್ &amp; ಮರುಸ್ಥಾಪನೆ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ವೈಯಕ್ತಿಕ ಡೇಟಾ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ನನ್ನ ಡೇಟಾ ಬ್ಯಾಕಪ್ ಮಾಡು"</string>
@@ -2164,8 +2245,8 @@
     <string name="device_admin_settings_title" msgid="4960761799560705902">"ಸಾಧನದ ನಿರ್ವಾಹಕರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"ಸಾಧನ ನಿರ್ವಹಣೆ ಅಪ್ಲಿಕೇಶನ್"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"ಈ ಸಾಧನ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
-    <string name="uninstall_device_admin" msgid="271120195128542165">"ಅಪ್ಲಿಕೇಶನ್ ಅಸ್ಥಾಪಿಸಿ"</string>
-    <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಮತ್ತು ಅಸ್ಥಾಪಿಸಿ"</string>
+    <string name="uninstall_device_admin" msgid="271120195128542165">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
+    <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಮತ್ತು ಅನ್‌ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="select_device_admin_msg" msgid="7347389359013278077">"ಸಾಧನ ನಿರ್ವಹಣೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"ಸಾಧನ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ವೈಯಕ್ತಿಕ"</string>
@@ -2177,7 +2258,7 @@
     <string name="device_admin_warning" msgid="7482834776510188134">"ಈ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿದರೆ, ಈ ಕೆಳಗಿನ ಕಾರ್ಯಾಚರಣೆಗಳನ್ನು ಮಾಡಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಗೆ ಅನುಮತಿಸಲಾಗುತ್ತದೆ:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"ಈ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್ ಸಕ್ರಿಯವಾಗಿದೆ ಮತ್ತು ಈ ಕೆಳಗಿನ ಕಾರ್ಯಾಚರಣೆಗಳನ್ನು ಮಾಡಲು <xliff:g id="APP_NAME">%1$s</xliff:g> ಗೆ ಅನುಮತಿ ನೀಡುತ್ತದೆ:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"ಪ್ರೊಫೈಲ್ ನಿರ್ವಾಹಕವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
-    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"ಇದನ್ನು ಮುಂದುವರಿಸಿದರೆ, ನಿಮ್ಮ ಬಳಕೆದಾರರನ್ನು ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನಿರ್ವಹಿಸುತ್ತಾರೆ ಮತ್ತು ಇದು ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಡೇಟಾ ಮಾತ್ರವಲ್ಲದೆ, ಸಂಬಂಧಿತ ಡೇಟಾವನ್ನೂ ಸಹ ಸಂಗ್ರಹಣೆ ಮಾಡಬಲ್ಲುದು.\n\nನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನೆಟ್‌ವರ್ಕ್ ಚಟುವಟಿಕೆ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿ ಸೇರಿದಂತೆ ಈ ಬಳಕೆದಾರರಿಗೆ ಸಂಬಂಧಿಸಿದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾದ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"ಇದನ್ನು ಮುಂದುವರಿಸಿದರೆ, ನಿಮ್ಮ ಬಳಕೆದಾರರನ್ನು ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನಿರ್ವಹಿಸುತ್ತಾರೆ ಮತ್ತು ಇದು ನಿಮ್ಮ ವೈಯಕ್ತಿಕ ಡೇಟಾ ಮಾತ್ರವಲ್ಲದೆ, ಸಂಬಂಧಿತ ಡೇಟಾವನ್ನೂ ಸಹ ಸಂಗ್ರಹಣೆ ಮಾಡಬಲ್ಲದು.\n\nನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನೆಟ್‌ವರ್ಕ್ ಚಟುವಟಿಕೆ ಮತ್ತು ನಿಮ್ಮ ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿ ಸೇರಿದಂತೆ ಈ ಬಳಕೆದಾರರಿಗೆ ಸಂಬಂಧಿಸಿದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾದ ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"ಇತರ ಆಯ್ಕೆಗಳನ್ನು ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"ಇನ್ನಷ್ಟು ವಿವರಗಳು"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"ಶೀರ್ಷಿಕೆರಹಿತ"</string>
@@ -2192,7 +2273,7 @@
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ನೆಟ್‌ವರ್ಕ್‌ವೊಂದನ್ನು ಸೇರಿಸಿ"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ಸಂಪರ್ಕಗೊಂಡಿಲ್ಲ"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"ನೆಟ್‌ವರ್ಕ್‌ ಸೇರಿಸಿ"</string>
-    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ಪಟ್ಟಿ ರೀಫ್ರೆಶ್ ಮಾಡಿ"</string>
+    <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ಪಟ್ಟಿ ರಿಫ್ರೆಶ್ ಮಾಡಿ"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"ಸ್ಕಿಪ್‌"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"ಮುಂದೆ"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"ಹಿಂದೆ"</string>
@@ -2379,7 +2460,7 @@
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS ಹುಡುಕಾಟ ಡೊಮೇನ್‌ಗಳು"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS ಸರ್ವರ್‌ಗಳು (ಉದಾ. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"ಫಾರ್ವರ್ಡಿಂಗ್ ಮಾರ್ಗಗಳು (ಉದಾ. 10.0.0.0/8)"</string>
-    <string name="vpn_username" msgid="1863901629860867849">"ಬಳಕೆದಾರಹೆಸರು"</string>
+    <string name="vpn_username" msgid="1863901629860867849">"ಬಳಕೆದಾರರಹೆಸರು"</string>
     <string name="vpn_password" msgid="6756043647233596772">"ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"ಖಾತೆಯ ಮಾಹಿತಿಯನ್ನು ಉಳಿಸು"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ಬಳಸಲಾಗಿಲ್ಲ)"</string>
@@ -2495,7 +2576,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ಬಳಕೆದಾರ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ನಿರ್ಬಂಧಿಸಿದ ಪ್ರೊಫೈಲ್"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸುವುದೇ?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"ನೀವು ಹೆಚ್ಚುವರಿ ಬಳಕೆದಾರರನ್ನು ರಚಿಸುವ ಮೂಲಕ ಇತರ ಜನರ ಜೊತೆಗೆ ಈ ಸಾಧನವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು. ಪ್ರತಿ ಬಳಕೆದಾರರು ತಮ್ಮದೇ ಸ್ಥಳವನ್ನು ಹೊಂದಿರುತ್ತಾರೆ, ಇದರಲ್ಲಿ ಅವರು ತಮ್ಮದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ವಾಲ್‌ಪೇಪರ್ ಮತ್ತು ಮುಂತಾದವುಗಳ ಮೂಲಕ ಕಸ್ಟಮೈಸ್ ಮಾಡಿಕೊಳ್ಳಬಹುದು. ಎಲ್ಲರ ಮೇಲೂ ಪರಿಣಾಮ ಬೀರುವಂತೆ ವೈ-ಫೈ ರೀತಿಯ ಸಾಧನ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬಳಕೆದಾರರು ಸರಿಹೊಂದಿಸಬಹುದು.\n\nನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಹೊಂದಿಸಬೇಕಾಗುತ್ತದೆ.\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಬಹುದು."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"ನೀವು ಹೆಚ್ಚುವರಿ ಬಳಕೆದಾರರನ್ನು ರಚಿಸುವ ಮೂಲಕ ಇತರ ಜನರ ಜೊತೆಗೆ ಈ ಸಾಧನವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು. ಪ್ರತಿ ಬಳಕೆದಾರರು ತಮ್ಮದೇ ಸ್ಥಳವನ್ನು ಹೊಂದಿರುತ್ತಾರೆ, ಇದರಲ್ಲಿ ಅವರು ತಮ್ಮದೇ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ವಾಲ್‌ಪೇಪರ್ ಮತ್ತು ಮುಂತಾದವುಗಳ ಮೂಲಕ ಕಸ್ಟಮೈಸ್ ಮಾಡಿಕೊಳ್ಳಬಹುದು. ಎಲ್ಲರ ಮೇಲೂ ಪರಿಣಾಮ ಬೀರುವಂತೆ ವೈ-ಫೈ ರೀತಿಯ ಸಾಧನ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬಳಕೆದಾರರು ಸರಿಹೊಂದಿಸಬಹುದು.\n\nನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಹೊಂದಿಸಬೇಕಾಗುತ್ತದೆ\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಬಹುದು."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ನೀವು ಒಬ್ಬ ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಿದಾಗ, ಆ ವ್ಯಕ್ತಿಯು ಅವರ ಸ್ಥಳವನ್ನು ಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ.\n\nಯಾವುದೇ ಬಳಕೆದಾರರು ಎಲ್ಲಾ ಇತರೆ ಬಳಕೆದಾರರಿಗಾಗಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಬಹುದು."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ಈಗ ಬಳಕೆದಾರರನ್ನು ಸೆಟಪ್‌‌ ಮಾಡುವುದೇ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ಸಾಧನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಲು ಮತ್ತು ಅದರ ಸ್ಥಳವನ್ನು ಹೊಂದಿಸಲು ವ್ಯಕ್ತಿಯು ಲಭ್ಯವಿದ್ದಾರೆಯೇ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2680,7 +2764,7 @@
     <string name="keywords_storage" msgid="3299217909546089225">"ಸ್ಥಳ, ಡಿಸ್ಕ್, ಹಾರ್ಡ್ ಡ್ರೈವ್, ಸಾಧನ, ಬಳಕೆ"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"ವಿದ್ಯುತ್ ಬಳಕೆ, ಶುಲ್ಕ"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"ಕಾಗುಣಿತ, ನಿಘಂಟು, ಕಾಗುಣಿತ ಪರಿಶೀಲನೆ, ಸ್ವಯಂ-ಸರಿಪಡಿಸುವಿಕೆ"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"ಗುರುತಿಸುವಿಕೆ, ಇನ್‌ಪುಟ್‌, ಧ್ವನಿ, ಮಾತನಾಡಿ, ಭಾಷೆ, ಹ್ಯಾಂಡ್ಸ್‌-ಫ್ರೀ, ಹ್ಯಾಂಡ್‌ ಫ್ರೀ, ಗುರುತಿಸುವಿಕೆ, ಆಕ್ಷೇಪಾರ್ಹ, ಪದ, ಆಡಿಯೊ, ಇರಿಹಾಸ, ಬ್ಲೂಟೂತ್ ಹೆಡ್‌ಸೆಟ್‌"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"ಗುರುತಿಸುವಿಕೆ, ಇನ್‌ಪುಟ್‌, ಧ್ವನಿ, ಮಾತನಾಡಿ, ಭಾಷೆ, ಹ್ಯಾಂಡ್ಸ್‌-ಫ್ರೀ, ಹ್ಯಾಂಡ್‌ ಫ್ರೀ, ಗುರುತಿಸುವಿಕೆ, ಆಕ್ಷೇಪಾರ್ಹ, ಪದ, ಆಡಿಯೊ, ಇತಿಹಾಸ, ಬ್ಲೂಟೂತ್ ಹೆಡ್‌ಸೆಟ್‌"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"ರೇಟ್ ಮಾಡು, ಭಾಷೆ, ಡಿಫಾಲ್ಟ್, ಮಾತನಾಡಿ, ಮಾತನಾಡುವಿಕೆ, ಟಿಟಿಎಸ್, ಪ್ರವೇಶಿಸುವಿಕೆ, ಪರದೆ ರೀಡರ್, ಕುರುಡು"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ಕ್ಲಾಕ್‌, ಮಿಲಿಟರಿ"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"ಮರುಹೊಂದಿಸಿ, ಮರುಸ್ಥಾಪಿಸಿ, ಫ್ಯಾಕ್ಟರಿ"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಪಾಸ್‌ವರ್ಡ್‌, ಪ್ಯಾಟರ್ನ್‌, ಪಿನ್ ಗೆ ಸ್ಲೈಡ್‌ ಮಾಡಿ"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ಕೆಲಸದ ಸವಾಲು, ಕೆಲಸ, ಪ್ರೊಫೈಲ್"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್, ನಿರ್ವಹಿಸಿದ ಪ್ರೊಫೈಲ್, ಒಗ್ಗೂಡಿಸಿ, ಏಕೀಕರಣ, ಕೆಲಸ, ಪ್ರೊಫೈಲ್"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ಗೆಸ್ಚರ್"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ಗೆಸ್ಚರ್‌ಗಳು"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ಪಾವತಿಸಿ, ಟ್ಯಾಪ್ ಮಾಡಿ, ಪಾವತಿಗಳು"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ಬ್ಯಾಕಪ್, ಬ್ಯಾಕ್ ಅಪ್"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ಗೆಸ್ಚರ್"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ವೈ-ಫೈ NFC ಟ್ಯಾಗ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="write_tag" msgid="8571858602896222537">"ಬರೆಯಿರಿ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ಬರೆಯಲು ಟ್ಯಾಗ್‌ ಅನ್ನು ಟ್ಯಾಪ್‌ ಮಾಡಿ..."</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2817,7 +2907,7 @@
     <string name="no_notification_listeners" msgid="3487091564454192821">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಧಿಸೂಚನೆ ಪ್ರವೇಶವನ್ನು ವಿನಂತಿಸಿಲ್ಲ."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> ಗೆ ಅಧಿಸೂಚನೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"ಸಂಪರ್ಕ ಹೆಸರುಗಳು ಮತ್ತು ನೀವು ಸ್ವೀಕರಿಸುವ ಸಂದೇಶಗಳ ಪಠ್ಯದಂತಹ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಸೇರಿದಂತೆ <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ಗೆ ಎಲ್ಲ ಅಧಿಸೂಚನೆಗಳನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ. ಇದಕ್ಕೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ವಜಾ ಮಾಡಲು ಅಥವಾ ಅವುಗಳು ಹೊಂದಿರುವಂತಹ ಕ್ರಿಯೆ ಬಟನ್‌ಗಳನ್ನು ಟ್ರಿಗ್ಗರ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ. \n\nಈ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧಿಸಿದ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಮತ್ತು ಅಡಚಣೆ ಮಾಡಬೇಡ ಆನ್ ಅಥವಾ ಆಫ್ ಮಾಡುವ ಸಾಮರ್ಥ್ಯವನ್ನು ಈ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ನೀಡುತ್ತದೆ."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ಗೆ ನೀವು ಅಧಿಸೂಚನೆ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ಆಫ್ ಮಾಡಿದರೆ, ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶವು ಸಹ ಆಫ್ ಆಗಬಹುದು."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ಗೆ ನೀವು ಅಧಿಸೂಚನೆ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ಆಫ್ ಮಾಡಿದರೆ, ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆ ಸಹ ಆಫ್ ಆಗಬಹುದು."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"ಆಫ್ ಮಾಡು"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"ರದ್ದು ಮಾಡಿ"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR ಸಹಾಯ ಸೇವೆಗಳು"</string>
@@ -2833,10 +2923,8 @@
     <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="manage_zen_access_title" msgid="2611116122628520522">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
+    <string name="zen_access_empty_text" msgid="8772967285742259540">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಪ್ರಕಾರದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ನಕ್ಷತ್ರ ಹಾಕಲಾದ ಸಂಪರ್ಕಗಳಿಂದ ಮಾತ್ರ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ಅಲಾರಮ್‌ಗಳು"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ಅಲಾರಾಂಗೆ ಯಾವಾಗಲೂ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿ ಮತ್ತು ಧ್ವನಿ ಮಾಡಿ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ಜ್ಞಾಪನೆಗಳು"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ಈವೆಂಟ್‌ಗಳು"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ಎಲ್ಲ ಕರೆದಾರರು"</string>
@@ -2965,19 +3054,14 @@
     <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>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ನಿಮ್ಮ ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
-    <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_pin" msgid="2317181134653424679">"ನಿಮ್ಮ ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು, ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ, ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನದಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ನಿಮ್ಮ ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
+    <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="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>
@@ -3035,7 +3119,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ವೈಯಕ್ತಿಕ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ಕೆಲಸ"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು: ಎಲ್ಲ"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ಆಪ್‌ಗಳು: ಆಫ್ ಮಾಡಿದೆ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ಆಪ್‌ಗಳು: ಆಫ್ ಮಾಡಿರುವವು"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ವರ್ಗಗಳು: ತುರ್ತು ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"ವರ್ಗಗಳು: ಕಡಿಮೆ ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ವರ್ಗಗಳು: ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ನೆರವು ಗೆಸ್ಚರ್"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ಸೂಕ್ಷ್ಮತೆ"</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="gesture_setting_on" msgid="3455094265233870280">"ಆನ್"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ಆಫ್"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ಬೂಟ್‌ಲೋಡರ್ ಅನ್ನು ಈಗಾಗಲೇ ಅನ್‌ಲಾಕ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ಕೆಲಸದ ಡೇಟಾವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಿಂಕ್ ಮಾಡಿ"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಡೇಟಾವನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಲಿ"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"ಖಾತೆ ಸಿಂಕ್"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> ನ <xliff:g id="ID_1">%1$d</xliff:g> ಐಟಂಗಳಿಗಾಗಿ ಸಿಂಕ್ ಆನ್ ಮಾಡಿ"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"ಎಲ್ಲಾ ಐಟಂಗಳಿಗಾಗಿ ಸಿಂಕ್ ಆನ್ ಮಾಡಿ"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"ಎಲ್ಲಾ ಐಟಂಗಳಿಗಾಗಿ ಸಿಂಕ್ ಆಫ್ ಮಾಡಿ"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"ನಿರ್ವಹಿಸುವ ಸಾಧನದ ಮಾಹಿತಿ"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"ನಿಮ್ಮ ಸಂಸ್ಥೆಯು ನಿರ್ವಹಿಸುವ ಬದಲಾವಣೆಗಳು ಮತ್ತು ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ನಿರ್ವಹಿಸುವ ಬದಲಾವಣೆಗಳು ಮತ್ತು ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"ಆಕರ್ಷಕವಾಗಿ ಮತ್ತು ಹೊಸದಾಗಿ ಏನಿದೆ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ಟಾಪ್ 5 ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS ನೋಂದಣಿ ಸ್ಥಿತಿ"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"ನೋಂದಾಯಿಸಲಾಗಿದೆ"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ"</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index fcf8801b1bdddf35c156fb088145a9bf6873e25e..f59cdf79ad013f585f46531f8c5efd4bd5a77b4d 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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d8594f701d3d74d6c5af03da49d52022ff0ec350..51a1a8e9ec75b05df4f18593d605fef35fab1c07 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"나중에"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"지문 설정을 건너뛰시겠습니까?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"지문으로 휴대전화를 잠금 해제하도록 설정했습니다. 지금 건너뛰면 나중에 설정해야 하며 설정에는 약 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 +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>
@@ -487,8 +500,8 @@
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"기기 보호 기능은 패턴 없이 작동하지 않습니다. <xliff:g id="EMPTY_LINE">
 
 </xliff:g>저장된 지문 파일이 이 기기에서 삭제되며 지문을 이용해 휴대전화의 잠금을 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"기기 보호 기능은 PIN 없이 작동하지 않습니다."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"기기 보호 기능은 PIN 없이 작동하지 않습니다.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"기기 보호 기능은 PIN이 있어야만 작동합니다."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"기기 보호 기능은 PIN이 있어야만 작동합니다.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>저장된 지문 파일이 이 기기에서 삭제되며 지문을 이용해 휴대전화의 잠금을 해제하거나, 구매를 승인하거나, 앱에 로그인할 수 없게 됩니다."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"기기 보호 기능은 비밀번호 없이 작동하지 않습니다."</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="1688030823464420974">"다음번 시도에서 잘못된 패턴을 입력하면 이 기기의 데이터가 삭제됩니다."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"다음번 시도에서 잘못된 PIN을 입력하면 이 기기의 데이터가 삭제됩니다."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"다음번 시도에서 잘못된 비밀번호를 입력하면 이 기기의 데이터가 삭제됩니다."</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="5047439819181833824">"잘못된 시도 횟수가 너무 많습니다. 이 기기의 데이터가 삭제됩니다."</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>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"자동으로 Wi‑Fi 사용 설정"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"홈 네트워크 등의 저장된 고품질 네트워크가 가까이 있을 때 Wi‑Fi가 다시 사용 설정됩니다."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi 검색이 사용 중지되어 사용할 수 없습니다."</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"사용하려면 네트워크 평가 제공업체를 선택하세요."</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"불량 네트워크 방지"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않음"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"인터넷 연결이 안정적인 네트워크만 사용합니다."</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"개방형 네트워크에 연결"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"고품질 공용 네트워크에 자동으로 연결"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"사용하려면 네트워크 평가 제공업체를 선택하세요."</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"사용하려면 호환되는 네트워크 평가 제공업체를 선택하세요."</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"인증서 설치"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"위치 정확도를 개선하기 위해 시스템 앱과 서비스에서 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="wifi_scan_notify_text" msgid="5593805423071186757">"위치 정확도를 개선하기 위해 시스템 앱과 서비스에서 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"위치 정확도를 높이려면 <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>검색 설정<xliff:g id="LINK_END_1">LINK_END</xliff:g>에서 Wi-Fi 검색을 사용 설정하세요."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"다시 표시 안함"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"절전 모드 동안 Wi-Fi 연결 유지"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"상시 사용 설정/배터리 사용량 증가"</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="6978257596231155345">"시간, 알림 아이콘 등의 정보가 표시되며 배터리 사용량이 증가합니다."</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 +1320,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>
@@ -1285,7 +1333,7 @@
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"초기화하시겠습니까?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"네트워크 재설정 권한이 없는 사용자입니다."</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"네트워크 설정이 재설정되었습니다."</string>
-    <string name="master_clear_title" msgid="5907939616087039756">"공장 초기화"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"초기화"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
       <item quantity="other">계정 <xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g>개가 재설정됨</item>
       <item quantity="one">계정 1개가 재설정됨</item>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"현재 로그인한 계정:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"이 기기에 다른 사용자가 있습니다.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM에 등록된 이동통신사"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"모바일 서비스 요금제는 취소되지 않습니다."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"SD 카드"</b>"를 삭제해야 합니다."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB 저장소 지우기"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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 +1463,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>
@@ -1450,13 +1495,13 @@
     <string name="lock_settings_title" msgid="4213839087748988686">"기기 보안"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"잠금해제 패턴 변경"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"잠금해제 PIN 변경"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"잠금해제 패턴 그리기"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"잠금해제 패턴을 그리세요."</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"도움말을 보려면 메뉴를 누르세요."</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"완료되면 손가락을 뗍니다."</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"<xliff:g id="NUMBER">%d</xliff:g>개 이상의 점을 연결해야 합니다. 다시 시도하세요."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"패턴이 기록되었습니다."</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"확인을 위해 패턴을 다시 그리세요."</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"새 잠금해제 패턴"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"새 잠금해제 패턴입니다."</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"확인"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"다시 그리기"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"지우기"</string>
@@ -1491,6 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"스크린 리더, 디스플레이, 상호작용 컨트롤"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"보기 설정"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"필요에 따라 기기를 맞춤설정할 수 있습니다. 다음 접근성 기능은 언제든지 설정에서 변경할 수 있습니다."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"글꼴 크기 확대"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"스크린 리더"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"오디오 및 화면에 있는 텍스트"</string>
     <string name="display_category_title" msgid="685461049938269166">"디스플레이"</string>
@@ -1873,7 +1926,11 @@
       <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>
+    <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>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"설정"</string>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g>에서 휴대전화를 작동 상태로 유지하고 있어 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 앱을 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g>에서 태블릿을 작동 상태로 유지하고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 앱을 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g>에서 기기를 작동 상태로 유지하고 있어 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 앱을 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g>에서 휴대전화를 작동 상태로 유지하고 있어 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g>에서 태블릿을 작동 상태로 유지하고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g>에서 기기를 작동 상태로 유지하고 있어 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"앱 종료"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"백그라운드 사용을 중지하고 앱을 종료하시겠습니까?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g>에서 휴대전화를 작동 상태로 유지하고 있어 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하고 백그라운드에서 실행되지 않도록 하세요."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g>에서 태블릿을 작동 상태로 유지하고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하고 백그라운드에서 실행되지 않도록 하세요."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g>에서 기기를 작동 상태로 유지하고 있어 기기에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 <xliff:g id="APP_1">%1$s</xliff:g>을(를) 종료하고 백그라운드에서 실행되지 않도록 하세요."</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="7774807745601479888">"앱을 사용하지 않을 때도 <xliff:g id="APP">%1$s</xliff:g>에서 계속 위치를 요청하여 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 이 앱에서 위치 사용을 중지하세요."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"앱을 사용하지 않을 때도 <xliff:g id="APP">%1$s</xliff:g>에서 계속 위치를 요청하여 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 이 앱에서 위치 사용을 중지하세요."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"앱을 사용하지 않을 때도 <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"마지막 충전 완료 후 사용 내역 분석"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"마지막 충전 완료"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"남은 배터리 사용 시간은 대략적인 수치이며, 사용량에 따라 변경될 수 있습니다."</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"배터리 사용 데이터는 대략적인 수치이며, 사용량에 따라 변경될 수 있습니다."</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"연속사용 중일 때"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"백그라운드에 있을 때"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"배터리 사용량"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"추가 사용자 프로필을 만들어 다른 사용자와 기기를 공유할 수 있습니다. 각 사용자는 앱, 배경화면 등으로 맞춤설정할 수 있는 자신만의 공간을 갖게 됩니다. 또한 사용자는 모든 사용자에게 적용되는 Wi‑Fi와 같은 기기 설정도 조정할 수 있습니다.\n\n추가된 새 사용자는 자신의 공간을 설정해야 합니다.\n\n누구나 다른 모든 사용자를 위해 앱을 업데이트할 수 있습니다."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"추가된 새로운 사용자는 자신의 공간을 설정해야 합니다.\n\n모든 사용자는 다른 사용자들을 위하여 앱을 업데이트할 수 있습니다."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"지금 사용자를 설정하시겠습니까?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"사용자가 기기를 사용하여 자신의 공간을 설정할 수 있는지 확인하세요."</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"사용자가 기기를 사용하여 자신의 공간을 설정할 수 있도록 하세요."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"지금 프로필을 설정하시겠습니까?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"지금 설정"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"나중에"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"슬라이드하여 비밀번호, 패턴, PIN을 잠금 해제"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"직장 보안 확인, 직장, 프로필"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"직장 프로필, 관리된 프로필, 통합, 통합형, 직장, 프로필"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"동작"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"동작"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"결제, 탭, 결제"</string>
     <string name="keywords_backup" msgid="470070289135403022">"백업, 백 업"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"동작"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"별표 표시한 연락처만"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"없음"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"알람"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"알림이 항상 중요 알림으로 설정되며 소리로 알림"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"알림"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"이벤트"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"모든 발신자"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3075,7 +3159,7 @@
     <string name="default_app" msgid="6864503001385843060">"(기본)"</string>
     <string name="system_app" msgid="9068313769550747372">"(시스템)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(시스템 기본값)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"앱 저장소"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"앱 저장용량"</string>
     <string name="usage_access" msgid="5479504953931038165">"사용 기록에 액세스"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"사용 기록에 액세스 허용"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"앱 사용 환경설정"</string>
@@ -3095,6 +3179,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>
@@ -3115,7 +3208,7 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"이 버그 보고서는 IT 관리자와 공유됩니다. 자세한 내용은 IT 관리자에게 문의하세요."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"공유"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"거부"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"이 기기 충전하기"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"이 기기 충전"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"이 기기만 충전"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"전원 공급"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"연결된 기기를 충전합니다. USB 충전을 지원하는 기기에서만 이용할 수 있습니다."</string>
@@ -3125,7 +3218,7 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP가 지원되지 않는 경우 사진 또는 파일 전송(PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"기기를 MIDI로 사용"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"이 기기를 MIDI로 사용"</string>
-    <string name="usb_use" msgid="3256040963685055320">"다음에 USB 사용"</string>
+    <string name="usb_use" msgid="3256040963685055320">"다음 용도로 USB 사용"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"기기 충전 중"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"전원 공급 중"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"지원 동작"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"민감도"</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="gesture_setting_on" msgid="3455094265233870280">"사용"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"사용 안함"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"부트로더가 이미 잠금해제되었습니다."</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"자동으로 직장 데이터 동기화"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"앱에서 데이터를 자동으로 새로고침하도록 허용"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"계정 동기화"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g>개 항목 동기화"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"모든 항목 동기화"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"모든 항목을 동기화하지 않음"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"관리 기기 정보"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"조직에서 관리하는 변경사항 및 설정"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>에서 관리하는 변경사항 및 설정"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"흥미로운 새 기능 살펴보기"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5가지 주요 기능 확인하기"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 등록 상태"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"등록됨"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"등록되지 않음"</string>
 </resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index f711e958b11153957fae0ba28a5f76a77ad758d9..bc9185ff9308241c5e5e3eefd7bab525be7f744c 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>
@@ -283,7 +273,7 @@
     <item msgid="2603878814882344450">"үн башкаргыч"</item>
     <item msgid="7136963238377062018">"үн деңгээли"</item>
     <item msgid="4270236897655923007">"шыңгырактын үнү"</item>
-    <item msgid="6325739889222559394">"медианын үнү"</item>
+    <item msgid="6325739889222559394">"мультимедианын үнү"</item>
     <item msgid="5762123934816216821">"ойготкучтун үнү"</item>
     <item msgid="785049718065337473">"эскерткичтин үнү"</item>
     <item msgid="6700305533746877052">"bluetooth үнү"</item>
@@ -350,7 +340,7 @@
     <item msgid="2098976479485046797">"Үн башкаргыч"</item>
     <item msgid="5660213838861789350">"Үндүн деңгээли"</item>
     <item msgid="7983336752371254444">"Шыңгырактын үнү"</item>
-    <item msgid="7878027809189330917">"Медианын үнү"</item>
+    <item msgid="7878027809189330917">"Мультимедианын үнү"</item>
     <item msgid="7260546305036218513">"Ойготкучтун үнү"</item>
     <item msgid="9103719301075748925">"Эскерткичтин үнү"</item>
     <item msgid="7025966722295861512">"Bluetooth үнү"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index e38f3337937224bff014da95f10b83650eb23014..b499634d53b8747a666f0e647b39d5ee5b611a28 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) -->
@@ -285,9 +297,9 @@
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Жергиликтүү тармагыңыздан интернет-роуминг өчүрүлгөн абалда кеткендиктен Интернет туташуусун жоготтуңуз."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Аны күйгүзүү"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Бир топ чыгымдарга дуушар болуп калышыңыз мүмкүн."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Интернет-роумингге жол бергенде, сиз роуминг үчүн чоң төлөмгө кирептер болушуңуз мүмкүн!\n\nБул тууралоо планшеттин бардык колдонуучуларына таратылат."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Интернет-роумингге жол бергенде, сиз роуминг үчүн чоң төлөмгө кирептер болушуңуз мүмкүн!\n\nБул тууралоо телефондун бардык колдонуучуларына таратылат."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Интернет-роумингге жол берилсинби?"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Интернет-роумингди иштетсеңиз, чоң чыгым тартып калышыңыз мүмкүн!\n\nБардык колдонуучулардын жөндөөлөрү өзгөрүлөт."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Интернет-роумингди иштетсеңиз, чоң чыгым тартып калышыңыз мүмкүн!\n\nБардык колдонуучулардын жөндөөлөрү өзгөрүлөт."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Интернет-роумингди иштетесизби?"</string>
     <string name="networks" msgid="6333316876545927039">"Оператор тандоо"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Оператор тандоо"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Күн жана убакыт"</string>
@@ -314,7 +326,7 @@
     <string name="lock_after_timeout" msgid="4590337686681194648">"Автокулпу"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> уктагандан кийин"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> тарабынан кулпусу ачык калтырылгандан башка убакта, уктагандан кийин дароо"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> кулптабаган учурду кошпогондо, <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> көшүгөндөн кийин"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> кызматы экранды кулпуланбаган учурда колдоого албаса, <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> көшүү режимине өткөндө"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Кулпуланган экрандан ээсинин маалыматы көрсөтүлсүн"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Кулпу экрндгы текст"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Виджеттерди жандыруу"</string>
@@ -328,7 +340,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>
@@ -353,43 +365,42 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Азыр эмес"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Манжа изин жөндөө өткөрүлсүнбү?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Телефонуңуздун кулпусун манжа изи менен ачуу ыкмасын тандадыңыз. Эгер азыр өткөрүп жиберсеңиз, аны кийинчерээк жөндөшүңүз керек болот. Жөндөөгө бир мүнөтчө эле убакыт кетет."</string>
     <string name="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_error_dialog_title" msgid="3618021988442639280">"Каттоо аягына чыгарылган жок"</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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Манжа изи кошулбай калды. Кайра кайталап көрүңүз же башка манжаңыздын изин сактаңыз."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Дагы бирди кошуу"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Кийинки"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Телефонуңуздун кулпусун ачуу, ар кандай нерселерди сатып алуу жана колдонмолорду ачуу үчүн, манжа изиңизди кошуп коюңуз. "<annotation id="url">"Көбүрөөк билүү"</annotation></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="1688030823464420974">"Эгер графикалык ачкычты кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Эгер PIN кодду кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Эгер сырсөздү кийинки жолу туура эмес киргизсеңиз, бул түзмөктүн дайындары жок кылынат"</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="5047439819181833824">"Өтө көп жолу туура эмес аракет кылынды. Бул түзмөктүн дайындары жок кылынат."</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>
@@ -690,12 +719,15 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi автоматтык түрдө күйгүзүлсүн"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Байланыш сигналы жакшы болгон тармактарга (мисалы, үйүңүздөгү) жакындаганда, Wi‑Fi автоматтык түрдө күйгүзүлөт"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi тармагын издөө функциясы өчүрүлгөндүктөн, бул опция иштебейт"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Пайдалануу үчүн тармактын рейтингин камсыздоочуну тандаңыз"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Начар байланыштарга кошулбоо"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Жакшы интернет байланыш болмоюнча Wi‑Fi түйүнүн колдонбоо"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Туруктуу Интернет туташуусу менен камсыз кылган тармактар гана колдонулсун"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Ачык тармактарга туташсын"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Ачык тармактарга туташуу"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Байланыш сигналы жакшы болгон жалпыга ачык тармактарга автоматтык түрдө туташат"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттарды орнотуу"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Пайдалануу үчүн тармактын рейтингин камсыздоочуну тандаңыз"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Пайдалануу үчүн шайкеш келген тармактын рейтингин камсыздоочуну тандаңыз"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Тастыктамаларды орнотуу"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Кандайдыр бир жерди тагыраак аныктоо үчүн, тутум колдонмолору жана кызматтар жакын арадагы Bluetooth тармактарын издей берет. Бул функцияны <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>издөө жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> өзгөртсөңүз болот."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Кандайдыр бир жерди тагыраак аныктоо үчүн <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>издөө жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> Wi-Fi тармактарын издөө дегенди күйгүзүңүз."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Экинчи көргөзбө"</string>
@@ -726,7 +758,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Тармак унутулсун"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Тармакты өзгөртүү"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC тегине жазуу"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Жеткиликтүү түйүндөрдү көрүш үчүн Wi‑Fi жандырыңыз."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Жеткиликтүү тармактарды көрүү үчүн Wi‑Fi\'ды иштетиңиз."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi‑Fi түйүндөрү изделүүдө…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Wi‑Fi түйүнүн алмаштырууга урукатыңыз жок."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Дагы"</string>
@@ -778,6 +810,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 +842,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 +878,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 +935,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,7 +992,8 @@
     <string name="search_settings_summary" msgid="9205656546570654169">"Издөөнүн жөндөөлөрүн жана таржымалын башкаруу"</string>
     <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="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 +1021,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 +1060,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="7337555569694794132">"Ар дайым күйүк / Батареянын кубаты көп сарпталат"</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="6978257596231155345">"Убакытты, эскертме сүрөтчөлөрүн жана башка маалыматты көрсөтүү. Батареянын кубаты көп сарпталат."</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 +1319,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>
@@ -1295,12 +1343,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Ушул түзмөктөгү каттоо эсептер:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Бул түзмөктө башка колдонуучулар бар.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Сүрөттөр"</li>\n<li>"Башка колдонуучу дайындары"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-карта менен иштеген операторлор"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ушуну менен байланыш операторуңуздун тарифтик планы жокко чыгарылбайт."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"USB сактагычты"</b>" тазалаш керек."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"SD-картаны"</b>" тазалаш керек."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB сактагычты тазалоо"</string>
     <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 +1376,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 +1417,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>
@@ -1407,7 +1449,7 @@
     <string name="copyright_title" msgid="865906688917260647">"Автордук укук"</string>
     <string name="license_title" msgid="1990487604356037871">"Уруксаттама"</string>
     <string name="terms_title" msgid="7697580845616764642">"Шарттар жана жоболор"</string>
-    <string name="webview_license_title" msgid="2813507464175738967">"Систем WebView Уруксаттамасы"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"WebView тутум уруксаттамасы"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Тушкагаздар"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Спутник сүрөттөрү:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Нускама"</string>
@@ -1420,8 +1462,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>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Профилдин графикалык ачкычы көрсөтүлсүн"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Таптаганда дирилдесин"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Кубат баскычы дароо кулпулайт"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> кулптабаган учурду кошпогондо"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> кызматы экранды кулпулабаган учурду кошпогондо"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Кулпуну ачуу үлгүсүн коюу"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Кулпуну ачуу үлгүсүн өзгөртүү"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Кулпуну ачуу үлгүсүн кантип тартыш керек"</string>
@@ -1490,6 +1535,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>
@@ -1538,8 +1586,8 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Өзгөчө кырдаал колдонмосу"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Колдонмонун жөндөөлөрүн кайра коюу"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Колдонмо кайра баштан жөндөлсүнбү?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ушуну менен төмөнкү жөндөөлөр жоюлат:\n\n "<li>"Токтотулган колдонмолор"</li>\n" "<li>"Токтотулган колдонмолордун эскертмелери"</li>\n" "<li>"Демейки колдонмолор"</li>\n" "<li>"Фондук дайындарга коюлган чектөөлөр"</li>\n" "<li>"Бардык уруксат чектөөлөрү"</li>\n\n" Колдонмолордун дайындары жоголбойт."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Колдонмолорду тазалоо"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Ушуну менен төмөнкү жөндөөлөр жоюлат:\n\n "<li>"Токтотулган колдонмолор"</li>\n" "<li>"Токтотулган колдонмолордун эскертмелери"</li>\n" "<li>"Демейки колдонмолор"</li>\n" "<li>"Фондук дайындарга коюлган чектөөлөр"</li>\n" "<li>"Бардык уруксат чектөөлөрү"</li>\n\n"Колдонмолордун дайындары жоголбойт."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Баштапкы абалга келтирүү"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Бош орунду башкаруу"</string>
     <string name="filter" msgid="2018011724373033887">"Чыпка"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Электөө опцияларын тандаңыз"</string>
@@ -1658,9 +1706,13 @@
     <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>
+    <string name="input_assistance" msgid="7577795275222555487">"Текст киргизүүдө жардам"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Тергич жана киргизүү ыкмалары"</string>
     <string name="phone_language" msgid="7116581601133118044">"Тилдер"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1756,6 +1808,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Экрандагыны окугучтар, экран, башкаруу элементтери"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Атайн мүмкүнчлктрдн жөндлр"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Түзмөктү өзүңүзгө карап ыңгайлаштырып алыңыз. Бул атайын мүмкүнчүлүктөрдүн параметрлерин кийинчерээк өзгөртсөңүз болот."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Арип өлчөмүн чоңойтуу"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Экрандагыны окугучтар"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио жана текстти окуп берүү"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1872,6 +1925,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 +1995,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу телефонуңузга көшүү режимине өткөнгө мүмкүнчүлүк бербей жаткандыктан, анын батареясы тез отуруп калып жатат.\n\nМаселени чечүү үчүн колдонмону мажбурлап токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону телефондон чыгарып салууга туура келет."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу планшетиңизге көшүү режимине өткөнгө мүмкүнчүлүк бербей жаткандыктан, анын батареясы тез отуруп калып жатат.\n\nМаселени чечүү үчүн колдонмону мажбурлап токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону планшеттен чыгарып салууга туура келет."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу түзмөгүңүзгө көшүү режимине өткөнгө мүмкүнчүлүк бербей жаткандыктан, анын батареясы тез отуруп калып жатат.\n\nМаселени чечүү үчүн колдонмону мажбурлап токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону түзмөктөн чыгарып салууга туура келет."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> колдонмосу телефонуңузду көшүү режиминен тез-тез чыгарып жаткандыктан, анын батареясы бат эле отуруп калып жатат.\n\nМаселени чечүү үчүн <xliff:g id="APP_1">%1$s</xliff:g> колдонмосун токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону телефондон чыгарып салууга туура келет."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> колдонмосу планшетиңизди көшүү режиминен тез-тез чыгарып жаткандыктан, анын батареясы бат эле отуруп калып жатат.\n\nМаселени чечүү үчүн <xliff:g id="APP_1">%1$s</xliff:g> колдонмосун токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону планшеттен чыгарып салууга туура келет."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> колдонмосу түзмөгүңүздү көшүү режиминен тез-тез чыгарып жаткандыктан, анын батареясы бат эле отуруп калып жатат.\n\nМаселени чечүү үчүн <xliff:g id="APP_1">%1$s</xliff:g> колдонмосун токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону түзмөктөн чыгарып салууга туура келет."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Колдонмону токтотуу"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Фондук режимде иштөө мүмк-гү өчүрүлүп, колдонмо токт-сунбу?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> колдонмосу телефонуңузду көшүү режиминен тез-тез чыгарып жаткандыктан, анын батареясы бат эле отуруп калып жатат.\n\nМаселени чечүү үчүн <xliff:g id="APP_1">%1$s</xliff:g> колдонмосун токтотуп, фондук режимде иштөө мүмкүнчүлүгүн өчүрүп коюңуз."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> колдонмосу планшетиңизди көшүү режиминен тез-тез чыгарып жаткандыктан, анын батареясы бат эле отуруп калып жатат.\n\nМаселени чечүү үчүн <xliff:g id="APP_1">%1$s</xliff:g> колдонмосун токтотуп, фондук режимде иштөө мүмкүнчүлүгүн өчүрүп коюңуз."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> колдонмосу түзмөгүңүздү көшүү режиминен тез-тез чыгарып жаткандыктан, анын батареясы бат эле отуруп калып жатат.\n\nМаселени чечүү үчүн <xliff:g id="APP_1">%1$s</xliff:g> колдонмосун токтотуп, фондук режимде иштөө мүмкүнчүлүгүн өчүрүп коюңуз."</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="7774807745601479888">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу жайгашкан жериңиз тууралуу маалыматты сурап жаткандыктан (иштетпесеңиз деле), телефонуңуздун батареясы тез отуруп калып жатат.\n\nМаселени чечүү үчүн колдонмонун жайгашкан жерди аныктоо мүмкүнчүлүгүн өчүрүп коюңуз."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу жайгашкан жериңиз тууралуу маалыматты сурап жаткандыктан (иштетпесеңиз деле), планшетиңиздин батареясы тез отуруп калып жатат.\n\nМаселени чечүү үчүн колдонмонун жайгашкан жерди аныктоо мүмкүнчүлүгүн өчүрүп коюңуз."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"<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 +2032,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,12 +2084,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Толук кубатталгандан бери канчасы колдонулду:"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Акыркы жолу толук кубатталды"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Батареянын иштей турган убактысы болжол менен көрсөтүлгөн жана колдонулушуна жараша өзгөрүшү мүмкүн"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Батареяны пайдалануу убактысы болжол менен көрсөтүлүп, колдонулушуна жараша өзгөрүшү мүмкүн"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Колдонулуп жатканда"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Фондук режимде"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Батарея колдонулушу"</string>
@@ -2343,7 +2424,7 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Статистика качан жаңырат"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ар бир айдын күнү:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Коюу"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Трафик колдонууга эскертме коюу"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Эскертүү жөндөөлөрү"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Трафикти чектөө"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Трафикти чектөө"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Белгиленген чекке жеткенде, планшетиңиз мобилдик Интернетти өчүрөт.\n\nПланшетиңиздин статистикасы менен байланыш операторунун статистикасы аздыр-көптүр айырмалангандыктан, чекти кабелтең коюңуз."</string>
@@ -2449,7 +2530,7 @@
     <string name="user_credential_title" msgid="1954061209643070652">"Эсептик дайындардын чоо-жайы"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"Эсептик дайындар алынып салынды: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Бир да колдонуучунун эсептик дайындары орнотулган эмес"</string>
-    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Ката текшергич"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Орфографияны текшергич"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Учурдагы сырсөздү териңиз"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Жаңы сырсөздү териңиз"</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Жаңы сырсөздү бул жерге кайра киргизиңиз"</string>
@@ -2500,8 +2581,8 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Жаңы колдонуучу кошосузбу?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Кошумча колдонуучуларды түзүү менен, бул түзмөктү башкалар менен бөлүшө аласыз. Ар бир колдонуучунун өз мейкиндиги болуп, аны алар өз колдонмолору, тушкагазы ж.б.у.с. нерселер менен ыңгайлаштырып алышат. Колдонуучулар Wi‑Fi сыяктуу, ар кимге таасирин тийгизүүчү, түзмөк жөндөөлөрүн да тууралай алышат.\n\nЖаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу калган бардык колдонуучулар үчүн да жаңырта алат."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Жаңы колдонуучу кошулганда, ал өз мейкиндигин түзүп алышы керек.\n\nКолдонмолорду бир колдонуучу жаңыртканда, ал калган бардык колдонуучулар үчүн да жаңырат."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Колдонуучуну азыр түзөлүбү?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Түзмөктү алып, өз мейкиндигин негиздей ала турган адамдын бар экенин текшериңиз"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Профилди жөндөө керекпи?"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Өз мейкиндигин жөндөп алышы үчүн түзмөктү колдонуучуга беришиңиз керек."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Профайл азыр түзүлсүнбү?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Азыр түзүү"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Азыр эмес"</string>
@@ -2567,7 +2648,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 +2738,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>
@@ -2709,9 +2793,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"кулпусун ачуу үчүн сыдыруу, сырсөз, үлгү, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"жумуш тапшырмасы, жумуш, профиль"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"жумуш профили, башкарылган профиль, бириктир, бириктирүү, жумуш, профиль"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"жаңсоо"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"жаңсоолор"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"төлөө, таптоо, төлөмдөр"</string>
     <string name="keywords_backup" msgid="470070289135403022">"камдык көчүрмөнү сактоо, камдык көчүрмөнү сактоо"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жаңсоо"</string>
     <string name="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 +2879,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 +2895,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 +2926,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>
@@ -2908,7 +2996,7 @@
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Эч бири"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Күн сайын"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Сигнал бүтүү убакытын жокко чыгарышы мүмкүн"</string>
-    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Убакыт бүткөндө же кийинки сигналда, кайсынысы эрте келсе ошондо, токтотулсун"</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Ойготкуч аяктаганга чейин иштесе, ойготкучтун үнү менен өчүрүлсүн"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> баштап <xliff:g id="END">%2$s</xliff:g> чейин"</string>
@@ -2921,6 +3009,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Жылдызчаланган байланыштардан гана"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Эч бир"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ойготкучтар"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Ойготкучтарга артыкчылык берилип, үндөрү чыксын"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Эстеткичтер"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Окуялар"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Бардык чалуучулар"</string>
@@ -2957,7 +3046,7 @@
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Эскертме жөндөөлөрү"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Бул түзмөк жөнүндө пикир жөнөтүү"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Администратордун PIN кодун киргизиңиз"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"Күйгүзүлгөн"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"Күйүк"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Өчүк"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Колдонмону кадоо"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Бул жөндөө аркылуу бир колдонмодон экинчисине өтүү мүмкүнчүлүгүн өчүрүп койсо болот.\n\nАл үчүн:\n\n1. Колдонмону кадоо функциясын иштетиңиз.\n\n2. Керектүү экранды ачыңыз.\n\n3. Көз жүгүртүүнү таптаңыз.\n\n4. Экранды жогору сүрүп, төөнөгүч сөлөкөтүнө тийип коюңуз."</string>
@@ -2968,11 +3057,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 +3064,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 +3182,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 +3283,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>
@@ -3281,6 +3374,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 +3401,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 +3421,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>
@@ -3341,7 +3442,7 @@
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Батареянын кубатын үнөмдөө функциясы колдонулбай эле"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Түзмөк кулпуланып турса, эскертмелерде жооптор жана башка тексттер жазылбасын"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Демейки орфография текшергич"</string>
-    <string name="choose_spell_checker" msgid="6596539862291699367">"Орфография текшергич тандаңыз"</string>
+    <string name="choose_spell_checker" msgid="6596539862291699367">"Орфографияны текшергич тандаңыз"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Тандалган жок"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(эч бири)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">": "</string>
@@ -3384,8 +3485,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>
@@ -3456,25 +3556,32 @@
     <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_pickup_title" product="default" msgid="818688002837687268">"Эскертмелерди текшерүү үчүн телефонду көтөрүңүз"</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="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="assist_gesture_title" msgid="7746563137898655539">"Жардамчы жаңсоо"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Сезгичтик"</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="gesture_setting_on" msgid="3455094265233870280">"Күйүк"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Өчүк"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Иш тутумун жүктөгүчтүн кулпусу мурунтан эле ачылган"</string>
@@ -3495,6 +3602,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Жумушка байланыштуу дайындарды автоматтык түрдө шайкештирүү"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Колдонмолорго дайындарды автоматтык түрдө жаңылоого уруксат берүү"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Каттоо эсебин шайкештештирүү"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Шайкештештирүү <xliff:g id="ID_2">%2$d</xliff:g> нерсенин ичинен <xliff:g id="ID_1">%1$d</xliff:g> нерсе үчүн күйүк"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Шайкештештирүү баардык нерселер үчүн күйүк"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Шайкештештирүү баардык нерселер үчүн өчүк"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Башкарылган түзмөк жөнүндө маалымат"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Өзгөртүүлөр жана жөндөөлөр уюмуңуз тарабынан башкарылат"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Өзгөртүүлөр жана жөндөөлөр <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> тарабынан башкарылат"</string>
@@ -3575,6 +3685,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 +3699,11 @@
     <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="698847081680980774">"Эмне жаңылык бар?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Мыкты 5 функцияны карап чыгыңыз"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS каттоо абалы"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Катталган"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Катталган эмес"</string>
 </resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index ccb296c13c2ce0695e8689e6f3e8ab987b2b4166..fbc81046028620ddbae2f9eb914bfae95726622c 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 ef2befea200158349daf92fadee43af00edb019c..fa2571a0b68b55a781b337af0ebcff540f28bb62 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ເຮັດໃນພາຍຫຼັງ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ຂ້າມ​ການ​ຕັ້ງ​ລາຍ​ນີ້ວ​ມື​ບໍ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ທ່ານ​ເລືອກ​ໃຊ້​ລາຍ​ນີ້ວ​ມື​ຂອງ​ທ່ານ​ເປັນ​ວິ​ທີ​ໜຶ່ງໃນການ​ປົດ​ລັອກ​ໂທ​ລ​ະ​ສັບ​ຂອງ​ທ່ານ. ຖ້າ​ທ່ານ​ຂ້າມ​​ດຽວ​ນີ້, ທ່ານ​ຈະ​ຕ້ອງ​ໄດ້​ຕັ້ງ​ອັນ​ນີ້​ພາຍ​ຫຼັງ. ການ​ຕັ້ງ​ໃຊ້​ເວ​ລາ​ພຽງ​ໜຶ່ງ​ນາ​ທີ ຫຼື ປະ​ມານນັ້ນ."</string>
     <string name="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="1688030823464420974">"ຫາກທ່ານໃສ່ຣູບແບບຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"ຫາກທ່ານໃສ່ລະຫັດ PIN ຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"ຫາກທ່ານໃສ່ລະຫັດຜິດໃນຄວາມພະຍາຍາມເທື່ອຕໍ່ໄປ, ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ"</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="5047439819181833824">"ພະຍາຍາມປົດລັອກບໍ່ສຳເລັດຫຼາຍເທື່ອເກີນໄປ. ອຸປະກອນນີ້ຈະຖືກລຶບຂໍ້ມູນອອກ."</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">"ເພື່ອ​ປັບ​ປຸງ​ຄວາມ​ແມ່ນຍຳຂອງ​ສະຖານທີ່, ແອັບ ແລະ ການ​ບໍ​ລິ​ການຍັງ​ຄົງສາ​ມາດສະ​ແກນ​ຫາເຄືອ​ຂ່າຍ 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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"ເປີດໃຊ້ Wi‑Fi ອັດຕະໂນມັດ"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi ຈະກັບມາເປີດໃຊ້ຫາກຢູ່ໃກ້ເຄືອຂ່າຍຄຸນນະພາບສູງທີ່ບັນທຶກໄວ້ ເຊັ່ນ: ເຄືອຂ່າຍເຮືອນ"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ບໍ່ສາມາດໃຊ້ໄດ້ເນື່ອງຈາກການສະແກນ Wi‑Fi ປິດຢູ່"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ເພື່ອໃຊ້, ໃຫ້ເລືອກຜູ້ໃຫ້ບໍລິການຄະແນນເຄືອຂ່າຍ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ຫຼີກເວັ້ນເຄືອຂ່າຍທີ່ສັນຍານອ່ອນ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ບໍ່ໃຊ້ເຄືອຂ່າຍ Wi-Fi ເວັ້ນເສຍແຕ່ມັນຈະມີຄວາມໄວການເຊື່ອມຕໍ່ອິນເຕີເນັດທີ່ດີ."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ໃຊ້​ສະ​ເພາະ​ເຄືອ​ຂ່າຍ​ທີ່​ມີ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ​ທີ່​ດີ​ເທົ່າ​ນັ້ນ"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍແບບເປີດ"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍສາທາລະນະທີ່ມີຄຸນນະພາບສູງໂດຍອັດຕະໂນມັດ"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ເພື່ອໃຊ້, ໃຫ້ເລືອກຜູ້ໃຫ້ບໍລິການຄະແນນເຄືອຂ່າຍ"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ເພື່ອໃຊ້, ໃຫ້ເລືອກຜູ້ໃຫ້ບໍລິການຄະແນນເຄືອຂ່າຍທີ່ໃຊ້ຮ່ວມກັນໄດ້"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ຕິດຕັ້ງໃບຮັບຮອງ"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ເພື່ອ​ປັບ​ປຸງ​ຄວາມ​ແມ່ນຍຳຂອງ​ສະຖານທີ່, ແອັບ ແລະ ການ​ບໍ​ລິ​ການຍັງ​ຄົງສາ​ມາດສະ​ແກນ​ຫາເຄືອ​ຂ່າຍ 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່, ໃຫ້ເປີດໃຊ້ການສະແກນ Wi-Fi ໃນ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ການຕັ້ງຄ່າການສະແກນ<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"ເປີດຕະຫຼອດເວລາ / ໃຊ້ແບັດເຕີຣີຫຼາຍຂຶ້ນ"</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="6978257596231155345">"ສະແດງເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ. ເພີ່ມການໃຊ້ແບັດເຕີຣີ."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ປັດຈຸບັນທ່ານກຳລັງເຂົ້າສູ່ລະບົບບັນຊີຕໍ່ໄປນີ້:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ມີ​ຜູ້​ໃຊ້​ອື່ນ​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ນີ້.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ເພງ"</li>\n<li>"ຮູບພາບ"</li>\n<li>"ຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ຜູ້ໃຫ້ບໍລິການຢູ່ eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ນີ້ຈະບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"SD card"</b>" ອອກນຳ."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"ລຶບພື້ນທີ່ຈັດເກັບຂໍ້ມູນ USB"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1410,10 +1452,10 @@
     <string name="terms_title" msgid="7697580845616764642">"ຂໍ້ກຳນົດ ແລະເງື່ອນໄຂ"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"ໃບ​ອະ​ນຸ​ຍາດ WebView ຂອງ​ລະ​ບົບ"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"ພາບພື້ນຫຼັງ"</string>
-    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ຜູ່​ສະ​ໜອງ​ພາບ​ຖ່າຍ​ດາວ​ທຽມ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"ຜູ້ສະໜອງພາບຖ່າຍດາວທຽມ:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"ຕັ້ງຄ່າເອງ"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"ເກີດບັນຫາໃນການໂຫລດຄູ່​ມື."</string>
-    <string name="settings_license_activity_title" msgid="8525014571806471216">"Third-party licenses"</string>
+    <string name="settings_license_activity_title" msgid="8525014571806471216">"ໃບອະນຸຍາດພາກສ່ວນທີສາມ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"ເກີດບັນຫາໃນການໂຫຼດຂໍ້ມູນລິຂະສິດ."</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ກຳລັງໂຫລດ..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"ຂໍ້ມູນດ້ານຄວາມປອດໄພ"</string>
@@ -1421,8 +1463,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 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ຕົວອ່ານໜ້າຈໍ, ການສະແດງຜົນ, ການຄວບຄຸມແບບໂຕ້ຕອບໄດ້"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ການຕັ້ງຄ່າການເບິ່ງເຫັນ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ທ່ານສາມາດປັບແຕ່ງອຸປະກອນນີ້ໃຫ້ເໝາະສົມກັບຄວາມຕ້ອງການຂອງທ່ານ. ຄຸນສົມຊ່ວຍເຂົ້າເຖິງເຫຼົ່ານີ້ສາມາດຖືກປ່ຽນແປງໄດ້ໃນພາຍຫຼັງໃນການຕັ້ງຄ່າ."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ເພີ່ມຂະໜາດຟອນ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ຕົວອ່ານໜ້າຈໍ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ສຽງ ແລະ ຂໍ້ຄວາມໜ້າຈໍ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ການສະແດງຜົນ"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"ໂທລະສັບຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ຕາມປົກກະຕິເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍໂທລະສັບຂອງທ່ານໄວ້.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດບັງຄັບປິດແອັບດັ່ງກ່າວໄວ້ໄດ້.\n\nຫາກບັນຫານີ້ຍັງຄົງເກີດຂຶ້ນເລື້ອຍໆ, ທ່ານອາດຈຳເປັນຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"ແທັບເລັດຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ຕາມປົກກະຕິເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍແທັບເລັດຂອງທ່ານໄວ້.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດບັງຄັບປິດແອັບດັ່ງກ່າວໄວ້ໄດ້.\n\nຫາກບັນຫານີ້ຍັງຄົງເກີດຂຶ້ນເລື້ອຍໆ, ທ່ານອາດຈຳເປັນຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"ອຸປະກອນຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ຕາມປົກກະຕິເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍອຸປະກອນຂອງທ່ານໄວ້.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດບັງຄັບປິດແອັບດັ່ງກ່າວໄວ້ໄດ້.\n\nຫາກບັນຫານີ້ຍັງຄົງເກີດຂຶ້ນເລື້ອຍໆ, ທ່ານອາດຈຳເປັນຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"ໂທລະສັບຂອງທ່ານບໍ່ສາມາດຈັດການແບດເຕີຣີຕາມປົກກະຕິໄດ້ເນື່ອງຈາກ <xliff:g id="APP_0">%1$s</xliff:g> ພະຍາຍາມເປີດໃຊ້ວຽກຢູ່ຕະຫຼອດ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດຢຸດ <xliff:g id="APP_1">%1$s</xliff:g> ໄດ້.\n\nຫາກຍັງຄົງມີບັນຫານີ້ເກີດຂຶ້ນຕໍ່ໄປຢູ່ອີກ, ທ່ານອາດຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"ແທັບເລັດຂອງທ່ານບໍ່ສາມາດຈັດການແບດເຕີຣີຕາມປົກກະຕິໄດ້ເນື່ອງຈາກ <xliff:g id="APP_0">%1$s</xliff:g> ພະຍາຍາມເປີດໃຊ້ວຽກຢູ່ຕະຫຼອດ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດຢຸດ <xliff:g id="APP_1">%1$s</xliff:g> ໄດ້.\n\nຫາກຍັງຄົງມີບັນຫານີ້ເກີດຂຶ້ນຕໍ່ໄປຢູ່ອີກ, ທ່ານອາດຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"ອຸປະກອນຂອງທ່ານບໍ່ສາມາດຈັດການແບດເຕີຣີຕາມປົກກະຕິໄດ້ເນື່ອງຈາກ <xliff:g id="APP_0">%1$s</xliff:g> ພະຍາຍາມເປີດໃຊ້ວຽກຢູ່ຕະຫຼອດ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດຢຸດ <xliff:g id="APP_1">%1$s</xliff:g> ໄດ້.\n\nຫາກຍັງຄົງມີບັນຫານີ້ເກີດຂຶ້ນຕໍ່ໄປຢູ່ອີກ, ທ່ານອາດຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ຢຸດແອັບ"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"ປິດການນຳໃຊ້ໃນພື້ນຫຼັງ ແລະ ຢຸດແອັບໄວ້ບໍ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"ໂທລະສັບຂອງທ່ານບໍ່ສາມາດຈັດການແບດເຕີຣີຕາມປົກກະຕິໄດ້ເນື່ອງຈາກ <xliff:g id="APP_0">%1$s</xliff:g> ພະຍາຍາມເປີດໃຊ້ວຽກຢູ່ຕະຫຼອດ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດຢຸດ <xliff:g id="APP_1">%1$s</xliff:g> ແລະ ປ້ອງກັນບໍ່ໃຫ້ມັນເຮັດວຽກໃນພື້ນຫຼັງໄດ້."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"ແທັບເລັດຂອງທ່ານບໍ່ສາມາດຈັດການແບດເຕີຣີຕາມປົກກະຕິໄດ້ເນື່ອງຈາກ <xliff:g id="APP_0">%1$s</xliff:g> ພະຍາຍາມເປີດໃຊ້ວຽກຢູ່ຕະຫຼອດ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດຢຸດ <xliff:g id="APP_1">%1$s</xliff:g> ແລະ ປ້ອງກັນບໍ່ໃຫ້ມັນເຮັດວຽກໃນພື້ນຫຼັງໄດ້."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"ອຸປະກອນຂອງທ່ານບໍ່ສາມາດຈັດການແບດເຕີຣີຕາມປົກກະຕິໄດ້ເນື່ອງຈາກ <xliff:g id="APP_0">%1$s</xliff:g> ພະຍາຍາມເປີດໃຊ້ວຽກຢູ່ຕະຫຼອດ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດຢຸດ <xliff:g id="APP_1">%1$s</xliff:g> ແລະ ປ້ອງກັນບໍ່ໃຫ້ມັນເຮັດວຽກໃນພື້ນຫຼັງໄດ້."</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="7774807745601479888">"ໂທລະສັບຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຂອງທ່ານໃນຕອນທີ່ທ່ານບໍ່ໄດ້ໃຊ້ແອັບດັ່ງກ່າວ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດປິດສະຖານທີ່ສຳລັບແອັບນີ້ໄດ້."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"ແທັບເລັດຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມຮ້ອງຂໍຂໍ້ມູນສະຖານທີ່ຂອງທ່ານໃນຕອນທີ່ທ່ານບໍ່ໄດ້ໃຊ້ແອັບດັ່ງກ່າວ.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດປິດສະຖານທີ່ສຳລັບແອັບນີ້ໄດ້."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"ອຸປະກອນຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ເນື່ອງຈາກ <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ວິເຄາະນັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"ສາກເຕັມຫຼ້າສຸດ"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ເວລາແບັດເຕີຣີທີ່ຍັງເຫຼືອແມ່ນເປັນການປະມານການ ແລະ ສາມາດປ່ຽນແປງໄດ້ຕາມການນຳໃຊ້"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ຂໍ້ມູນການນຳໃຊ້ແບັດເຕີຣີເປັນການປະມານການເທົ່ານັ້ນ ແລະ ສາມາດປ່ຽນແປງໄດ້ຂຶ້ນກັບການນຳໃຊ້ຕົວຈິງ"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"ໃນຂະນະນຳໃຊ້ຢູ່"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"ໃນຂະນະຢູ່ໃນພື້ນຫຼັງ"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ການໃຊ້ແບັດເຕີຣີ"</string>
@@ -2497,7 +2578,7 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"ເພີ່ມຜູ້ໃຊ້ໃໝ່ບໍ?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"ທ່ານ​ສາ​ມາດ​ແບ່ງ​ປັນ​ອຸ​ປະ​ກອນ​ນີ້​ໃຫ້​ຄົນ​ອື່ນ​ໃຊ້​ໄດ້​ໂດຍ​ການ​ສ້າງ​ຜູ້​ໃຊ້​ເພີ່ມ​ເຕີມ. ແຕ່​ລະ​ຜູ້​ໃຊ້​ຈະ​ມີ​ພື້ນ​ທີ່​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ເຂົາ​ເຈົ້າ​ເອງ​ ເຊິ່ງ​ພວກ​ເຂົາ​ຈະ​ສາ​ມາດ​ຈັດ​ລະ​ບຽບ​ແອັບ, ຮູບ​ພາບ​ພື້ນຫຼັງ ແລະ​ອື່ນໆ​ຂອງ​ເຂົາ​ເຈົ້າ​ໄດ້. ຜູ້​ໃຊ້​ຕ່າງໆ​ຍັງ​ຈະ​ສາ​ມາດ​ປັບ​ແຕ່ງ​ການ​ຕັ້ງ​ຄ່າ​ຂອງ​ອຸ​ປະ​ກອນ​ໄດ້​ ເຊັ່ນ: Wi‑Fi ເຊິ່ງ​ຈະ​ມີ​ຜົນ​ກັບ​ຜູ້​ໃຊ້​ທຸກ​ຄົນ.\n\nເມື່ອ​ທ່ານ​ເພີ່ມ​ຜູ້ໃຊ້​ໃໝ່, ຜູ້​ໃຊ້​ນັ້ນ​ຈະ​ຕ້ອງ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ລາວ.\nຜູ້\n​ໃຊ້​ທຸກ​ຄົນ​ສາ​ມາດ​ອັບ​ເດດ​ແອັບສຳ​ລັບ​ຜູ້​ໃຊ້​ຄົນ​ອື່ນ​ທັງ​ໝົດ​ໄດ້."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"ເມື່ອ​ທ່ານ​ເພີ່ມ​ຜູ້​ໃຊ້​ໃໝ່, ຜູ້​ໃຊ້​ນັ້ນ​ຈະ​ຕ້ອງ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ​ຂອງ​ລາວ.\n\nຜູ້​ໃຊ້​ທຸກ​ຄົນ​ສາ​ມາດ​ອັບ​ເດດ​ແອັບຯສຳ​ລັບ​ຜູ້​ໃຊ້​ຄົນ​ອື່ນ​ທັງ​ໝົດ​ໄດ້."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"ຕັ້ງຄ່າຜູ່ໃຊ້ດຽວນີ້?"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"ຕັ້ງຄ່າຜູ້ໃຊ້ຕອນນີ້ບໍ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ກວດ​ສອບ​ໃຫ້​ແນ່​ໃຈ​ວ່າ​ບຸກ​ຄົນ​ດັ່ງ​ກ່າວ​ສາ​ມາດ​ຮັບ​ອຸ​ປະ​ກອນ​ແລະ​ຕັ້ງ​ຄ່າ​ພື້ນ​ທີ່​ຂອງ​ພວກ​ເຂົາ​ໄດ້"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"ຕັ້ງຄ່າໂປຣໄຟລ໌ດຽວນີ້?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"ຕັ້ງຄ່າດຽວນີ້"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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">"ສິດອະນຸຍາດ, ແອັບເລີ່ມຕົ້ນ"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ຜູ້ໃຊ້ ແລະ ບັນຊີ"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"ເລື່ອນເພື່ອປົດລັອກ, ລະຫັດຜ່ານ, ຮູບແບບ, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ສິ່ງທ້າທາຍດ້ານວຽກເຮັດ, ວຽກ, ໂປຣໄຟລ໌"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ, ໂປຣໄຟລ໌ທີ່ມີການຈັດການ, ຮວມ, ການຮວມ, ວຽກ, ໂປຣໄຟລ໌"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ທ່າທາງ"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ທ່າທາງ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ສຳຮອງຂໍ້ມູນ, ສຳຮອງ ຂໍ້ມູນ"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ທ່າທາງ"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ຈາກ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ໃສ່​ດາວ​ໄວ້​ເທົ່າ​ນັ້ນ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ບໍ່ມີ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ໂມງປຸກ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ສຽງໂມງປຸກແມ່ນມີຄວາມສຳຄັນສະເໝີ ແລະ ຈະເປີດສຽງເຕືອນ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"ການແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ກິດຈະກຳ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ຜູ້​ໂທທັງ​ໝົດ"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ທ່າທາງແບບຊ່ວຍ"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ຄວາມອ່ອນໄຫວ"</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="gesture_setting_on" msgid="3455094265233870280">"ເປີດ"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ປິດ"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader ຖືກປົດລັອກຢູ່ກ່ອນແລ້ວ"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ຊິ້ງຂໍ້ມູນວຽກອັດຕະໂນມັດ"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"ໃຫ້ແອັບໂຫຼດຂໍ້ມູນຄືນໃໝ່ໂດຍອັດຕະໂນມັດ"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"ການຊິ້ງຂໍ້ມູນບັນຊີ"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"ເປີດຊິ້ງຂໍ້ມູນສຳລັບ <xliff:g id="ID_1">%1$d</xliff:g> ຈາກທັງໝົດ <xliff:g id="ID_2">%2$d</xliff:g> ລາຍການ"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"ເປີດການຊິ້ງຂໍ້ມູນຕະຫຼອດເວລາ"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"ປິດການຊິ້ງຂໍ້ມູນຕະຫຼອດເວລາ"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"ຂໍ້ມູນອຸປະກອນທີ່ມີການຈັດການ"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"ການປ່ຽນແປງ ແລະ ການຕັ້ງຄ່າທີ່ຈັດການໂດຍອົງກອນຂອງທ່ານ"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"ການປ່ຽນແປງ ແລະ ການຕັ້ງຄ່າທີ່ຈັດການໂດຍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"ມີຫຍັງໃໝ່ ແລະ ໜ້າຕື່ນເຕັ້ນ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ກວດເບິ່ງຄຸນສົມບັດຍອດນິຍົມ 5 ອັນດັບ"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"ສະຖານະການລົງທະບຽນ IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"ລົງທະບຽນແລ້ວ"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ບໍ່ໄດ້ລົງທະບຽນ"</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 9b48cb749d95e5a80a10483ed6cf51d1fe8e2490..1c7be2015e89c20c2227d72ae4e77b89bdebdc31 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 d9800670ee19ce363f7285eb860843d8e3e31964..152b26605a8b9607ce5c6ce54dc86ca98f54095a 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Atlikti vėliau"</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 +466,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 +538,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="1688030823464420974">"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="5350785938296254352">"Jei kitu bandymu įvesite netinkamą PIN kodą, šio įrenginio duomenys bus ištrinti"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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="5047439819181833824">"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 +669,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>
@@ -708,16 +737,19 @@
     <string name="wifi_error" msgid="3207971103917128179">"Klaida"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz juosta neprieinama šioje šalyje"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Veikia lėktuvo režimu"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Pranešimas apie atvirą tinklą"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Pranešimas apie atvirąjį tinklą"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Pranešti, kai pasiekiamas aukštos kokybės viešas tinklas"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Automatiškai įjungti „Wi‑Fi“"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"„Wi‑Fi“ bus vėl įjungtas esant šalia išsaugotų aukštos kokybės tinklų, pvz., jūsų namų tinklo"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nepasiekiama, nes „Wi‑Fi“ nuskaitymas išjungtas"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Jei norite naudoti, pasirinkite tinklo įvertinimo paslaugos teikėją"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vengti prasto ryšio"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nenaudoti „Wi-Fi“ tinklo, jei jo interneto ryšys nėra geras"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Naudoti tik tuos tinklus, kurių stiprus interneto ryšys"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Prisijungti prie atvirųjų tinklų"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatiškai prisijungti prie aukštos kokybės viešų tinklų"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatiškai prisijungti prie aukštos kokybės viešųjų tinklų"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Jei norite naudoti, pasirinkite tinklo įvertinimo paslaugos teikėją"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Jei norite naudoti, pasirinkite suderinamą tinklo įvertinimo paslaugos teikėją"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Įdiegti sertifikatus"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Kad būtų galima patobulinti vietovės informacijos tikslumą, sistemos programos ir paslaugos vis tiek gali nuskaityti „Wi-Fi“ ryšio tinklus. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Kad būtų galima patobulinti vietovės informacijos tikslumą, įjunkite „Wi-Fi“ nuskaitymą <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nuskaitymo nustatymuose<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -801,6 +833,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>
@@ -834,7 +867,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>
@@ -871,9 +903,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>
@@ -920,6 +960,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>
@@ -977,6 +1018,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>
@@ -1004,23 +1046,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>
@@ -1044,8 +1085,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="7337555569694794132">"Visada įjungta / eikvojama daugiau akum. energijos"</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="6978257596231155345">"Rodomas laikas, pranešimų piktogramos ir kita informacija. Eikvojama daugiau akumuliatoriaus energijos."</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>
@@ -1299,6 +1346,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>
@@ -1324,12 +1372,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Yra kitų šio įrenginio naudotojų.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatoriai naudojant „eSIM“ kortelę"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Tai atlikus mobiliojo ryšio paslaugos planas nebus atšauktas."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Norint išvalyti muzikos failus, paveikslėlius bei kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintį"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Norint išvalyti muzikos failus, paveikslėlius ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ištrinti USB atmintinę"</string>
     <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>
@@ -1352,26 +1405,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>
@@ -1404,7 +1446,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>
@@ -1449,8 +1491,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>
@@ -1519,6 +1564,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>
@@ -1689,6 +1737,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>
@@ -1787,6 +1839,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrano skaitytuvai, vaizdo, sąveikos valdikliai"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Matomumo nustatymai"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Galite tinkinti šį įrenginį pagal savo poreikius. Vėliau šias pritaikymo neįgaliesiems funkcijas galite pakeisti nustatymuose."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Padidinkite šrifto dydį"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrano skaitytuvai"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Garsas ir tekstas ekrane"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekranas"</string>
@@ -1915,6 +1968,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>
@@ -1981,6 +2040,29 @@
     <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="4006631636646776488">"Telefonas negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ jį pažadina.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti programą.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Planšetinis kompiuteris negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ jį pažadina.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti programą.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Įrenginys negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ jį pažadina.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti programą.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefonas negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP_0">%1$s</xliff:g>“ nuolat pažadina telefoną.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti „<xliff:g id="APP_1">%1$s</xliff:g>“.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Planšetinis kompiuteris negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP_0">%1$s</xliff:g>“ nuolat pažadina planšetinį kompiuterį.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti „<xliff:g id="APP_1">%1$s</xliff:g>“.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Įrenginys negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP_0">%1$s</xliff:g>“ nuolat pažadina įrenginį.\n\nKad pabandytumėte išspręsti šią problemą, galite sustabdyti „<xliff:g id="APP_1">%1$s</xliff:g>“.\n\nJei tai kartosis, gali reikėti pašalinti programą, kad pagerintumėte akumuliatoriaus našumą."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Sustabdyti programą"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Išjungti naudojimą fone ir sustabdyti programą?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefonas negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP_0">%1$s</xliff:g>“ nuolat pažadina telefoną.\n\nKad pabandytumėte išspręsti problemą, galite sustabdyti „<xliff:g id="APP_1">%1$s</xliff:g>“ ir neleisti veikti fone."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Planšetinis kompiuteris negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP_0">%1$s</xliff:g>“ nuolat pažadina planšetinį kompiuterį.\n\nKad pabandytumėte išspręsti problemą, galite sustabdyti „<xliff:g id="APP_1">%1$s</xliff:g>“ ir neleisti veikti fone."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Įrenginys negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP_0">%1$s</xliff:g>“ nuolat pažadina įrenginį.\n\nKad pabandytumėte išspręsti problemą, galite sustabdyti „<xliff:g id="APP_1">%1$s</xliff:g>“ ir neleisti veikti 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="7774807745601479888">"Telefonas negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ nuolat teikia vietos užklausas, kai nenaudojate programos.\n\nKad išspręstumėte šią problemą, galite neleisti šiai programai pasiekti vietos informacijos."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Planšetinis kompiuteris negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ nuolat teikia vietos užklausas, kai nenaudojate programos.\n\nKad išspręstumėte šią problemą, galite neleisti šiai programai pasiekti vietos informacijos."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Įrenginys negali įprastai tvarkyti akumuliatoriaus, nes „<xliff:g id="APP">%1$s</xliff:g>“ nuolat teikia vietos užklausas, kai nenaudojate programos.\n\nKad išspręstumėte šią problemą, galite neleisti šiai 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>
@@ -1995,7 +2077,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>
@@ -2047,12 +2129,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Naudojimo nuo paskutinio visiško įkrovimo analizė"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Paskutinis visiškas įkrovimas"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Likęs akumuliatoriaus veikimo laikas yra apytikslis ir gali pasikeisti atsižvelgiant į naudojimą"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Akumuliatoriaus naudojimo duomenys yra apytiksliai ir gali pasikeisti atsižvelgiant į naudojimą"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktyviai naudojant"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Kai veikia fone"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Akumuliatoriaus energijos vartojimas"</string>
@@ -2069,7 +2152,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"„Android“ OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Medijos serveris"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Programų optimizavimas"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Akumuliatoriaus tausojimo priemonė"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Akumuliatoriaus tausojimo pr."</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Įjungti automatiškai"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Niekada"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"kai akumuliatoriaus įkrovos lygis yra <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2614,7 +2697,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">"Pagalb. str., palaikym. tel. ir pokalb., darbo pr."</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,10 +2788,13 @@
       <item quantity="many">Rodyti %d paslėpto elemento</item>
       <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_title" msgid="4771589228992391573">"Tinklas ir internetas"</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>
@@ -2758,9 +2844,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slysti ir atrakinti, slaptažodis, šablonas, PIN kodas"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"darbo iššūkis, darbas, profilis"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"darbo profilis, tvarkomas profilis, suvienodinti, suvienodinimas, darbas, profilis"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gestas"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestai"</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_assist_gesture_launch" msgid="813968759791342591">"gestas"</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>
@@ -2845,7 +2932,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>
@@ -2860,6 +2948,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>
@@ -2889,8 +2981,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>
@@ -2978,6 +3068,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tik iš žvaigždutėmis pažymėtų kontaktų"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nėra"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signalai"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Įsp. visada yra priorit. ir apie juos pran. garsu"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Priminimai"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Įvykiai"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Visi skambintojai"</string>
@@ -3029,11 +3120,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>
@@ -3041,7 +3127,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>
@@ -3165,8 +3251,21 @@
     <string name="process_format" msgid="77905604092541454">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Akumuliatoriaus optimiz."</string>
     <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="show_all_apps" msgid="1512506948197818534">"Rodyti visą įrenginio naudojimo info."</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>
@@ -3261,8 +3360,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>
@@ -3354,6 +3453,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>
@@ -3372,8 +3484,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>
@@ -3397,7 +3508,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>
@@ -3463,8 +3574,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>
@@ -3541,25 +3651,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Įjungta"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Išjungta"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Paleidyklė jau atrakinta"</string>
@@ -3580,6 +3697,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatiškai sinchronizuoti darbo duomenis"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Leisti programoms automatiškai atnaujinti duomenis"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Paskyros sinchronizavimas"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Įjungtas elementų sinchronizavimas: <xliff:g id="ID_1">%1$d</xliff:g> iš <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Įjungtas visų elementų sinchronizavimas"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Išjungtas visų elementų sinchronizavimas"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Tvarkoma įrenginio informacija"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Pakeitimus ir nustatymus tvarko jūsų organizacija"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Pakeitimus ir nustatymus tvarko „<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>“"</string>
@@ -3674,6 +3794,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>
@@ -3687,5 +3808,11 @@
     <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="698847081680980774">"Kas nauja ir verta dėmesio?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Sužinokite 5 geriausias funkcijas"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registracijos būsena"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Užregistruota"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neužregistruota"</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 94d6557f61465c90659fa7bb3bfa13626e7a7f87..4d26a1559f70e5bf936722c69b92d0b53d7812a0 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 16be87c9053a18322d0c695b3a85333285cb6dd3..977013ad781985b11dec164d37bc602093d75a59 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Vēlāk"</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 +463,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 +535,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"Pārāk daudz nesekmī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 +658,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>
@@ -702,11 +731,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Automātiski ieslēgt Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi tiks automātiski atkārtoti ieslēgts netālu no saglabātiem augstas kvalitātes tīkliem, piemēram, netālu no mājas tīkla."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nav pieejama, jo ir izslēgta Wi‑Fi meklēšana"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Lai izmantotu šo funkciju, atlasiet tīkla vērtējuma sniedzēju."</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Nelietot vājus savienojumus"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nelietot Wi-Fi tīklu, ja vien tam nav labs interneta savienojums"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Izmantot tikai tīklus ar labu interneta savienojumu"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Izveidot savienojumu ar atvērtajiem tīkliem"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automātiski izveidot savienojumu ar augstas kvalitātes publiskajiem tīkliem"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Lai izmantotu šo funkciju, atlasiet tīkla vērtējuma sniedzēju."</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Lai izmantotu šo funkciju, atlasiet saderīgu tīkla vērtējuma sniedzēju."</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikātu instalēšana"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Lai uzlabotu atrašanās vietas noteikšanas precizitāti, sistēmas lietotnēs un pakalpojumos joprojām var meklēt Wi-Fi tīklus. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Lai uzlabotu atrašanās vietas noteikšanas precizitāti, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>meklēšanas iestatījumos<xliff:g id="LINK_END_1">LINK_END</xliff:g> ieslēdziet Wi-Fi meklēšanu."</string>
@@ -790,6 +822,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>
@@ -822,7 +855,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>
@@ -859,9 +891,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>
@@ -908,6 +948,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>
@@ -965,6 +1006,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>
@@ -992,23 +1034,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>
@@ -1032,8 +1073,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="7337555569694794132">"Vienmēr ieslēgts/palielināts akumulatora lietojums"</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="6978257596231155345">"Tiek rādīts laiks, paziņojumu ikonas un cita informācija. Palielināts akumulatora lietojums."</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>
@@ -1286,6 +1333,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>
@@ -1310,12 +1358,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Šo ierīci izmanto vēl citi lietotāji.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mobilo sakaru operatori iegultajā SIM kartē"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jādzēš "<b>"SD kartes"</b>" saturs."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Dzēst USB krātuvi"</string>
     <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>
@@ -1338,26 +1391,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>
@@ -1390,7 +1432,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>
@@ -1435,8 +1477,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">"Kombinācijas iestatīšana"</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>
@@ -1505,6 +1550,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>
@@ -1674,6 +1722,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>
@@ -1772,6 +1824,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrāna lasītāji, attēlojums, mijiedarbības vadīklas"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Redzes iestatījumi"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Varat pielāgot šo ierīci savām vajadzībām. Šīs pieejamības funkcijas var mainīt vēlāk sadaļā Iestatījumi."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Palielināt fonta izmēru"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrāna lasītāji"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio un ekrānā redzamais teksts"</string>
     <string name="display_category_title" msgid="685461049938269166">"Attēlojums"</string>
@@ -1894,6 +1947,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>
@@ -1960,6 +2018,29 @@
     <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="4006631636646776488">"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ē jūsu tālruni.\n\nLai novērstu šo problēmu, varat apturēt lietotnes darbību.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora darbību."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"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ē jūsu planšetdatoru.\n\nLai novērstu šo problēmu, varat apturēt lietotnes darbību.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora darbību."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"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ē jūsu ierīci.\n\nLai novērstu šo problēmu, varat apturēt lietotnes darbību.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora darbību."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Jūsu tālrunis nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP_0">%1$s</xliff:g> arvien aktivizē jūsu tālruni.\n\nLai novērstu šo problēmu, varat apturēt lietotnes <xliff:g id="APP_1">%1$s</xliff:g> darbību.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora darbību."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Jūsu planšetdators nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP_0">%1$s</xliff:g> arvien aktivizē jūsu planšetdatoru.\n\nLai novērstu šo problēmu, varat apturēt lietotnes <xliff:g id="APP_1">%1$s</xliff:g> darbību.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora darbību."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Jūsu ierīce nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP_0">%1$s</xliff:g> arvien aktivizē jūsu ierīci.\n\nLai novērstu šo problēmu, varat apturēt lietotnes <xliff:g id="APP_1">%1$s</xliff:g> darbību.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora darbību."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Apturēt lietotni"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Vai izslēgt lietošanu fonā un apturēt lietotnes darbību?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Jūsu tālrunis nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP_0">%1$s</xliff:g> arvien aktivizē jūsu tālruni.\n\nLai novērstu šo problēmu, varat apturēt lietotnes <xliff:g id="APP_1">%1$s</xliff:g> darbību un neļaut tai darboties fonā."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Jūsu planšetdators nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP_0">%1$s</xliff:g> arvien aktivizē jūsu planšetdatoru.\n\nLai novērstu šo problēmu, varat apturēt lietotnes <xliff:g id="APP_1">%1$s</xliff:g> darbību un neļaut tai darboties fonā."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Jūsu ierīce nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP_0">%1$s</xliff:g> arvien aktivizē jūsu ierīci.\n\nLai novērstu šo problēmu, varat apturēt lietotnes <xliff:g id="APP_1">%1$s</xliff:g> darbību un neļaut tai darboties 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="7774807745601479888">"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 novērstu šo problēmu, varat izslēgt atrašanās vietas datus šai lietotnei."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"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 novērstu šo problēmu, varat izslēgt atrašanās vietas datus šai lietotnei."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"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 novērstu š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>
@@ -1974,7 +2055,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>
@@ -2026,12 +2107,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sadalījums kopš pēdējās pilnās uzlādes"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Pēdējā pilnā uzlāde"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Atlikušais akumulatora darbības ilgums ir aptuvens un var mainīties atkarībā no lietojuma."</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Akumulatora lietojuma dati ir aptuveni un var mainīties atkarībā no lietojuma"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktīvi lietojot"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Darbojoties fonā"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Akumulatora lietojums"</string>
@@ -2589,7 +2671,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>
@@ -2680,9 +2762,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>
@@ -2732,9 +2817,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"vilkt, lai atbloķētu, parole, kombinācija, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"drošības uzdevums darba profilā, darbs, profils"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"darba profils, pārvaldīts profils, apvienot, apvienošana, darbs, profils"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"žests"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"žesti"</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_assist_gesture_launch" msgid="813968759791342591">"žests"</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>
@@ -2818,7 +2904,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>
@@ -2833,6 +2920,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>
@@ -2861,8 +2952,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>
@@ -2948,6 +3037,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tikai no kontaktpersonām ar zvaigznīti"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nav"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signāli"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Signāliem vienmēr ir prioritāte un skaņa"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Atgādinājumi"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Notikumi"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Visi zvanītāji"</string>
@@ -2997,11 +3087,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>
@@ -3009,7 +3094,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>
@@ -3131,6 +3216,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>
@@ -3224,8 +3320,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>
@@ -3316,6 +3412,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>
@@ -3334,8 +3441,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>
@@ -3357,7 +3463,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>
@@ -3422,8 +3528,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>
@@ -3497,25 +3602,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Ieslēgti"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Izslēgti"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Palaišanas ielādētājs jau ir atbloķēts"</string>
@@ -3536,6 +3648,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automātiski sinhronizēt darba datus"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Ļaut lietotnēm automātiski atsvaidzināt datus"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Konta sinhronizācija"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinhronizācija ieslēgta <xliff:g id="ID_1">%1$d</xliff:g> no <xliff:g id="ID_2">%2$d</xliff:g> vienumiem"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sinhronizācija ieslēgta visiem vienumiem"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sinhronizācija izslēgta visiem vienumiem"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informācija par pārvaldīto ierīci"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Izmaiņas un iestatījumus pārvalda jūsu organizācija"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Izmaiņas un iestatījumus pārvalda <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3623,6 +3738,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,6 +3751,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ieslēgts"</string>
     <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="storage_movies_tv" msgid="5498394447562086890">"Filmu un TV lietotnes"</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="698847081680980774">"Kādi ir jaunumi?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Skatiet 5 jaunākās funkcijas"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS reģistrācijas statuss"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Reģistrēts"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Nav reģistrēts"</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 0000000000000000000000000000000000000000..557ded3a0e6730cd84fb218f6110edc336084898
--- /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 0000000000000000000000000000000000000000..d65f1c830826ffff6f726a1f008b47d116f56b1f
--- /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 0000000000000000000000000000000000000000..852ae30229708a321670bf0a630ed75dc982389f
--- /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 0000000000000000000000000000000000000000..78e5c6d1f69d41f57ff762fcfbe7e0b3c645b333
--- /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 0000000000000000000000000000000000000000..cdf2c4257ebc6a6babe8496da9d4a5c2071c51cc
--- /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 0000000000000000000000000000000000000000..1098c18552d4a9d5afb15af698398efeb7b222c1
--- /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 0000000000000000000000000000000000000000..0aea8dab9d2582d83f0a926781415a2fa661cd79
--- /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 0000000000000000000000000000000000000000..3ed6c9faff42e549d35038a0384070ebcb7b94a3
--- /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 0000000000000000000000000000000000000000..cbf6ad60cac73adadd76fd201fb2b2a6d4ff56e9
--- /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 0000000000000000000000000000000000000000..3d42f4f533cf15d0a3c344dd522c3b6f46017d91
--- /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 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 0000000000000000000000000000000000000000..99f21836bd44ee6a88149e8251957f083fc87126
--- /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 0000000000000000000000000000000000000000..46596f4ef4679a4d16fe7aaf04e8b0bdacd40089
--- /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 0000000000000000000000000000000000000000..4cb45d404c0e62d0289598e0edd416debdc76add
--- /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 0000000000000000000000000000000000000000..4dc42c57ad8481949122326b1d092a49fbe5be2a
--- /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 0000000000000000000000000000000000000000..45cff38d9bbcdf8327b2707bc917a5de499bdc9a
--- /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 0000000000000000000000000000000000000000..45cff38d9bbcdf8327b2707bc917a5de499bdc9a
--- /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 0000000000000000000000000000000000000000..45cff38d9bbcdf8327b2707bc917a5de499bdc9a
--- /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 0000000000000000000000000000000000000000..dbfe69471a28bc9a0f3ee7a47eebbc5d7918294d
--- /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 0000000000000000000000000000000000000000..453decf5d0729a18e8218e2fc1d8cabc953dcec5
--- /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 0000000000000000000000000000000000000000..19b7dbcf21b343327cf97a78654e87b1a02978d2
--- /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 0000000000000000000000000000000000000000..cac4c722ed5af0e34c26d56a163cb8deb3972022
--- /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 0000000000000000000000000000000000000000..1440fc6a74aeaede7dccbd3757436fbd6bead310
--- /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 0000000000000000000000000000000000000000..0108dad4f1bc6db2494a88a8157a01d51bcef598
--- /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 0000000000000000000000000000000000000000..92c8a275dd8bb76be652ea4033c6ff536f035670
--- /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 0000000000000000000000000000000000000000..63e2f57220b4c2a2d12aab503334f9c4a83327b6
--- /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 0000000000000000000000000000000000000000..d67c86ff564cee99766164a463a247752558b1da
--- /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 urxencia mediante as chamadas por wifi. Se tentas realizar unha chamada de urxencia, o dispositivo utilizará automaticamente a rede móbil. As chamadas de urxencia 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 0000000000000000000000000000000000000000..f91f4670fbcf50638cb8401a17c60dc287256f65
--- /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"તમે વાઇ-ફાઇ કૉલિંગ મારફતે કટોકટીનો કૉલ કરી શકતા નથી. જો તમે કોઈ કટોકટીનો કૉલ કરવાનો પ્રયાસ કરો છો, તો તમારું ઉપકરણ આપમેળે મોબાઇલ નેટવર્કનો ઉપયોગ કરશે. માત્ર મોબાઇલ નેટવર્ક કવરેજવાળા વિસ્તારમાં જ કટોકટીનો કૉલ કરી શકાય છે."</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 0000000000000000000000000000000000000000..496c6a68f1b187af5a8922d08e6ef0c5227957d8
--- /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 0000000000000000000000000000000000000000..1b1500e82fcdd4c6fc9424c84288ca602fd4a908
--- /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 0000000000000000000000000000000000000000..845cc6c2dce6abd02462f99e5663ba5b13df2edd
--- /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 segélyhívást kezdeményezni. Segélyhívás kezdeményezéséhez eszköze automatikusan mobilhálózatra vált. Segélyhí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 0000000000000000000000000000000000000000..9bcea7e41b5c82dad9e5043d1fa268306948982b
--- /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 0000000000000000000000000000000000000000..3a3a302cd7bcc4ffcae51b71a718b4c5d67cb3a0
--- /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 0000000000000000000000000000000000000000..f44c6678d36bf146cd7dcef6791b45ade3ff9007
--- /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 0000000000000000000000000000000000000000..80e17237b8776f9db3758fb4430e49a7926988d1
--- /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 0000000000000000000000000000000000000000..94cb4027b2e1875acbdad37fa0a53cf2ee9f1467
--- /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 0000000000000000000000000000000000000000..e7ca67936cb98500554aa3d3281e438a978d26b4
--- /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 0000000000000000000000000000000000000000..fc4b903d0e435b97d5a2f00318c55e52f0d3b382
--- /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 0000000000000000000000000000000000000000..5241b1a4da7c39614ef060ee9e4388442801ad09
--- /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 0000000000000000000000000000000000000000..1b04deaf74e247eead80ca8dba8b9e432d5a983d
--- /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 0000000000000000000000000000000000000000..9e87f57e9e12099952e39543956eb0f5dc0e4637
--- /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 0000000000000000000000000000000000000000..8b6b40fbb30f544f6f231fb1f8efd6d84cbb8e4c
--- /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 0000000000000000000000000000000000000000..12d5d6bcba76ab8eb32917b4459c74dcb5caaeff
--- /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 0000000000000000000000000000000000000000..449655bf74ddbae73cc00a1bc61d8694134fce40
--- /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 0000000000000000000000000000000000000000..1aeeca4e1f5717f3dd888f7ef1c0c873db6d84de
--- /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 0000000000000000000000000000000000000000..d6c7f88fd3aa7259378d41eb9ecc4f83613d8165
--- /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 0000000000000000000000000000000000000000..bee5428ac194a44580f29923a6f9d52a01c5a255
--- /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 0000000000000000000000000000000000000000..3304a0ecd3028b6fa9501e1382d73cc1496e36ae
--- /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 0000000000000000000000000000000000000000..4045045cd31a05cd7b0b03fb4e072833282c8734
--- /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 0000000000000000000000000000000000000000..d53b508c1d9e1624e5aab924007968ffef531064
--- /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 0000000000000000000000000000000000000000..a0c1af5b39122211f37c4c5dd4fc3c89dc947840
--- /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 0000000000000000000000000000000000000000..8018dd89265b714e4caf464db9a432a27077dcd0
--- /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 0000000000000000000000000000000000000000..7313a27937e71b57ea0685fc5e7f3ecf45f5deea
--- /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 0000000000000000000000000000000000000000..3ff5b21459886f56943b9b491ab699bac1b4d37b
--- /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 0000000000000000000000000000000000000000..ea4fe1ce400f60134b65057b2526f03891fdc8f7
--- /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 0000000000000000000000000000000000000000..8c7b2c8c49a94a979dc7a05facaa5960505030e1
--- /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"ਤੁਸੀਂ ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਹੋ। ਜੇਕਰ ਤੁਸੀਂ ਕੋਈ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗਾ। ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ ਹਨ।"</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 0000000000000000000000000000000000000000..68173c9124d8e66ff13111882cec3b86a400a916
--- /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 0000000000000000000000000000000000000000..2b30ccb9846f3062e6775416e56f345bc488dfe5
--- /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 0000000000000000000000000000000000000000..f9eef561e0e310b8361a11c4af74ec02b45dd55f
--- /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 0000000000000000000000000000000000000000..2b30ccb9846f3062e6775416e56f345bc488dfe5
--- /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 0000000000000000000000000000000000000000..2a51c052b4cc9ae481b986d47815f3f4dae59d17
--- /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 0000000000000000000000000000000000000000..3dc8c3cf87063e5297e945278017f66dc8eab2a2
--- /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 0000000000000000000000000000000000000000..3d72049992c87a82355644fd01892feb9323d6a5
--- /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 0000000000000000000000000000000000000000..48abf40def1e0077b8ffeec7e7a8f95c307c42f2
--- /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 0000000000000000000000000000000000000000..42e31379ba0a856a4012e9410ad4f3fa067b1c12
--- /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 0000000000000000000000000000000000000000..80fa4914ce80c2d9a5f0776f7fef9d83a16745f9
--- /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 0000000000000000000000000000000000000000..0d67699c6df1f831d83dd0d571bc7aefe920efb4
--- /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 0000000000000000000000000000000000000000..82848f82021be4d3421d99cc951f81e087dd9216
--- /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 0000000000000000000000000000000000000000..5c987592f9c753a68dd730fc2f3f46f10e5a08c3
--- /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 0000000000000000000000000000000000000000..168b3bf6f851e70d7b546fcabb384398849c0437
--- /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 0000000000000000000000000000000000000000..ca0786e3f2d75ac43be68a38e38a3c16378564e4
--- /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 0000000000000000000000000000000000000000..3128bfe37d34591ec97c3e11a7fac8e52ce314e8
--- /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 0000000000000000000000000000000000000000..4671d66f8397713fa2a9c06121ec2f4c809df821
--- /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 0000000000000000000000000000000000000000..9fe9d25efee60f6b11e9919ef0e992fb4aac250b
--- /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 0000000000000000000000000000000000000000..1cf0381afac74031538e20fe26db6b01b8ef4657
--- /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 0000000000000000000000000000000000000000..c1cee4dc44532f0855b9ed361111d7815a268973
--- /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 0000000000000000000000000000000000000000..5e1b59ed4caccb3fc5ceb7bea6ce4df9434d433f
--- /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 0000000000000000000000000000000000000000..126bc506ef139c8518121ba2fd4d39f3a72ed852
--- /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 0000000000000000000000000000000000000000..b2967b61603d351eef9ecdbc729cb5af3b5ff10e
--- /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 0000000000000000000000000000000000000000..22d5c0df8971dc94c6322861cad0be35591e9ced
--- /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 0000000000000000000000000000000000000000..9e6b3a535d1f81bf7939a0ed20c6a0e5b8bad568
--- /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 0000000000000000000000000000000000000000..3c2dfba71eac520a33f7653c5d09b5ca92101c1e
--- /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 0000000000000000000000000000000000000000..280f59e6d39b1333fa8d0f3e81d8ad940a62d84e
--- /dev/null
+++ b/res/values-mcc262-mnc02/strings.xml
@@ -0,0 +1,21 @@
+<?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>
+    <!-- Do not translate. Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+    <string name="wifi_calling_settings_title">"Wi-Fi calling"</string>
+</resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 6f1a4f4bc9f4cd5edfe22f1b8a022cbdf4353cb3..a4c22f6673ebdb6069bff848fcc12db013c14bd3 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>
@@ -235,7 +225,7 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"Внатрешна меморија"</item>
+    <item msgid="8151497958991952759">"Внатрешен капацитет"</item>
     <item msgid="3738430123799803530">"Пренослива СД картичка"</item>
     <item msgid="4498124044785815005">"Дозволи системот да одлучи"</item>
   </string-array>
@@ -270,7 +260,7 @@
     <item msgid="7125408150230860501">"испрати SMS порака"</item>
     <item msgid="7080337936612188061">"прочитај SMS порака на ICC"</item>
     <item msgid="587124103118495063">"напиши SMS порака на ICC"</item>
-    <item msgid="2320577158869025503">"измени подесувања"</item>
+    <item msgid="2320577158869025503">"измени поставки"</item>
     <item msgid="1545733463471924009">"цртај на врвот"</item>
     <item msgid="3609046903962454582">"пристапи кон известувања"</item>
     <item msgid="4671646036128214513">"фотоапарат"</item>
@@ -337,7 +327,7 @@
     <item msgid="1407766984645388488">"Испрати SMS/MMS порака"</item>
     <item msgid="3527273606643794973">"Прочитај SMS/MMS порака"</item>
     <item msgid="4370895547001583812">"Напиши SMS/MMS порака"</item>
-    <item msgid="4218544235221631789">"Измени подесувања"</item>
+    <item msgid="4218544235221631789">"Измени поставки"</item>
     <item msgid="736541391767350377">"Цртај на врвот"</item>
     <item msgid="5530815681721654194">"Пристапи кон известувања"</item>
     <item msgid="781213371706962767">"Камера"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4052103f76451df74bdc66518d7ed06c68af3ac5..d662febb3a195ab0586292dff74aeddc66059135 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) -->
@@ -269,7 +281,7 @@
     <string name="done" msgid="6942539184162713160">"Готово"</string>
     <string name="settings_label" msgid="1626402585530130914">"Поставки"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Поставки"</string>
-    <string name="settings_shortcut" msgid="3936651951364030415">"Кратенка за подесувања"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"Кратенка за поставки"</string>
     <string name="activity_list_empty" msgid="6428823323471264836">"Не се пронајдени активности што се соовпаѓаат."</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим на работа во авион"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Повеќе"</string>
@@ -288,7 +300,7 @@
     <string name="roaming_warning" msgid="4275443317524544705">"Може да направите големи трошоци."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Кога ќе овозможите роаминг на податоци, може да направите големи трошоци за роаминг!\n\nОва подесување влијае на сите корисници на овој таблет."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Кога ќе овозможите роаминг на податоци, може да направите големи трошоци за роаминг!\n\nОва подесување влијае на сите корисници на овој телефон."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Дозволи роаминг на податоци?"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Дозволи интернет-роаминг?"</string>
     <string name="networks" msgid="6333316876545927039">"Избор на оператор"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Избери оператор на мрежа"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Датум и време"</string>
@@ -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,43 +366,42 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Направи подоцна"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Да се прескокне поставувањето отпечаток?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Избравте да го користите отпечатокот од прстот како еден од начините на отклучување на телефонот. Ако го прескокнете сега, ќе треба да го поставите подоцна. За поставувањето ќе ви треба околу една минута."</string>
     <string name="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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Запишувањето со отпечаток од прст не успеа. Обидете се повторно или користете друг прст."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Додај друг"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Следно"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Освен за отклучување на телефонот, отпечатокот може да го користите и за да авторизирате купувања и да пристапувате до апликации. "<annotation id="url">"Дознајте повеќе"</annotation></string>
@@ -402,7 +413,7 @@
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Да се отстранат сите отпечатоци?"</string>
     <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Нема да може да ги користите отпечатоците за да го отклучите телефонот, да одобрувате купувања или да се најавувате на апликации со нив"</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Нема да може да ги користите отпечатоците за да го отклучите работниот профил, да одобрувате купувања или да се најавувате на апликациите за работа"</string>
-    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Да, отстрани"</string>
+    <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Отстрани го"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Користете го отпечатокот на прст за да продолжите."</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрирање"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифрирај таблет"</string>
@@ -429,7 +440,7 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Предупредување: уредот ќе се избрише по уште <xliff:g id="COUNT">^1</xliff:g> неуспешни обиди да се отклучи!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Напиши ја лозинката"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрирањето е неуспешно"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Шифрирањето се прекина и не може да се заврши. Како резултат на тоа, податоците од вашиот таблет веќе не се достапни. \n \n За да продолжите да го користите таблетот, треба да се изврши ресетирање на фабричките подесувања. Кога ќе го подесите таблетот по ресетирањето, ќе имате можност да ги обновите сите податоци за кои имате резервна копија на вашата сметка на Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Шифрирањето се прекина и не може да се заврши. Како резултат на тоа, податоците од вашиот таблет веќе не се достапни. \n \n За да продолжите да го користите таблетот, треба да се изврши ресетирање на фабричките поставки. Кога ќе го подесите таблетот по ресетирањето, ќе имате можност да ги обновите сите податоци за кои имате резервна копија на вашата сметка на Google."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Шифрирањето се прекина и не може да се заврши. Како резултат на тоа, податоците од вашиот телефон веќе не се достапни. \n \nЗа да продолжите да го користите телефонот, треба да се изврши ресетирање на фабричките поставувања. Кога ќе го подесите телефонот по ресетирањето, ќе имате можност да ги обновите сите податоци за кои имате резервна копија на вашата сметка на Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Дешифрирањето е неуспешно"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Лозинката што ја внесовте е правилна, но, за жал, податоците се оштетени. \n\nЗа да продолжите да го користите таблетот, треба да извршите фабричко ресетирање. Кога ќе го поставувате таблетот по ресетирањето, ќе имате можност да ги обновите сите податоци што имаат резервни копии на вашата сметка на Google."</string>
@@ -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>
@@ -515,17 +528,25 @@
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Функциите за заштита на профилот нема да работат без заклучувањето на екранот.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Ќе се отстранат и зачуваните отпечатоци од овој профил и нема да може да го отклучувате профилот, да овластувате купувања или да се најавувате на апликации со нив."</string>
-    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Да, отстрани"</string>
+    <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Отстрани ја"</string>
     <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="1688030823464420974">"Ако внесете неточна шема при следниот обид, податоците на уредов ќе се избришат"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ако внесете неточен PIN при следниот обид, податоците на уредов ќе се избришат"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Ако внесете неточна лозинка при следниот обид, податоците на уредов ќе се избришат"</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="5047439819181833824">"Премногу неточни обиди. Податоците на уредов ќе се избришат."</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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Автоматски вклучи Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi ќе се вклучи автоматски на зачувани мрежи со висок квалитет во близина, како на пр., вашата домашна мрежа"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недостапно бидејќи скенирањето преку Wi-Fi е исклучено"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"За користење, изберете оператор за оценување мрежа"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Избегнувај слаби поврзувања"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Не користи Wi-Fi мрежа, освен ако има добро поврзување со интернет"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Користи само мрежи со добро поврзување на интернет"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Поврзувај се на отворени мрежи"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Автоматски поврзувај се на јавни мрежи со висок квалитет"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"За користење, изберете оператор за оценување мрежа"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"За користење, изберете компатибилен оператор за оценување мрежа"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталирај сертификати"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"За да се подобри точноста на локацијата, системските апликации и услуги сѐ уште може да скенираат 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"За да се подобри точноста на локацијата, вклучете „Скенирање на Wi‑Fi“ во <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>поставките за скенирање<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -755,7 +787,7 @@
     <string name="wifi_status" msgid="4824568012414605414">"Статус"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Брзина на врска"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"Фреквенција"</string>
-    <string name="wifi_ip_address" msgid="1440054061044402918">"ИП адреса"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"IP-адреса"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"Зачувано преку"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"Акредитиви на <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP метод"</string>
@@ -779,6 +811,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>
@@ -810,9 +843,8 @@
       <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_advanced_ip_address_title" msgid="6215297094363164846">"IP-адреса"</string>
     <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска на подмрежа"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адреси"</string>
@@ -846,16 +878,24 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Дали сакате да ја откажете поканата да се поврзете со <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_checkbox_text" msgid="7763495093333664887">"Точка на пристап за Wi‑Fi"</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>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Грешка на точка на пристап на пренослива Wi-Fi"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Поставете точка на пристап со Wi-Fi"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Постав. жешко место за Wi‑Fi"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Точка на пристап за Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Точка на пристап AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Точка на пристап <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Секогаш вклучен/Зголемена употреба на батеријата"</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="6978257596231155345">"Прикажување на времето, иконите за известување и други информации. Зголемена употреба на батеријата."</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>
@@ -1072,8 +1119,8 @@
     <string name="hardware_revision" msgid="8893547686367095527">"Верзија на хардвер"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID на опрема"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Верзија со основен појас на фреквенција"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"Верзија на јадро"</string>
-    <string name="build_number" msgid="3075795840572241758">"Изгради број"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Верзија на кернел"</string>
+    <string name="build_number" msgid="3075795840572241758">"Број на верзија"</string>
     <string name="selinux_status" msgid="6212165375172061672">"Статус на SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Не е достапна"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Статус"</string>
@@ -1201,7 +1248,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Систем"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Истражи <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Под друго се подразбира споделени датотеки што ги зачувале апликациите, датотеки преземени од интернет или Bluetooth, датотеки на Android итн. \n\nЗа да ги видите видливите содржини на <xliff:g id="NAME">^1</xliff:g>, допрете Истражи."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Системот опфаќа датотеки што се извршуваат на верзијата на Android <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Системот опфаќа датотеки што се извршуваат на верзијата <xliff:g id="VERSION">%s</xliff:g> на Android"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> може да има зачувани фотографии, музика, апликации или други податоци што зафаќаат <xliff:g id="SIZE">^2</xliff:g> меморија. \n\nЗа детали, префрлете се на <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Поставете <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Користи како пренослива меморија"</string>
@@ -1273,9 +1320,10 @@
     <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="restore_default_apn" msgid="8178010218751639581">"Враќање стандардни подесувања на APN."</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>
+    <string name="restore_default_apn_completed" msgid="2824775307377604897">"Ресетирањето стандардни поставки на APN е завршено."</string>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Ресетирај"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Ресетирање мрежни поставки"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Ова ќе ги ресетира сите мрежни поставки, вклучувајќи:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилен интернет"</li>\n<li>"Bluetooth"</li></string>
@@ -1291,17 +1339,22 @@
       <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> сметки ќе се ресетираат</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"Внатрешната меморија и сите податоци ќе се ресетираат"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ова ќе ги избрише сите податоци од "<b>"внатрешна меморија"</b>"на вашиот таблет, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и подесувања на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и подесувања на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Ова ќе ги избрише сите податоци од "<b>"внатрешна меморија"</b>"на вашиот таблет, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и поставки на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоци и поставки на систем и апликации"</li>\n<li>"преземени апликации"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Моментално сте најавени на следниве сметки:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Присутни се и други корисници на уредот.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографии"</li>\n<li>"Други податоци за корисникот"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Оператори на eSIM-картичката"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Тоа нема да го откаже вашиот пакет за мобилни услуги."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"меморијата"</b>" треба да се избрише."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"СД картичката"</b>" треба да се избрише."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Избриши USB меморија"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1409,7 +1451,7 @@
     <string name="license_title" msgid="1990487604356037871">"Лиценца"</string>
     <string name="terms_title" msgid="7697580845616764642">"Правила и услови"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"Системска лиценца за WebView"</string>
-    <string name="wallpaper_attributions" msgid="3645880512943433928">"Позадини"</string>
+    <string name="wallpaper_attributions" msgid="3645880512943433928">"Тапети"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Даватели на сателитски снимки:\n©2014 CNES/Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Упатство"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Постои проблем со вчитување на упатството."</string>
@@ -1421,8 +1463,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 +1536,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>
@@ -1559,7 +1607,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"СД мемо картич."</string>
     <string name="recompute_size" msgid="7722567982831691718">"Повторно пресметување големина..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Избриши податоци за апликацијата?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, подесувања, сметки, бази на податоци, итн."</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, поставки, сметки, бази на податоци, итн."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Во ред"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Откажи"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Читачи на екран, екран, контроли за интеракција"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Визуелна пристапност"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Уредот може да го приспособите да одговара на вашите потреби. Овие карактеристики за пристапност може да ги смените подоцна во Поставки."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Зголемете ја големината на фонтот"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Читачи на екран"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио и текст на екранот"</string>
     <string name="display_category_title" msgid="685461049938269166">"Приказ"</string>
@@ -1796,7 +1849,7 @@
     <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g>/<xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ВКЛУЧЕНО"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ИСКЛУЧЕНО"</string>
-    <string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи во „Брзи подесувања“"</string>
+    <string name="enable_quick_setting" msgid="2366999897816894536">"Прикажи во „Брзи поставки“"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"Режим на корекција"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
       <item quantity="one">Исклучително кратко задржување (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Телефонот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи телефонот активен.\n\nЗа да го решите проблемов, може да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Таблетот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи телефонот активен.\n\nЗа да го решите проблемов, може да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Уредот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи уредот активен.\n\nЗа да го решите проблемов, може да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Телефонот не може да управува со батеријата нормално затоа што <xliff:g id="APP_0">%1$s</xliff:g> постојано го активира.\n\nЗа да го решите проблемов, може да ја исклучите <xliff:g id="APP_1">%1$s</xliff:g>.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Таблетот не може да управува со батеријата нормално затоа што <xliff:g id="APP_0">%1$s</xliff:g> постојано го активира.\n\nЗа да го решите проблемов, може да ја исклучите <xliff:g id="APP_1">%1$s</xliff:g>.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Уредот не може да управува со батеријата нормално затоа што <xliff:g id="APP_0">%1$s</xliff:g> постојано го активира.\n\nЗа да го решите проблемов, може да ја исклучите <xliff:g id="APP_1">%1$s</xliff:g>.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Исклучи ја апликацијата"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Да се исклучат користењето во заднина и апликацијата?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Телефонот не може да управува со батеријата нормално затоа што <xliff:g id="APP_0">%1$s</xliff:g> постојано го буди телефонот.\n\nЗа да го решите проблемов, може да ја исклучите <xliff:g id="APP_1">%1$s</xliff:g> и да го спречите нејзиното извршување во заднина."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Таблетот не може да управува со батеријата нормално затоа што <xliff:g id="APP_0">%1$s</xliff:g> постојано го буди таблетот.\n\nЗа да го решите проблемов, може да ја исклучите <xliff:g id="APP_1">%1$s</xliff:g> и да го спречите нејзиното извршување во заднина."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Уредот не може да управува со батеријата нормално затоа што <xliff:g id="APP_0">%1$s</xliff:g> постојано го буди уредот.\n\nЗа да го решите проблемов, може да ја исклучите <xliff:g id="APP_1">%1$s</xliff:g> и да го спречите нејзиното извршување во заднина."</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="7774807745601479888">"Телефонот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> постојано ја бара вашата локација кога не ја користите апликацијата.\n\nЗа да го решите проблемов, може да ја исклучите локацијата за апликацијава."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Таблетот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> постојано ја бара вашата локација кога не ја користите апликацијата.\n\nЗа да го решите проблемов, може да ја исклучите локацијата за апликацијава."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Уредот не може да управува со батеријата нормално затоа што <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 +2033,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>
@@ -1998,19 +2078,20 @@
     <string name="battery_desc_apps" msgid="8530418792605735226">"Апликацијата ја користи батеријата"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Запри ја или деинсталирај ја апликацијата"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Избери режим на штедење на батерија"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Апликацијата можеби има подесувања за да се намали користењето батерија"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Апликацијата можеби има поставки за да се намали користењето батерија"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Батерија искористена од корисникот"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"Разнообразно користење на напојување"</string>
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Користење на батеријата е приближното користење на напојувањето на батеријата и не ги вклучува сите извори што ја трошат. Разнообразно е разликата помеѓу пресметаното приближно користење на батеријата и вистинското трошење што се забележува кај батеријата."</string>
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Детали по последното целосно полнење"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Последно целосно полнење"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Преостанатото време на батеријата е приближно и може да се промени во зависност од употребата"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Податоците за батеријата се приближни и може да се променат според употребата"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Во активна употреба"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Употреба во заднина"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Употреба на батеријата"</string>
@@ -2150,11 +2231,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Бекап и обнова"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични податоци"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Направи резервна копија на моите податоци"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Бекап на податоци за апликација, на лозинки на Wi-Fi и други подесувања на сервери на Google"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Резервна сметка"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Бекап на податоци за апликација, на лозинки на Wi-Fi и други поставки на сервери на Google"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Сметка за бекап"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Опфати податоци за апликација"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Автоматско враќање"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"При инсталирање апликација, обнови снимени подесувања и податоци"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"При инсталирање апликација, обнови снимени поставки и податоци"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"Услугата за бекап не е активна"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Во моментов нема сметка каде што се складираат резервни копии на податоци"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
@@ -2339,7 +2420,7 @@
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Ова ќе ги зачува податоците и употребата на батеријата, но треба секоја сметка да се синхронизира рачно за да се соберат најнови информации. Освен тоа, нема да добивате известувања за ажурирања."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Датум на ресетирање циклус на употреба"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Датум за секој месец:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Поставено"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Постави"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Постави опомена за потрошен интернет"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Постави граница на потрошен интернет"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ограничување користење на интернет"</string>
@@ -2497,7 +2578,7 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Да се додаде нов корисник?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Со создавање дополнителни корисници може да го споделите уредов со други. Секој корисник има сопствен простор што може да го нагодува со сопствени апликации, тапети и така натаму. Корисниците може и да нагодуваат поставки на уредот, како Wi‑Fi, што се однесуваат на сите.\n\nКога додавате нов корисник, тој треба да го постави својот простор.\n\nСекој корисник може да ажурира апликации за сите други корисници."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Кога додавате нов корисник, тоа лице треба да го постави својот простор.\n\nСекој корисник може да ажурира апликации за сите други корисници."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Постави корисник сега?"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Ќе поставите корисник сега?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Проверете дали лицето е достапно да го земе уредот и да го постави својот простор"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Постави профил сега?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Постави сега"</string>
@@ -2538,7 +2619,7 @@
     <string name="emergency_info_summary" msgid="5062945162967838521">"Информации и контакти за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволи апликации и содржина"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликации со ограничувања"</string>
-    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подесувања за апликација"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири поставки за апликација"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ова подесување влијае на сите корисници на овој таблет."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ова подесување влијае на сите корисници на овој телефон."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промени јазик"</string>
@@ -2564,7 +2645,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>
@@ -2594,9 +2675,9 @@
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Оваа апликација може да пристапи кон вашите сметки"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Оваа апликација може да пристапува до вашите сметки. Контролирано од <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fi и мобилен"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дозволи промена на Wi-Fi и подесувања на мобилен"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дозволи промена на Wi-Fi и поставки на мобилен"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Дозволи промена на спарувања и подесувања на Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Дозволи промена на спарувања и поставки на Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Дозволете размена на податоци кога <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ќе допре друг уред со NFC"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Овозможи размена на податоци кога таблетот допира друг уред"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"лизгајте за отклучување, лозинка, шема, пин"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"работен предизвик, работа, профил"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"работен профил, управуван профил, унифицирај, унифицирање, работа, профил"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"движење"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"движења"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"плати, допри, плаќања"</string>
     <string name="keywords_backup" msgid="470070289135403022">"бекап, прави бекап"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"движење"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Само од контактите со ѕвезда"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Никој"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Алармите секогаш се приоритетни и со звук"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Потсетници"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Настани"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Сите повикувачи"</string>
@@ -2965,19 +3054,14 @@
     <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>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Може дополнително да го заштитите уредот ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
-    <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_pin" msgid="2317181134653424679">"Може дополнително да го заштитите уредот ако го бара PIN-кодот пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Може дополнително да го заштитите уредот ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
+    <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="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>
@@ -3075,7 +3159,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Стандардно)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Систем)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Стандардно за системот)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Складирање апликации"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Капацитет за апл."</string>
     <string name="usage_access" msgid="5479504953931038165">"Пристап за користење"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Дозволи пристап за користење"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Претпочитани поставки за користење на аплик."</string>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,15 +3398,14 @@
     <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>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничувања</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Пресметаниот сообраќај на операторот може да се разликува од пресметаниот сообраќај на вашиот уред"</string>
-    <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> потрошено"</string>
+    <string name="data_used_template" msgid="3245919669966296505">"Потрошено <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Извести за потрошен интернет"</string>
     <string name="data_warning" msgid="209133958008062117">"Предупредување за интернет"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ограничување на интернет"</string>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Движење за помош"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Чувствителност"</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="gesture_setting_on" msgid="3455094265233870280">"Вклучено"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Исклучено"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Подигнувачот веќе е отклучен"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Автоматска синхронизација на деловни податоци"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Дозволете им на апликациите автоматски да ги освежуваат податоците"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Синхронизирање сметка"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Синхронизацијата е вклучена за <xliff:g id="ID_1">%1$d</xliff:g> од <xliff:g id="ID_2">%2$d</xliff:g> ставки"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Синхронизацијата е вклучена за сите ставки"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Синхронизацијата е исклучена за сите ставки"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Информации за управуваниот уред"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Измени и поставки со кои управува организацијата"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Измени и поставки со кои управува <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,9 +3682,10 @@
     <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>
+    <string name="autofill_app" msgid="7338387238377914374">"Автоматско пополнување"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматско, пополнување, автоматско пополнување"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Проверете дали е ова апликација на која ѝ верувате&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=„Автоматско пополнување на Google“&gt;%1$s&lt;/xliff:g&gt; го користи она што е на екранот за да утврди што може автоматски да се пополни."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема на уредот"</string>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Што има ново и интересно?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Погледнете ги најдобрите 5 функции"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Состојба на IMS-регистрација"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Регистриран"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не е регистриран"</string>
 </resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 428a51675e6685ae5ff0333c89d5f7dc8e05a75b..48e531ce0a5d7f7681cc498007dd33caacd9d53b 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>
@@ -253,8 +243,8 @@
     <item msgid="5387405117297558954">"വൈബ്രേറ്റുചെയ്യുക"</item>
     <item msgid="3434165993711230924">"കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക"</item>
     <item msgid="616161687718081936">"കോൺടാക്റ്റുകൾ പരിഷ്‌ക്കരിക്കുക"</item>
-    <item msgid="7638002295329050091">"കോൾ ലോഗ് റീഡുചെയ്യുക"</item>
-    <item msgid="6546959730920410907">"കോൾ ലോഗ് പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="7638002295329050091">"കോൾ ചരിത്രം റീഡ് ചെയ്യുക"</item>
+    <item msgid="6546959730920410907">"കോൾ ചരിത്രം പരിഷ്‌ക്കരിക്കുക"</item>
     <item msgid="446877710771379667">"കലണ്ടർ റീഡുചെയ്യുക"</item>
     <item msgid="7674458294386319722">"കലണ്ടർ പരിഷ്‌ക്കരിക്കുക"</item>
     <item msgid="8281201165558093009">"wi-fi സ്‌കാൻ"</item>
@@ -317,11 +307,11 @@
     <item msgid="6602854600289714121">"ലൊക്കേഷൻ"</item>
     <item msgid="8677040780775113033">"ലൊക്കേഷൻ"</item>
     <item msgid="1660743989948992916">"ലൊക്കേഷൻ"</item>
-    <item msgid="8791172739860195290">"വൈബ്രേറ്റുചെയ്യുക"</item>
+    <item msgid="8791172739860195290">"വൈബ്രേറ്റ് ചെയ്യുക"</item>
     <item msgid="383413555642128046">"കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക"</item>
     <item msgid="3654594895269697313">"കോൺടാക്റ്റുകൾ പരിഷ്‌ക്കരിക്കുക"</item>
-    <item msgid="7928393476362362538">"കോൾ ലോഗ് റീഡുചെയ്യുക"</item>
-    <item msgid="6248591205254641116">"കോൾ ലോഗ് പരിഷ്‌ക്കരിക്കുക"</item>
+    <item msgid="7928393476362362538">"കോൾ ചരിത്രം റീഡ് ചെയ്യുക"</item>
+    <item msgid="6248591205254641116">"കോൾ ചരിത്രം പരിഷ്‌ക്കരിക്കുക"</item>
     <item msgid="6093344633066170692">"കലണ്ടർ റീഡുചെയ്യുക"</item>
     <item msgid="1334886368750347692">"കലണ്ടർ പരിഷ്‌ക്കരിക്കുക"</item>
     <item msgid="1638204101698708656">"ലൊക്കേഷൻ"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index cdca36b8f11c78e6b9b646480a1f78ec96df3a57..7b26f48756d6609ff9341061b44b68b31a09357c 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) -->
@@ -294,7 +306,7 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"തീയതിയും സമയവും"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"തീയതിയും സമയവും സജ്ജീകരിക്കുക"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"തീയതി, സമയം, സമയ മേഖല, ഫോർമാറ്റുകൾ എന്നിവ സജ്ജീകരിക്കുക"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"തീയതിയും സമയവും സ്വയമേ നൽകൂ"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"സ്വമേധയാ തീയതിയും സമയവും നൽകൂ"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"നെറ്റ്‌വർക്ക് നൽകുന്ന സമയം ഉപയോഗിക്കുക"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"നെറ്റ്‌വർക്ക് നൽകുന്ന സമയം ഉപയോഗിക്കുക"</string>
     <string name="zone_auto" msgid="334783869352026648">"സ്വയമേയുള്ള സമയക്രമീകരണം"</string>
@@ -312,7 +324,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"സമയ മേഖലയനുസരിച്ച് അടുക്കുക"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"തീയതി"</string>
     <string name="time_picker_title" msgid="483460752287255019">"സമയം"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"സ്വയമേവ ലോക്കുചെയ്യുക"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"സ്വമേധയാ ലോക്കുചെയ്യുക"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"സുഷു‌പ്തിയ്ക്ക് <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> കഴിഞ്ഞ്"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> എന്നതിനാൽ അൺലോക്ക് ചെയ്‌തിരിക്കുമ്പോൾ ഒഴികെ, സുഷുപ്‌തിയിലായ ശേഷം ഉടനടി"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"സുഷുപ്‌തിയിലായതിനുശേഷം <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>, <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> അൺലോക്കുചെയ്‌തിരിക്കുമ്പോൾ ഒഴികെ"</string>
@@ -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,39 @@
     <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_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_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="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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ഇത് പിന്നീട് ചെയ്യുക"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"വിരലടയാളം സജ്ജമാക്കൽ ഒഴിവാക്കണോ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനുള്ള ഒരു മാർഗ്ഗമായി നിങ്ങൾ വിരലടലാളം ഉപയോഗിക്കുന്നതിന് തീരുമാനിച്ചിരിക്കുന്നു. നിങ്ങളിത് ഇപ്പോൾ ഒഴിവാക്കുന്നുവെങ്കിൽ, പിന്നീട് സജ്ജമാക്കേണ്ടി വരും. സജ്ജീകരിക്കലിന് ഒരൽപ്പസമയമേ എടുക്കുകയുള്ളൂ."</string>
     <string name="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>
@@ -487,7 +500,7 @@
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"നിങ്ങളുടെ പാറ്റേൺ കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>സംരക്ഷിച്ചിട്ടുള്ള നിങ്ങളുടെ വിരലടയാളങ്ങളും ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കംചെയ്യപ്പെടും, നിങ്ങൾക്ക് ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകുന്നതിനോ ആപ്സിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ കഴിയില്ല.\""</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"നിങ്ങളുടെ PIN കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"നിങ്ങളുടെ PIN ഇല്ലാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"നിങ്ങളുടെ PIN കൂടാതെ ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ പ്രവർത്തിക്കില്ല.<xliff:g id="EMPTY_LINE">
 
 </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="1688030823464420974">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായ പാറ്റേൺ നൽകിയാൽ, ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായ പിൻ നൽകിയാൽ, ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"അടുത്ത തവണയും നിങ്ങൾ തെറ്റായ പാസ്‌വേഡ് നൽകിയാൽ, ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും"</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="5047439819181833824">"ഒരുപാട് തെറ്റായ ശ്രമങ്ങൾ. ഈ ഉപകരണത്തിലെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടും."</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>
@@ -574,7 +595,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ആപ്‌സ് സജീവമാണ്</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ആപ്പ് സജീവമാണ്</item>
     </plurals>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"പരിചിത ഏജന്റുകൾ"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"വിശ്വസ്ത ഏജൻ്റുകൾ"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ഉപയോഗിക്കാൻ, ആദ്യം സ്‌ക്രീൻ ലോക്ക് സജ്ജീകരിക്കുക"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"ഒന്നുമില്ല"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
@@ -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>
@@ -669,7 +698,7 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC ഓണാക്കുക"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"ഈ ഉപകരണത്തിനും മറ്റേതെങ്കിലും ചുറ്റുവട്ട ഉപകരണങ്ങൾക്കും അല്ലെങ്കിൽ പേയ്മെന്റ് ടെർമിനലുകളും ആക്സസ്സ് റീഡറുകളും ഇന്ററാക്ടീവ് പരസ്യങ്ങളും അല്ലെങ്കിൽ ടാഗുകളും പോലുള്ള ലക്ഷ്യങ്ങൾക്കും ഇടയിൽ NFC, വിവരങ്ങൾ കൈമാറുന്നു."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android ബീം"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC വഴി അപ്ലിക്കേഷൻ ഉള്ളടക്കം പ്രക്ഷേപണം ചെയ്യാൻ തയ്യാറാണ്"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"ആപ്പിന്‍റെ ഉള്ളടക്കം NFC കൈമാറ്റത്തിന് തയ്യാർ"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ഓഫ്"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC ഓഫ് ചെ‌യ്തതിനാൽ ലഭ്യമല്ല"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android ബീം"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"വൈ-ഫൈ സ്വയം ഓണാക്കുക"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"നിങ്ങളുടെ വീട്ടിലെ നെറ്റ്‌വർക്ക് പോലെയുള്ള, സംരക്ഷിച്ചതും ഉയർന്ന ഗുണമേന്മയുള്ളതുമായ നെറ്റ്‍വർക്കുകൾക്ക് അരികിലായിരിക്കുമ്പോൾ വൈഫൈ തിരികെ സ്വയമേവ ഓണാകും"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"വൈഫൈ സ്‌കാനിംഗ് ഓഫുചെ‌യ്‌തിരിക്കുന്നതിനാൽ ‌ലഭ്യമല്ല"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ഉപയോഗിക്കാനായി, ഒരു നെറ്റ്‌വർക്ക് റേറ്റിംഗ് ദാതാവിനെ തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"മോശം കണക്ഷനുകൾ ഒഴിവാക്കുക"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"മികച്ച ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകുന്നതുവരെ വൈഫൈ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കരുത്"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"മികച്ച ഇന്റർനെറ്റ് കണക്ഷനുള്ള നെറ്റ്‌വർക്കുകൾ മാത്രം ഉപയോഗിക്കുക"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ഓപ്പൺ നെറ്റ്‌വർക്കുകളിലേക്ക് കണക്റ്റുചെയ്യുക"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ഉയർന്ന ഗുണമേന്മയുള്ള പബ്ലിക് നെറ്റ്‌വർക്കുകളിലേക്ക് സ്വയമേവ കണക്റ്റുചെയ്യുക"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ഉയർന്ന ഗുണമേന്മയുള്ള പബ്ലിക് നെറ്റ്‌വർക്കുകളിലേക്ക് സ്വമേധയാ കണക്റ്റുചെയ്യുക"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ഉപയോഗിക്കാനായി, ഒരു നെറ്റ്‌വർക്ക് റേറ്റിംഗ് ദാതാവിനെ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ഉപയോഗിക്കാനായി, അനുയോജ്യമായ ഒരു നെറ്റ്‌വർക്ക് റേറ്റിംഗ് ദാതാവിനെ തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാളുചെയ്യുക"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്താൻ, ആപ്സ്, സേവനങ്ങൾ എന്നിവയ്ക്ക് തുടർന്നും വൈഫൈ നെറ്റ്‌വർക്കുകൾക്കായി സ്കാൻ ചെയ്യാൻ കഴിയും. നിങ്ങൾക്കിത് <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>സ്‌കാനിംഗ് ക്രമീകരണത്തിൽ<xliff:g id="LINK_END_1">LINK_END</xliff:g> മാറ്റാനാകും."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ലൊക്കേഷൻ കൃത്യത മെച്ചപ്പെടുത്താൻ, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>സ്‌കാനിംഗ് ക്രമീകരണത്തിൽ<xliff:g id="LINK_END_1">LINK_END</xliff:g> വൈഫൈ സ്കാനിംഗ് ഓണാക്കുക."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -961,7 +1003,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"തെളിച്ചം"</string>
     <string name="brightness_summary" msgid="838917350127550703">"സ്‌ക്രീനിന്റെ തെളിച്ചം ക്രമീകരിക്കുക"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"അനുയോജ്യമായ തെളിച്ചം"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"ലഭ്യമായ പ്രകാശത്തിനായി തെളിച്ചനില അനുരൂപമാക്കുക"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"പ്രകാശ ലഭ്യതയനുസരിച്ച് തെളിച്ചം ക്രമീകരിക്കുക"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"ഓഫ്"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"തിരഞ്ഞെടുത്ത തെളിച്ചം വളരെ കുറവാണ്"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"തിരഞ്ഞെടുത്ത തെളിച്ചം കുറവാണ്"</string>
@@ -980,24 +1022,23 @@
     <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="screen_timeout" msgid="4351334843529712571">"സ്ലീപ്പിലാക്കുക"</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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"വാൾപേപ്പർ"</string>
@@ -1020,8 +1061,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="7337555569694794132">"എപ്പോഴും ഓണാണ് / ഉയർന്ന ബാറ്ററി ഉപയോഗം"</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="6978257596231155345">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ എന്നിവയും മറ്റ് വിവരങ്ങളും കാണിക്കുക. ഉയർന്ന ബാറ്ററി ഉപയോഗം."</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>
@@ -1114,7 +1161,7 @@
     <string name="memory_calculating_size" msgid="2188358544203768588">"കണക്കാക്കുന്നു..."</string>
     <string name="memory_apps_usage" msgid="5128673488173839077">"ആപ്സുകളും ആപ്സ് ഡാറ്റയും"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"മീഡിയ"</string>
-    <string name="memory_downloads_usage" msgid="3755173051677533027">"ഡൗണ്‍ലോഡ്"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"ഡൗണ്‍ലോഡുകൾ"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"ചിത്രങ്ങളും വീഡിയോകളും"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ഓഡിയോ (സംഗീതം, റിംഗ്ടോണുകൾ, പോഡ്കാസ്‌റ്റുകൾ തുടങ്ങിയവ)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"മറ്റ് ഫയലുകൾ"</string>
@@ -1200,7 +1247,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"മറ്റുള്ളവ"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"സിസ്‌റ്റം"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> അടുത്തറിയുക"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"മറ്റുള്ളവയിൽ, ആപ്‌സ് വഴി സംരക്ഷിച്ച പങ്കിട്ട ഫയലുകളും ഇന്റർനെറ്റിൽ നിന്നോ Bluetooth-ൽ നിന്നോ ഡൗൺലോഡ് ചെയ്തിട്ടുള്ള ഫയലുകളും Android ഫയലുകളും മറ്റുള്ളവയും ഉൾപ്പെടുന്നു. \n\nഈ <xliff:g id="NAME">^1</xliff:g> എന്നതിന്റെ മുഴുവൻ ഉള്ളടക്കങ്ങളും കാണുന്നതിന്, അടുത്തറിയുക ടാപ്പുചെയ്യുക."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ആപ്‌സ് സംരക്ഷിച്ചിട്ടുള്ള പങ്കിട്ട ഫയലുകളും ഇന്റർനെറ്റിൽ നിന്നോ Bluetooth-ൽ നിന്നോ ഡൗൺലോഡ് ചെയ്തിട്ടുള്ള ഫയലുകളും Android ഫയലുകളും ഉൾപ്പെടെയുള്ളവ മറ്റുള്ളവയിൽ ഉൾപ്പെടുന്നു. \n\n ഈ <xliff:g id="NAME">^1</xliff:g> എന്നതിന്റെ മുഴുവൻ ഉള്ളടക്കങ്ങളും കാണുന്നതിന്, ടാപ്പ് ചെയ്യുക."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"സിസ്‌റ്റത്തിൽ Android പതിപ്പ് <xliff:g id="VERSION">%s</xliff:g> റൺ ചെയ്യാൻ ഉപയോഗിച്ച ഫയലുകളും ഉൾപ്പെടുന്നു"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> എന്ന ഉപയോക്താവിന്, സ്റ്റോറേജിന്റെ <xliff:g id="SIZE">^2</xliff:g> ഉപയോഗിക്കുന്ന, സംരക്ഷിച്ചിട്ടുള്ള ഫോട്ടോകളോ സംഗീതമോ ആപ്‌സോ മറ്റ് ഡാറ്റയോ ഉണ്ടായേക്കാം. \n\nകൂടുതൽ വിശദാംശങ്ങൾ കാണുന്നതിന്, <xliff:g id="USER_1">^1</xliff:g> എന്ന ഉപയോക്താവിലേക്ക് മാറുക."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"നിങ്ങളുടെ <xliff:g id="NAME">^1</xliff:g> സജ്ജമാക്കുക"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"നിങ്ങൾ നിലവിൽ ഇനിപ്പറയുന്ന അക്കൗണ്ടുകളിൽ സൈൻ ചെ‌യ്തിരിക്കുന്നു:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ഈ ഉപകരണത്തിൽ മറ്റ് ഉപയോക്താക്കളുണ്ട്.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"സംഗീതം"</li>\n<li>"ഫോട്ടോകൾ"</li>\n<li>"മറ്റ് ഉപയോക്തൃ ഡാറ്റ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-ലെ കാരിയറുകൾ"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"നിങ്ങളുടെ മൊബൈൽ സർവീസ് പ്ലാൻ ഇത് റദ്ദാക്കുകയില്ല."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"USB സ്റ്റോറേജ് "</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"SD കാർഡ്"</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB സ്റ്റോറേജ്  മായ്ക്കുക"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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 +1707,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>
@@ -1673,7 +1725,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"ഫിസിക്കൽ കീബോർഡ് ക്രമീകരണങ്ങൾ"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" ചേർക്കുന്നതിന് സ്‌പേസ് കീ രണ്ടുതവണ അമർത്തുക"</string>
     <string name="show_password" msgid="4837897357002495384">"പാസ്‌വേ‌ഡുകൾ കാണിക്കുക"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"ടൈപ്പുചെയ്യുന്നതിനൊപ്പം അൽപ്പസമയം പ്രതീകം പ്രദർശിപ്പിക്കുക"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"ടൈപ്പ് ചെയ്യുന്ന അക്ഷരങ്ങൾ പ്രദർശിപ്പിക്കുക"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"പാസ്‌വേഡുകൾ, ക്രെഡിറ്റ് കാർഡ് നമ്പറുകൾ എന്നിവ പോലുള്ള വ്യക്തിഗതമായ ഡാറ്റയുൾപ്പെടെ നിങ്ങൾ ടൈപ്പുചെയ്യുന്ന എല്ലാ വാചകവും ഈ അക്ഷരത്തെറ്റ് പരിശോധനയ്‌ക്ക് ശേഖരിക്കാനായേക്കും. ഇത് <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> അപ്ലിക്കേഷനിൽ നിന്നും വരുന്നു. ഈ അക്ഷരത്തെറ്റ് പരിശോധന ഉപയോഗിക്കണോ?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"ക്രമീകരണം"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ഭാഷ"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"സ്‌ക്രീൻ റീഡറുകൾ, ‌ഡിസ്‌പ്ലേ, ഇന്റരാക്ഷൻ നിയന്ത്രണങ്ങൾ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"വീക്ഷണ ക്രമീകരണം"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ആവശ്യങ്ങൾക്ക് അനുസരിച്ച് നിങ്ങൾക്ക് ഈ ഉപകരണം ഇഷ്ടാനുസൃതമാക്കാം. ഈ ഉപയോഗസഹായി ഫീച്ചറുകൾ പിന്നീട് ക്രമീകരണത്തിൽ മാറ്റാവുന്നതാണ്."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ഫോണ്ട് വലുപ്പം വർദ്ധിപ്പിക്കുക"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"സ്‌ക്രീൻ റീഡറുകൾ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ഓഡിയോയും സ്‌ക്രീനിലെ ടെക്‌സ്‌റ്റും"</string>
     <string name="display_category_title" msgid="685461049938269166">"ഡി‌സ്‌പ്ലേ"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"നിങ്ങളുടെ ഫോണിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, ഈ ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ടാബ്‌ലെറ്റിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, ഈ ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"നിങ്ങളുടെ ഉപകരണത്തെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഉപകരണത്തിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, ഈ ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"നിങ്ങളുടെ ഫോണിനെ <xliff:g id="APP_0">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, <xliff:g id="APP_1">%1$s</xliff:g> ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിനെ <xliff:g id="APP_0">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ടാബ്‌ലെറ്റിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, <xliff:g id="APP_1">%1$s</xliff:g> ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"നിങ്ങളുടെ ഉപകരണത്തെ <xliff:g id="APP_0">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, <xliff:g id="APP_1">%1$s</xliff:g> ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ആപ്പ് അവസാനിപ്പിക്കുക"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"പശ്ചാത്തലത്തിലെ ഉപയോഗം ഓഫാക്കി, ആപ്പ് ‌നിർത്തണോ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"നിങ്ങളുടെ ഫോണിനെ <xliff:g id="APP_0">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, <xliff:g id="APP_1">%1$s</xliff:g> ആപ്പിന്റെ പ്രവർത്തനം നിർത്തി, അത് പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുന്നത് തടയാം."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിനെ <xliff:g id="APP_0">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ടാബ്‌ലെറ്റിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല. \n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, <xliff:g id="APP_1">%1$s</xliff:g> ആപ്പിന്റെ പ്രവർത്തനം നിർത്തി, അത് പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുന്നത് തടയാം."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"നിങ്ങളുടെ ഉപകരണത്തെ <xliff:g id="APP_0">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഉപകരണത്തിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, <xliff:g id="APP_1">%1$s</xliff:g> ആപ്പിന്റെ പ്രവർത്തനം നിർത്തി, അത് പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുന്നത് തടയാം."</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="7774807745601479888">"നിങ്ങൾ <xliff:g id="APP">%1$s</xliff:g> ആപ്പ് ഉപയോഗിക്കാത്ത സമയത്തും അത് ലൊക്കേഷൻ അഭ്യർത്ഥിച്ചുകൊണ്ടിരിക്കുന്നതിനാൽ, ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കുന്നതിന്, ഈ ആപ്പിനായി ലൊക്കേഷൻ ഓഫാക്കാം."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"നിങ്ങൾ <xliff:g id="APP">%1$s</xliff:g> ആപ്പ് ഉപയോഗിക്കാത്ത സമയത്തും അത് നിങ്ങളുടെ ലൊക്കേഷൻ അഭ്യർത്ഥിച്ചുകൊണ്ടിരിക്കുന്നതിനാൽ, ടാബ്‌ലെറ്റിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കുന്നതിന്, ഈ ആപ്പിനായി ലൊക്കേഷൻ ഓഫാക്കാം."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"നിങ്ങൾ <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ഫുൾ ചാർജിനുശേഷമുള്ള ഉപയോഗ വിശദാംശങ്ങൾ"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"ഒടുവിൽ ഫുൾ ചാർജ്ജുചെയ്‌തത്"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ശേഷിക്കുന്ന ബാറ്ററി സമയം ഏകദേശ കണക്കാണ്, ഉപയോഗത്തിനനുസരിച്ച് അത് മാറാം"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ബാറ്ററി ഉപഭോഗ ഡാറ്റ ഏകദേശ കണക്കാണ്, ഉപയോഗത്തിനനുസരിച്ച് അത് മാറാം"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"സജീവ ഉപയോഗത്തിൽ ആയിരിക്കുമ്പോൾ"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"പശ്ചാത്തലത്തിൽ ആയിരിക്കുമ്പോൾ"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ബാറ്ററി ഉപയോഗം"</string>
@@ -2333,7 +2414,7 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"മൊബൈൽ നെറ്റ്‌വർക്കുകൾ ലഭ്യമാകുമ്പോൾ മാത്രം പാശ്ചാത്തല ഡാറ്റയെ ആശ്രയിക്കുന്ന ഒരു അപ്ലിക്കേഷൻ പ്രവർത്തനം നിർത്തുന്നതിന് ഈ സവിശേഷത ഇടയാക്കും.\n\nഅപ്ലിക്കേഷനിൽ ലഭ്യമായ ക്രമീകരണങ്ങളിൽ കൂടുതൽ ഉചിതമായ ഡാറ്റാ ഉപയോഗ നിയന്ത്രണങ്ങൾ നിങ്ങൾക്ക് കണ്ടെത്താനാകും."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"മൊബൈൽ ഡാറ്റക്ക് പരിധി സജ്ജീകരിക്കുമ്പോൾ മാത്രമേ പശ്ചാത്തല ഡാറ്റ പരിമിതപ്പെടുത്താൻ കഴിയൂ."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ഡാറ്റ സ്വയംസമന്വയിപ്പിക്കൽ ഓണാക്കണോ?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"വെബിൽ നിങ്ങളുടെ അക്കൗണ്ടുകളിൽ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം നിങ്ങളുടെ ടാബ്‌ലെറ്റിലേക്ക് സ്വയമേവ പകർത്തും.\n\nടാബ്‌ലെറ്റിൽ നിങ്ങൾ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം ചില അക്കൗണ്ടുകൾ സ്വയമേവ വെബിലേക്കും പകർത്താനിടയുണ്ട്. ഒരു Google അക്കൗണ്ട് ഇത്തരത്തിൽ പ്രവർത്തിക്കുന്നു."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"വെബിൽ നിങ്ങളുടെ അക്കൗണ്ടുകളിൽ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം നിങ്ങളുടെ ടാബ്‌ലെറ്റിലേക്ക് സ്വമേധയാ പകർത്തും.\n\nടാബ്‌ലെറ്റിൽ നിങ്ങൾ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം ചില അക്കൗണ്ടുകൾ സ്വമേധയാ വെബിലേക്കും പകർത്താനിടയുണ്ട്. ഒരു Google അക്കൗണ്ട് ഇത്തരത്തിൽ പ്രവർത്തിക്കുന്നു."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"വെബിൽ നിങ്ങളുടെ അക്കൗണ്ടുകളിൽ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം നിങ്ങളുടെ ഫോണിലേക്ക് സ്വയമേവ പകർത്തും.\n\nഫോണിൽ നിങ്ങൾ വരുത്തുന്ന മാറ്റങ്ങളെല്ലാം ചില അക്കൗണ്ടുകൾ സ്വയമേവ വെബിലേക്കും പകർത്താനിടയുണ്ട്. ഒരു Google അക്കൗണ്ട് ഇത്തരത്തിൽ പ്രവർത്തിക്കുന്നു."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ഡാറ്റ സ്വയം സമന്വയിപ്പിക്കൽ ഓഫാക്കണോ?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ഇത് ഡാറ്റയും ബാറ്ററി ഉപയോഗവും സംരക്ഷിക്കുമെങ്കിലും ഏറ്റവും പുതിയ വിവരങ്ങൾ ശേഖരിക്കാൻ നിങ്ങൾക്ക് ഓരോ അക്കൗണ്ടും സ്വമേധയാ സമന്വയിപ്പിക്കേണ്ടതായി വരും. അപ്‌ഡേറ്റുകൾ സംഭവിക്കുമ്പോൾ നിങ്ങൾക്ക് അറിയിപ്പുകൾ ലഭിക്കുകയുമില്ല."</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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="connected_devices_dashboard_title" msgid="2355264951438890709">"കണക്‌റ്റുചെയ്ത ഉപകരണം"</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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"അൺലോക്കുചെയ്യാൻ സ്ലൈഡുചെയ്യുക, പാസ്‌വേഡ്, പാറ്റേൺ, പിൻ"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ഔദ്യോഗിക വെല്ലുവിളി, ഔദ്യോഗികം, പ്രൊഫൈൽ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ഔദ്യോഗിക പ്രൊഫൈൽ, മാനേജുചെയ്യപ്പെടുന്ന പ്രൊഫൈൽ, ഏകീകരിക്കുക, ഏകീകരിക്കൽ, ഔദ്യോഗികം, പ്രൊഫൈൽ"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"വിരൽചലനം"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ജെസ്‌റ്ററുകൾ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"പണമടയ്ക്കുക. ടാപ്പുചെയ്യുക, പേയ്‌മെന്റുകൾ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ബാക്കപ്പ് ചെയ്യൂ"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"വിരൽചലനം"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"വൈഫൈ NFC ടാഗ് സജ്ജമാക്കുക"</string>
     <string name="write_tag" msgid="8571858602896222537">"റൈറ്റുചെയ്യുക"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"റൈറ്റുചെയ്യാൻ ഒരു ടാഗ് ടാപ്പുചെയ്യുക..."</string>
@@ -2748,8 +2833,8 @@
     <string name="boot_sounds_title" msgid="567029107382343709">"ശബ്ദങ്ങൾ ഓണാക്കുക"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"സ്വയമേവയുള്ള നിയമങ്ങളൊന്നും ഓണാക്കിയിട്ടില്ല"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> സ്വയമേവയുള്ള നയങ്ങൾ ഓണാക്കി</item>
-      <item quantity="one">1 സ്വയമേവയുള്ള നയം ഓണാക്കി</item>
+      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> സ്വമേധയായുള്ള നയങ്ങൾ ഓണാക്കി</item>
+      <item quantity="one">1 സ്വമേധയായുള്ള നയം ഓണാക്കി</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"\'ശല്യപ്പെടുത്തരുത്\' മുൻഗണന"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"മുൻഗണനയുള്ളവ മാത്രം"</string>
@@ -2791,7 +2876,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>
@@ -2806,8 +2892,12 @@
     <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="manage_notification_access_title" msgid="7510080164564944891">"അറിയിപ്പ് ആക്സസ്സ്"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ഔദ്യോഗിക പ്രൊഫൈൽ അറിയിപ്പുകളിലേക്കുള്ള ആക്‌സസ്സ് ബ്ലോക്കുചെയ്‌തു"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"അപ്ലിക്കേഷനുകൾക്ക് അറിയിപ്പുകൾ വായിക്കാനായില്ല"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2833,12 +2923,10 @@
     <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>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"ഈ ഉപകരണത്തിൽ ഈ ആപ്പിന്റെ അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്കുചെയ്യുന്നു"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"ഈ ആപ്പിന്‍റെ അറിയിപ്പുകൾ ഉപകരണത്തില്‍ ദൃശ്യമാകുന്നത് Android തടസ്സപ്പെടുത്തുന്നു"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ഈ ഉപകരണത്തിൽ ഈ വിഭാഗത്തിൽ പെട്ട അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്കുചെയ്യുന്നു"</string>
     <string name="notification_channels" msgid="5346841743182627500">"വിഭാഗങ്ങള്‍"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"മറ്റുള്ളവ"</string>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"നക്ഷത്രമിട്ട കോൺടാക്‌റ്റിൽ നിന്നുമാത്രം"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ആരിൽ നിന്നും വേണ്ട"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"അലാറങ്ങൾ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"അലാറങ്ങൾക്ക് എപ്പോഴും മുൻഗണന നൽകി ശബ്‌ദം കേൾപ്പിക്കുന്നു"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"റിമൈൻഡറുകൾ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ഇവന്റുകൾ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"കോൾ ചെയ്യുന്ന എല്ലാവരും"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3062,7 +3146,7 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"തിരിച്ചറിഞ്ഞില്ല"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"ഡിഫോൾട്ട്"</string>
     <string name="default_for_work" msgid="9152194239366247932">"ഔദ്യോഗികാവശ്യങ്ങൾക്ക് ഡിഫോൾട്ട്"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"അസിസ്റ്റ്, വോയ്സ് ഇൻപുട്ട്"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"അസിസ്റ്റ്, ശബ്ദ ഇൻപുട്ട്"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"സഹായ ആപ്പ്"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>-നെ നിങ്ങളുടെ സഹായി ആക്കണോ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"നിങ്ങളുടെ സ്ക്രീനിൽ ദൃശ്യമാകുന്നതോ ആപ്സിനുള്ളിൽ ആക്സസ് ചെയ്യാവുന്നതോ ആയ വിവരങ്ങൾ ഉൾപ്പെടെ, നിങ്ങളുടെ സിസ്റ്റത്തിൽ ഉപയോഗത്തിലുള്ള ആപ്സിനെ കുറിച്ചുള്ള വിവരങ്ങൾ വായിക്കാൻ അസിസ്റ്റന്റിന് കഴിയും."</string>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,14 +3398,13 @@
     <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>
       <item quantity="one">ഒരു നിയന്ത്രണം</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"ഉപകരണം കണക്കാക്കുന്നതിൽ നിന്നും വ്യത്യസ്തമായിട്ടായിരിക്കാം സേവനദായകൻ കണക്കാക്കുന്നത്"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"ഉപകരണം കണക്കാക്കുന്നതിൽ നിന്നും വ്യത്യസ്തമായിട്ടായിരിക്കാം സേവനദാതാക്കള്‍ കണക്കാക്കുന്നത്"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"ഡാറ്റ മുന്നറിയിപ്പ് സജ്ജമാക്കുക"</string>
     <string name="data_warning" msgid="209133958008062117">"ഡാറ്റാ മുന്നറിയിപ്പ്"</string>
@@ -3317,7 +3418,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>
@@ -3333,7 +3434,7 @@
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"മറ്റൊരു വിരൽ ഉപയോഗിച്ച് അൺലോക്കുചെയ്യുക"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"ഓൺ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"ഓഫ്/ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ഒരിക്കലും സ്വയമേവ ഓണാക്കരുത്"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ഒരിക്കലും സ്വമേധയാ ഓണാകരുത്"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"ബാറ്ററി നില %1$s ആകുമ്പോൾ സ്വയമേവ ഓണാക്കുക"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"ബാറ്ററി ഒപ്റ്റിമൈസേഷൻ ഉപയോഗിക്കുന്നില്ല"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"ഉപകരണം ലോക്കുചെയ്തിരിക്കുകയാണെങ്കിൽ അറിയിപ്പുകൾക്ക് മറുപടികളോ മറ്റ് ടെക്സ്റ്റുകളോ ടൈപ്പുചെയ്യുന്നത് തടയുക"</string>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"വിരൽചലിത സഹായി"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"സെന്‍‌സിറ്റിവിറ്റി"</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="gesture_setting_on" msgid="3455094265233870280">"ഓൺ"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ഓഫ്"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ബൂട്ട്‌ലോഡർ ഇതിനകം അൺലോക്കുചെയ്തിട്ടുണ്ട്"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ഔദ്യോഗിക ഡാറ്റ സ്വയം സമന്വയിപ്പിക്കുക"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"ആപ്പുകളെ സ്വയം പുതുക്കിയെടുക്കാൻ അനുവദിക്കുക"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"അക്കൗണ്ട് സമന്വയം"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$d</xliff:g> ഇനങ്ങൾക്ക് സമന്വയം ഓണാക്കിയിരിക്കുന്നു"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"എല്ലാ ഇനങ്ങൾക്കും സമന്വയം ഓണാക്കിയിരിക്കുന്നു"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"എല്ലാ ഇനങ്ങൾക്കും സമന്വയം ഓഫാക്കിയിരിക്കുന്നു"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"മാനേജുചെയ്യപ്പെടുന്ന ഉപകരണത്തിന്റെ വിവരങ്ങൾ"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"മാറ്റങ്ങളും ക്രമീകരണവും മാനേജുചെയ്യുന്നത് നിങ്ങളുടെ സ്ഥാപനമാണ്"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"മാറ്റങ്ങളും ക്രമീകരണവും മാനേജുചെയ്യുന്നത് <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ആണ്"</string>
@@ -3572,9 +3682,10 @@
     <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>
+    <string name="autofill_app" msgid="7338387238377914374">"സ്വയം പൂരിപ്പിക്കൽ സേവനം"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"സ്വയമേവ, പൂരിപ്പിക്കൽ, സ്വയമേവ പൂരിപ്പിക്കൽ"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ഈ ആപ്പിനെ നിങ്ങൾ വിശ്വസിക്കുന്നുണ്ടെന്ന് ഉറപ്പുവരുത്തുക&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; സ്വയമേവ പൂരിപ്പിക്കേണ്ടത് എന്താണെന്ന് നിർണ്ണയിക്കുന്നതിന് നിങ്ങളുടെ സ്‌ക്രീനിൽ ഉള്ളത് ഉപയോഗിക്കുന്നു."</string>
     <string name="device_theme" msgid="4571803018917608588">"ഉപകരണത്തിന്റെ തീം"</string>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"പുതിയതും ആവേശമുണർത്തുന്നതുമായ കാര്യങ്ങൾ എന്തൊക്കെയാണ്?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"പ്രധാന 5 ഫീച്ചറുകൾ പരിശോധിക്കുക"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS രജിസ്‌ട്രേഷൻ നില"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"രജിസ്റ്റർ ചെയ്‌തു"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"രജിസ്‌റ്റർ ചെയ്‌തിട്ടില്ല"</string>
 </resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 32550f515b26bb3f946937c3f2ff6ede449c47f1..039d16aa68d48f0da62234e8f3d1c1b92ad902a3 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 b1aeac36572157ff3072484612a6b37eca424dbf..ce31a947992762a28e5349c0fb482259e5bb3ee4 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Дараа хийх"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Хурууны хээн тохиргоог алгасах уу?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Та утасны түгжээг тайлах нэг хувилбараар хурууны хээн тохиргоог сонголоо. Хэрэв та одоо алгасвал энэ тохиргоог дараа хийх шаардлагатай болно. Тохиргоо хийхэд хэдхэн хором шаардлагатай."</string>
     <string name="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="TIMEOUT_STRING">%2$s</xliff:g>-н дараа <xliff:g id="UNLOCK_METHOD">%1$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="1688030823464420974">"Та дараагийн оролдлогоор буруу загвар оруулбал энэ төхөөрөмжийн өгөгдлийг устгах болно"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Та дараагийн оролдлогоор буруу ПИН оруулбал энэ төхөөрөмжийн өгөгдлийг устгах болно"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Та дараагийн оролдлогоор буруу нууц үг оруулбал энэ төхөөрөмжийн өгөгдлийг устгах болно"</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="5047439819181833824">"Түгжээг хэт олон удаа буруу оруулсан тул энэ төхөөрөмжийн өгөгдлийг устгах болно."</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>
@@ -624,8 +645,16 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Сонголтууд..."</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Дэлгэрэнгүй"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth дэлгэрэнгүй"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetoothийг идэвхжүүлсэн үед таны төхөөрөмж ойролцоо байгаа 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>
@@ -673,7 +702,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Идэвхгүй"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC-г унтраасан учир ашиглах боломжгүй"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Энэ онцлогийг асаасан үед та аппын агуулгыг өөр NFC-тай ажилладаг төхөөрөмж рүү төхөөрөмжийг ойрхон барьснаар дамжуулах боломжтой. Жишээ нь та хөтчийн хуудас, YouTube видео, харилцагчид болон бусад зүйлсийг дамжуулах боломжтой.\n\nТөхөөрөмжийг хамтад нь барьж (гол төлөв ар араар нь) дэлгэцээ товшино уу. Апп дамжуулах зүйлийг сонгох болно."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Энэ онцлогийг асаасан үед та аппын агуулгыг өөр NFC-тай ажилладаг төхөөрөмж рүү төхөөрөмжийг ойрхон барьснаар дамжуулах боломжтой. Жишээ нь та веб хуудас, YouTube видео, харилцагчид болон бусад зүйлсийг дамжуулах боломжтой.\n\nТөхөөрөмжийг хамтад нь барьж (гол төлөв ар араар нь) дэлгэцээ товшино уу. Апп дамжуулах зүйлийг сонгох болно."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi-г асаах"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi-г автоматаар асаах"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi таны гэрийн сүлжээ зэрэг ойролцоох хадгалсан өндөр чанарын сүлжээнд буцаж асах болно."</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi-н сканыг унтраасан тул боломжгүй байна"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Ашиглахын тулд сүлжээний үнэлгээ үзүүлэгчийг сонгоно уу"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Муу холболтуудаас зайлсхийх"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Wi-Fi сүлжээний Интернэт холболт сайн биш бол бүү ашиглаарай"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Зөвхөн сайн интернэт холболттой сүлжээг ашиглах"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Нээлттэй сүлжээнд холбогдох"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Өндөр чанартай нийтийн сүлжээнд автоматаар холбогдох"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Ашиглахын тулд сүлжээний үнэлгээ үзүүлэгчийг сонгоно уу"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Ашиглахын тулд тохирох сүлжээний үнэлгээ үзүүлэгчийг сонгоно уу"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификат суулгах"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Байршлын нарийвчлалыг сайжруулахын тулд системийн апп болон үйлчилгээ нь Wi-Fi төхөөрөмжийг илрүүлэх боломжтой. Ta үүнийг <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>хайлтын тохиргоо<xliff:g id="LINK_END_1">LINK_END</xliff:g> дотроос өөрчилж болно."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Байршлын нарийвчлалыг сайжруулахын тулд Wi-Fi-н сканийг <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>скан хийх тохиргоо<xliff:g id="LINK_END_1">LINK_END</xliff:g> хэсэгт асаана уу."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Байнга асаалттай / Батерейны сайжруулсан ашиглалт"</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="6978257596231155345">"Цаг, мэдэгдлийн дүрс тэмдэг болон бусад мэдээлэл харуулна уу. Батерейны сайжруулсан ашиглалт."</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 +1320,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>
@@ -1292,16 +1340,21 @@
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"Дотоод сангийн бүх өгөгдлийг шинэчлэх болно"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Энэ таны таблетын "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Энэ таны утасны "<b>"дотоод сангаас"</b>"таны \n\n"<li>"Google акаунт"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан апп-уудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Энэ таны утасны "<b>"дотоод сангаас"</b>" таны \n\n"<li>"Google бүртгэл"</li>\n<li>"Системийн болон апп өгөгдөл болон тохиргоо"</li>\n<li>"Татаж авсан аппуудыг"</li>" оруулан бүх өгөгдлийг устгах болно"</string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Та одоогоор дараах акаунтуудаар нэвтэрсэн байна:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Энэ төхөөрөмж дээр өөр хэрэглэгчид байна.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Хөгжим"</li>\n<li>"Зураг"</li>\n<li>"Бусад хэрэглэгчийн өгөгдөл"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM-н оператор компани"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Энэ нь таны мобайл үйлчилгээний төлөвлөгөөг цуцлахгүй."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"USB санг"</b>" арилгах шаардлагатай."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"SD картыг"</b>" арилгах шаардлагатай."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB санг арилгах"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1452,7 +1497,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Тайлах PIN өөрчлөх"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Тайлах хээг зурна уу"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Цэсийг дарж туслам аваарай."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Дуусгаад хуруугаа аваарай"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Дуусаад хуруугаа аваарай"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Хамгийн багадаа <xliff:g id="NUMBER">%d</xliff:g> цэгийг холбоно уу. Дахиж оролдоорой."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Хээ бичигдсэн"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Баталгаажуулахын тулд хээг дахиад зурна уу"</string>
@@ -1491,6 +1536,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>
@@ -1539,7 +1587,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"Яаралтай тусламжийн апп"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Апп тохируулгыг дахин шинэчлэх"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Апп тохируулгыг дахин шинэчлэх үү?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Энэ нь дараах бүх тохиргоог шинэчлэх болно:\n\n "<li>"Идэвхгүй апп-ууд"</li>\n" "<li>"Идэвхгүй апп мэдэгдлүүд"</li>\n" "<li>"Үйлдлүүдийн үндсэн аппликешнүүд"</li>\n" "<li>"Аппуудын далд дата хязгаарлалтууд"</li>\n" "<li>"Ямар нэг зөвшөөрлын хязгаарлалтууд"</li>\n\n" Та ямаг нэг апп датаг алдахгүй."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Энэ нь дараах бүх тохиргоог шинэчлэх болно:\n\n "<li>"Идэвхгүй аппууд"</li>\n" "<li>"Идэвхгүй апп мэдэгдлүүд"</li>\n" "<li>"Үйлдлүүдийн үндсэн аппликейшнүүд"</li>\n" "<li>"Аппуудын далд дата хязгаарлалтууд"</li>\n" "<li>"Ямар нэг зөвшөөрлийн хязгаарлалтууд"</li>\n\n" Та ямар нэг апп дата алдахгүй."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Апп-г дахин шинэчлэх"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Эзэлсэн зайг удирдах"</string>
     <string name="filter" msgid="2018011724373033887">"Шүүлтүүр"</string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Дэлгэц уншигч, дэлгэц, харилцан үйлдлийн хяналт"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Харааны тохиргоо"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Та энэ төхөөрөмжийг өөрийнхөө шаардлагад нийцүүлэн тохируулах боломжтой. Эдгээр сонголтуудыг дараа нь Тохиргоо хэсэгт өөрчлөх боломжтой."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Фонтын хэмжээг ихэсгэх"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Дэлгэц уншигч"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио &amp; дэлгэцийн текст"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дэлгэц"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> таны утсыг асаалттай байлгаж байгаа тул таны утас батерейг хэвийн түвшинд байлгах боломжгүй байна. \n\nЭнэ асуудлыг шийдвэрлэхийн тулд та аппыг зогсоох боломжтой.\n\nАсуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд энэ аппыг устгаж болно."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> таны таблетыг асаалттай байлгаж байгаа тул таны таблет батерейг хэвийн түвшинд байлгах боломжгүй байна. \n\nЭнэ асуудлыг шийдвэрлэхийн тулд та аппыг зогсоох боломжтой.\n\nАсуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд энэ аппыг устгаж болно."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> таны төхөөрөмжийг асаалттай байлгаж байгаа тул таны төхөөрөмж батерейг хэвийн түвшинд байлгах боломжгүй байна. \n\nЭнэ асуудлыг шийдвэрлэхийн тулд та аппыг зогсоох боломжтой.\n\nАсуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд энэ аппыг устгаж болно."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> таны утсг тогтмол асааж байгаа тул таны утас батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд та <xliff:g id="APP_1">%1$s</xliff:g>-г зогсоох боломжтой.\n\nАсуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд энэ аппыг устгаж болно."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> таны таблетыг тогтмол асааж байгаа тул таны таблет батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд та <xliff:g id="APP_1">%1$s</xliff:g>-г зогсоох боломжтой.\n\nАсуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд энэ аппыг устгаж болно."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> таны төхөөрөмжийг тогтмол асааж байгаа тул таны төхөөрөмж батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд та <xliff:g id="APP_1">%1$s</xliff:g>-г зогсоох боломжтой.\n\nАсуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд энэ аппыг устгаж болно."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Аппыг зогсоох"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Цаана ашиглалтыг унтрааж, аппыг зогсоох уу?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> таны утсыг тогтмол сэрээж байгаа тул таны утас батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nТа энэ асуудлыг шийдвэрлэснээр <xliff:g id="APP_1">%1$s</xliff:g>-г зогсоож цаана ажиллахаас сэргийлнэ."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> таны таблетыг тогтмол сэрээж байгаа тул таны таблет батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nТа энэ асуудлыг шийдвэрлэснээр <xliff:g id="APP_1">%1$s</xliff:g>-г зогсоож цаана ажиллахаас сэргийлнэ."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> таны төхөөрөмжийг тогтмол сэрээж байгаа тул таны төхөөрөмж батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nТа энэ асуудлыг шийдвэрлэснээр <xliff:g id="APP_1">%1$s</xliff:g>-г зогсоож үүнийг цаана ажиллахаас сэргийлнэ."</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="7774807745601479888">"<xliff:g id="APP">%1$s</xliff:g> таныг энэ аппыг ашиглаагүй үед таны байршлын мэдээллийг тогтмол шаардаж байгаа тул таны утас батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд энэ аппын байршлыг унтраах боломжтой."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"<xliff:g id="APP">%1$s</xliff:g> таныг энэ аппыг ашиглаагүй үед таны байршлын мэдээллийг тогтмол шаардаж байгаа тул таны таблет батерейг хэвийн түвшинд байлгах боломжгүй байна.\n\nЭнэ асуудлыг шийдвэрлэхийн тулд энэ аппын байршлыг унтраах боломжтой."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"<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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Сүүлд бүрэн цэнэглэснээс хойших ашиглалтын мэдээлэл"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Сүүлийн бүрэн цэнэглэлт"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Батерейны хугацааг зөвхөн таамагласан бөгөөд ашиглалтаас шалтгаалан өөрчлөгдөж болно"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Батерейн ашиглалтын хэмжээг барагцаалах бөгөөд ашиглалтаас хамааран өөрчлөгдөж болно"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Идэвхтэй ашиглалтын үед"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Цаана байх үед"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Батерей ашиглалт"</string>
@@ -2336,7 +2417,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Таны вэб дээр өөрийн бүртгэлд оруулсан бүх өөрчлөлт таны таблет руу автоматаар хуулагдах болно.\n\nЗарим бүртгэл нь таны таблет дээр оруулсан аливаа өөрчлөлтийг мөн автоматаар вэб рүү хуулж болно. Google бүртгэл ийм маягаар ажилладаг."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Таны вэб дээрээс бүртгэлдаа оруулсан бүх өөрчлөлт автоматаар таны утсанд хуулагдах болно.\n\nЗарим бүртгэл нь таны утсан дээрээс оруулсан өөрчлөлтийг вэб рүү автоматаар хуулж болно. Google бүртгэл ингэж ажилладаг."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Автоматаар синк хийх өгөгдлийг унтраах уу?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Энэ нь дата болон зайны цэнэг ашиглалтыг хэмнэх боловч та сүүлийн үеийн мэдээллийг цуглуулахын тулд бүртгэл бүрийг гарааг синк хийх шаардлагатай болно. Мөн шинэчлэлт хийгдсэн үед танд мэдэгдэл ирэхгүй."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Энэ нь дата болон зайны цэнэг ашиглалтыг хэмнэх боловч та сүүлийн үеийн мэдээллийг цуглуулахын тулд бүртгэл бүрийг гараар синк хийх шаардлагатай болно. Мөн шинэчлэлт хийгдсэн үед танд мэдэгдэл ирэхгүй."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ашиглалтын циклийг шинэчлэх огноо"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Сар бүрийн өдөр::"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Тохируулах"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"түгжээг тайлахын тулд гулсуулах, нууц үг,  загвар, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ажлын сорилт, ажил, профайл"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ажлын профайл, удирдсан профайл, нэгтгэх, нэгдэл, ажил, профайл"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"зангаа"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"зангаа"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"төлөх, товших, төлбөр"</string>
     <string name="keywords_backup" msgid="470070289135403022">"нөөцлөлт, нөөцлөх"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"зангаа"</string>
     <string name="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>
@@ -2783,7 +2868,7 @@
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Түгжигдсэн дэлгэц дээр"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүх мэдэгдлийн агуулгыг харуулах"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Нууц сэдэвтэй мэдэгдлийн агуулгыг нуух"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Мэдэгдлийг харуулахгүй"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Огт мэдэгдэл харуулахгүй"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Таны төхөөрөмж түгжээтэй үед мэдэгдлийг хэрхэн харуулах вэ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Мэдэгдэл"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Ажлын мэдэгдлийн бүх агуулгыг харуулах"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2831,8 +2921,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>
@@ -2916,6 +3004,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Зөвхөн одтой харилцагчаас"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Байхгүй"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Сэрүүлэг"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Сэрүүлгийг тогтмол чухалчилж дуугаргана"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Сануулагч"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Үйл явдал"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Бүх дуудлага"</string>
@@ -2963,11 +3052,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>
@@ -2975,7 +3059,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>
@@ -3093,6 +3177,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>
@@ -3185,8 +3278,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>
@@ -3276,6 +3369,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>
@@ -3294,14 +3396,13 @@
     <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>
       <item quantity="one">1 хязгаарлалт</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"Оператор компанийн дата тооцоололт нь төхөөрөмжийн тооцоололтоос өөр байна"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"Оператор компанийн дата тооцоололт нь төхөөрөмжийн тооцоололтоос өөр байж болно"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> ашигласан"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Өгөгдлийн сануулгыг тохируулах"</string>
     <string name="data_warning" msgid="209133958008062117">"Дата хэрэглээний сануулга"</string>
@@ -3311,11 +3412,11 @@
     <string name="configure" msgid="1029654422228677273">"Тохируулах"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Бусад апп-г хэрэглээнд оруулсан"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> апп нь өгөгдөл хамгаалагч асаалттай үед хязгаарлагдаагүй өгөгдлийг ашиглах боломжтой</item>
-      <item quantity="one">1 апп нь өгөгдөл хамгаалагчийг асаалттай үед хязгаарлагдаагүй өгөгдлийг ашиглах боломжтой</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> апп нь дата хэмнэгчийг асаалттай үед хязгааргүй дата ашиглах боломжтой</item>
+      <item quantity="one">1 апп нь дата хэмнэгчийг асаалттай үед хязгааргүй дата ашиглах боломжтой</item>
     </plurals>
-    <string name="data_saver_title" msgid="398458827917495765">"Өгөгдөл хамгаалагч"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Хязгаарлагдаагүй өгөгдлийн хандалт"</string>
+    <string name="data_saver_title" msgid="398458827917495765">"Дата хэмнэгч"</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>
@@ -3379,8 +3480,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>
@@ -3451,25 +3551,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Дэмжлэгийн зангаа"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Мэдрэг"</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="gesture_setting_on" msgid="3455094265233870280">"Идэвхтэй"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Идэвхгүй"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Үйлдлийн систем ачааллагчийн түгжээг аль хэдийн тайлсан"</string>
@@ -3490,6 +3597,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Ажлын өгөгдлийг автоматаар синк хийх"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Өгөгдлийг автоматаар дахин боловсруулахыг апп-д зөвшөөрөх"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Бүртгэл синк хийх"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g>-с <xliff:g id="ID_1">%1$d</xliff:g> зүйлд синк асаалттай"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Бүх зүйлд синк асаалттай"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Бүх зүйлд синкийг унтраасан"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Удирдсан төхөөрөмжийн мэдээлэл"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Таны байгууллагын удирдсан тохиргооны өөрчлөлт"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>-н удирдсан тохиргооны өөрчлөлт"</string>
@@ -3570,6 +3680,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>
@@ -3583,5 +3694,11 @@
     <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="698847081680980774">"Шинэ соргог зүйл юу байна?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Шилдэг 5 онцлогийг харна уу"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS бүртгэлийн байдал"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Бүртгэсэн"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Бүртгээгүй"</string>
 </resources>
diff --git a/res/values-mr-nokeys/strings.xml b/res/values-mr-nokeys/strings.xml
index 3d5a6a8c41f9a720dff49b970715f6b59f3eaa96..db0e2ea2da5eadc5766199a45b6e067492c74bb4 100644
--- a/res/values-mr-nokeys/strings.xml
+++ b/res/values-mr-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"अनुप्रयोग व्‍यवस्‍थापित करा"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"अॅप्लिकेशन व्‍यवस्‍थापित करा"</string>
 </resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index d7d49c0875ed3a7d748ef02e123cf366df904997..b6b08ae94135119791af63a1b7a65c1e2b233b53 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -70,7 +70,7 @@
     <item msgid="8934131797783724664">"स्कॅन करत आहे…"</item>
     <item msgid="8513729475867537913">"कनेक्ट करत आहे..."</item>
     <item msgid="515055375277271756">"प्रमाणीकरण करत आहे…"</item>
-    <item msgid="1943354004029184381">"IP पत्ता प्राप्त करत आहे…"</item>
+    <item msgid="1943354004029184381">"IP पत्ता मिळवत आहे…"</item>
     <item msgid="4221763391123233270">"कनेक्ट केले"</item>
     <item msgid="624838831631122137">"निलंबित"</item>
     <item msgid="7979680559596111948">"डिस्कनेक्ट करत आहे..."</item>
@@ -84,7 +84,7 @@
     <item msgid="8878186979715711006">"स्कॅन करत आहे…"</item>
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वर कनेक्ट करत आहे…"</item>
     <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> सह प्रमाणीकरण करत आहे…"</item>
-    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून IP पत्ता प्राप्त करत आहे…"</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून IP पत्ता मिळवत आहे…"</item>
     <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वर कनेक्ट केले आहे"</item>
     <item msgid="1330262655415760617">"निलंबित"</item>
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून डिस्कनेक्ट करत आहे…"</item>
@@ -136,7 +136,7 @@
     <item msgid="8151962652413645395">"2 मिनिटे"</item>
     <item msgid="8675215713017289017">"5 मिनिटे"</item>
     <item msgid="477015974247590543">"1 तास"</item>
-    <item msgid="5198271470953124739">"कधीही कालबाह्य नाही"</item>
+    <item msgid="5198271470953124739">"कधीही टाइमआउट नाही"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"खराब"</item>
@@ -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>
@@ -235,14 +225,14 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"अंतर्गत डिव्हाइस संचयन"</item>
+    <item msgid="8151497958991952759">"अंतर्गत डिव्हाइस स्टोरेज"</item>
     <item msgid="3738430123799803530">"काढण्यायोग्य SD कार्ड"</item>
     <item msgid="4498124044785815005">"सिस्टम ला ठरवू द्या"</item>
   </string-array>
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"स्थान"</item>
     <item msgid="255608127647030286">"वैयक्तिक"</item>
-    <item msgid="4588829735729884491">"संदेशन"</item>
+    <item msgid="4588829735729884491">"मेसेजिंग"</item>
     <item msgid="886742181977884584">"मीडिया"</item>
     <item msgid="7924928667052300589">"डिव्हाइस"</item>
   </string-array>
@@ -272,7 +262,7 @@
     <item msgid="587124103118495063">"ICC SMS लिहा"</item>
     <item msgid="2320577158869025503">"सेटिंग्ज सुधारित करा"</item>
     <item msgid="1545733463471924009">"शीर्षस्थानी रेखांकित करा"</item>
-    <item msgid="3609046903962454582">"सूचनांमध्ये प्रवेश करा"</item>
+    <item msgid="3609046903962454582">"सूचना अॅक्सेस करा"</item>
     <item msgid="4671646036128214513">"कॅमेरा"</item>
     <item msgid="1097324338692486211">"ऑडिओ रेकॉर्ड करा"</item>
     <item msgid="5031552983987798163">"ऑडिओ प्ले करा"</item>
@@ -286,7 +276,7 @@
     <item msgid="6325739889222559394">"मीडिया व्हॉल्यूम"</item>
     <item msgid="5762123934816216821">"अलार्म व्हॉल्यूम"</item>
     <item msgid="785049718065337473">"सूचना व्हॉल्यूम"</item>
-    <item msgid="6700305533746877052">"ब्लूटुथ व्हॉल्यूम"</item>
+    <item msgid="6700305533746877052">"ब्लूटूथ व्हॉल्यूम"</item>
     <item msgid="2029227495214047094">"सक्रिय ठेवा"</item>
     <item msgid="26109888160231211">"स्थानाचे परीक्षण करा"</item>
     <item msgid="5753382310468855812">"उच्च पॉवर स्थानाचे परीक्षण करा"</item>
@@ -339,7 +329,7 @@
     <item msgid="4370895547001583812">"SMS/MMS लिहा"</item>
     <item msgid="4218544235221631789">"सेटिंग्ज सुधारित करा"</item>
     <item msgid="736541391767350377">"शीर्षस्थानी रेखांकित करा"</item>
-    <item msgid="5530815681721654194">"सूचनांमध्ये प्रवेश करा"</item>
+    <item msgid="5530815681721654194">"सूचना अॅक्सेस करा"</item>
     <item msgid="781213371706962767">"कॅमेरा"</item>
     <item msgid="1720492593061838172">"ऑडिओ रेकॉर्ड करा"</item>
     <item msgid="3493046322001257041">"ऑडिओ प्ले करा"</item>
@@ -353,7 +343,7 @@
     <item msgid="7878027809189330917">"मीडिया व्हॉल्यूम"</item>
     <item msgid="7260546305036218513">"अलार्म व्हॉल्यूम"</item>
     <item msgid="9103719301075748925">"सूचना व्हॉल्यूम"</item>
-    <item msgid="7025966722295861512">"ब्लूटुथ व्हॉल्यूम"</item>
+    <item msgid="7025966722295861512">"ब्लूटूथ व्हॉल्यूम"</item>
     <item msgid="4665183401128289653">"सक्रिय ठेवा"</item>
     <item msgid="8584357129746649222">"स्थान"</item>
     <item msgid="7669257279311110599">"स्थान"</item>
@@ -438,7 +428,7 @@
     <item msgid="6692305604213080515">"प्रारंभ करत आहे…"</item>
     <item msgid="8001704909356800092">"कनेक्ट करीत आहे..."</item>
     <item msgid="4039737283841672166">"कनेक्ट केले"</item>
-    <item msgid="4042143101664725090">"कालबाह्य"</item>
+    <item msgid="4042143101664725090">"टाइमआउट"</item>
     <item msgid="7664124146786465092">"अयशस्वी"</item>
   </string-array>
   <string-array name="security_settings_premium_sms_values">
@@ -461,7 +451,7 @@
   </string-array>
   <string-array name="proc_stats_process_states">
     <item msgid="5069825997142785829">"कायम"</item>
-    <item msgid="5779398140277006695">"शीर्ष क्रियाकलाप"</item>
+    <item msgid="5779398140277006695">"आघाडीच्या अॅक्टिव्हिटी"</item>
     <item msgid="1439598363694578255">"महत्त्वाचे (अग्रभाग)"</item>
     <item msgid="3396458970745718652">"महत्त्वाचे (पार्श्वभूमी)"</item>
     <item msgid="5214825238247511992">"बॅकअप घ्‍या"</item>
@@ -469,10 +459,10 @@
     <item msgid="7438189122367820362">"सेवा (चालत आहे)"</item>
     <item msgid="918687422516982498">"सेवा (रीस्टार्ट करत आहे)"</item>
     <item msgid="6807727069641853029">"प्राप्तकर्ता"</item>
-    <item msgid="6782857406100845127">"मुख्यपृष्ठ"</item>
-    <item msgid="2860945127596974299">"अंतिम क्रियाकलाप"</item>
-    <item msgid="8610560843693675830">"कॅश   केलेला (क्रियाकलाप)"</item>
-    <item msgid="4338089220026248848">"कॅश   केलेला (क्रियाकलाप क्लायंट)"</item>
+    <item msgid="6782857406100845127">"होम"</item>
+    <item msgid="2860945127596974299">"शेवटच्या अॅक्टिव्हिटी"</item>
+    <item msgid="8610560843693675830">"कॅशे केलेली (अॅक्टिव्हिटी)"</item>
+    <item msgid="4338089220026248848">"कॅशे केलेला (अॅक्टिव्हिटी क्लायंट)"</item>
     <item msgid="6652164677254579050">"कॅश   केलेला (रिक्त)"</item>
   </string-array>
   <string-array name="color_picker">
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 7c5ad125d2d0c5e1767a62557ce011dd6e3389ff..ab76c1b596f5067fff403cd94f571f507d8f9506 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -30,9 +30,10 @@
     </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>
+    <string name="header_category_device" msgid="4544026001618307754">"डिव्हाइस"</string>
     <string name="header_category_personal" msgid="3310195187905720823">"वैयक्तिक"</string>
     <string name="header_category_access" msgid="7580499097416970962">"प्रवेश"</string>
     <string name="header_category_system" msgid="2816866961183068977">"सिस्टम"</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>
@@ -90,61 +92,68 @@
     <string name="font_size_save" msgid="3450855718056759095">"ठीक"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB स्टोरेज"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD कार्ड"</string>
-    <string name="bluetooth" msgid="5549625000628014477">"ब्लूटुथ"</string>
-    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"सर्व जवळपासच्या ब्लूटुथ डिव्हाइसेसवर दृश्यमान (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
-    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"सर्व जवळपासच्या ब्लूटुथ डिव्हाइसेसवर दृश्यमान"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"अन्य ब्लूटुथ डिव्हाइसेसवर दृश्यमान नाही"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"ब्लूटूथ"</string>
+    <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"सर्व जवळपासच्या ब्लूटूथ डीव्हाइसवर दृश्यमान (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
+    <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"सर्व जवळपासच्या ब्लूटूथ डीव्हाइसवर दृश्यमान"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"अन्य ब्लूटूथ डीव्हाइसवर दृश्यमान नाही"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"फक्त जोडलेल्या डिव्हाइसेसवर दृश्यमान"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"दृश्यमानता टाइमआउट"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"व्हॉइस डायलिंग लॉक करा"</string>
-    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"स्क्रीन लॉक असते तेव्हा ब्लूटुथ डायलरचा वापर प्रतिबंधित करा"</string>
-    <string name="bluetooth_devices" msgid="1886018064039454227">"ब्लूटुथ डिव्हाइसेस"</string>
-    <string name="bluetooth_device_name" msgid="8415828355207423800">"डीव्हाइस नाव"</string>
-    <string name="bluetooth_device_details" msgid="4594773497930028085">"डीव्हाइस सेटिंग्ज"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"स्क्रीन लॉक असते तेव्हा ब्लूटूथ डायलरचा वापर प्रतिबंधित करा"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"ब्लूटूथ डिव्हाइस"</string>
+    <string name="bluetooth_device_name" msgid="8415828355207423800">"डिव्हाइस नाव"</string>
+    <string name="bluetooth_device_details" msgid="4594773497930028085">"डिव्हाइस सेटिंग्ज"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"प्रोफाईल सेटिंग्ज"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"खाते नाव वापरून, कोणतेही नाव सेट केले नाही"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"डिव्हाइसेससाठी स्कॅन करा"</string>
-    <string name="bluetooth_rename_device" msgid="4352483834491958740">"या डीव्हाइस ला पुन्हा नाव द्या"</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_empty_list_user_restricted" msgid="603521233563983689">"आपल्‍याकडे ब्लूटुथ सेटिंग्‍ज बदलण्‍याची परवानगी नाही."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"ब्लूटुथ सेटिंग्ज उघड्या असताना जवळपासच्या डिव्हाइसेसवर <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दृश्यमान असते."</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>
     <string name="bluetooth_disable_profile_message" msgid="2895844842011809904">"हे अक्षम करेल:&lt;br&gt;&lt;b&gt;<xliff:g id="PROFILE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;यावरून:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_unknown" msgid="644716244548801421"></string>
-    <string name="bluetooth_device" msgid="5291950341750186887">"नाव नसलेले ब्लूटूथ डीव्हाइस"</string>
+    <string name="bluetooth_device" msgid="5291950341750186887">"नाव नसलेले ब्लूटूथ डिव्हाइस"</string>
     <string name="progress_scanning" msgid="192587958424295789">"शोधत आहे"</string>
-    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"जवळपास ब्लूटुथ डिव्हाइसेस आढळली नाहीत."</string>
+    <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"जवळपास ब्लूटूथ डिव्हाइस आढळली नाहीत."</string>
     <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="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>
-    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"अॅप ब्लूटुथ चालू करु इच्छित आहे"</string>
-    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"अॅप ब्लूटुथ बंद करू इच्छितो"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅब्लेट अन्य ब्लूटुथ डिव्हाइसेसाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन अन्य ब्लूटुथ डिव्हाइसेसाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"अॅप आपला टॅब्लेट अन्य ब्लूटुथ डिव्हाइसेसाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"अॅप आपला फोन अन्य ब्लूटुथ डिव्हाइसेसाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅब्लेट इतर ब्लूटुथ डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन इतर ब्लूटुथ डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"अॅप आपला टॅब्लेट इतर ब्लूटुथ डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"अॅप आपला फोन इतर ब्लूटुथ डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला टॅब्लेट अन्य डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छितो."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला फोन अन्य डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छितो."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"अॅप ब्लूटुथ चालू करु इच्छित आहे आणि इतर डिव्हाइसेससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला टॅब्लेट दृश्यमान बनवू इच्छित आहे."</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"अॅप ब्लूटुथ चालू करु इच्छित आहे आणि इतर डिव्हाइसेससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला फोन दृश्यमान बनवू इच्छित आहे."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटुथ चालू करु इच्छित आहे आणि आपला टॅब्लेट इतर डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> अॅप ब्लूटुथ चालू करु इच्छित आहे आणि आपला फोन इतर डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"अॅप ब्लूटुथ चालू करु इच्छित आहे आणि आपला टॅब्लेट इतर डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"अॅप ब्लूटुथ चालू करु इच्छित आहे आणि आपला फोन इतर डिव्हाइसेससाठी दृश्‍यमान बनवू इच्छित आहे. आपण ब्लूटुथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लूटुथ चालू करत आहे…"</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लूटुथ बंद करत आहे…"</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>
+    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"अॅप ब्लूटूथ चालू करु इच्छित आहे"</string>
+    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"अॅप ब्लूटूथ बंद करू इच्छितो"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅबलेट अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"अॅप आपला टॅबलेट अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"अॅप आपला फोन अन्य ब्लूटूथ डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांसाठी दृश्यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला टॅबलेट इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> आपला फोन इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"अॅप आपला टॅबलेट इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"अॅप आपला फोन इतर ब्लूटूथ डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला टॅबलेट अन्य डीव्हाइससाठी दृश्‍यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करू इच्छितो आणि <xliff:g id="TIMEOUT">%2$d</xliff:g> सेकंदांसाठी आपला फोन अन्य डीव्हाइससाठी दृश्‍यमान करू इच्छितो."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि इतर डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला टॅबलेट दृश्यमान बनवू इच्छित आहे."</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि इतर डीव्हाइससाठी <xliff:g id="TIMEOUT">%1$d</xliff:g> सेकंदांकरिता आपला फोन दृश्यमान बनवू इच्छित आहे."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> ब्लूटूथ चालू करु इच्छित आहे आणि आपला टॅबलेट इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> अॅप ब्लूटूथ चालू करु इच्छित आहे आणि आपला फोन इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि आपला टॅबलेट इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि आपला फोन इतर डीव्हाइससाठी दृश्‍यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लूटूथ चालू करत आहे…"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लूटूथ बंद करत आहे…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्वयं-कनेक्ट"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ब्लूटुथ कनेक्शन विनंती"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" शी कनेक्ट करण्यासाठी टॅप करा."</string>
@@ -157,13 +166,16 @@
     <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) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"<xliff:g id="BROADCAST">broadcast</xliff:g> पाठवा"</string>
     <string name="intent_sender_action_label" msgid="616458370005452389">"<xliff:g id="ACTION">Action</xliff:g>:"</string>
-    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> प्रारंभ करा"</string>
+    <string name="intent_sender_startactivity_text" msgid="5080516029580421895">"<xliff:g id="ACTIVITY">activity</xliff:g> प्रारंभ"</string>
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"खाते:"</string>
     <string name="proxy_settings_title" msgid="9049437837600320881">"प्रॉक्सी"</string>
@@ -177,7 +189,7 @@
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"ठीक"</string>
     <string name="proxy_error_invalid_host" msgid="6865850167802455230">"आपण टाइप केलेले होस्टनाव वैध नाही."</string>
     <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"आपण टाइप केलेली प्रवेश नाकारलेली सूची योग्यरितीने स्वरूपित नाही. प्रवेश नाकारलेल्या डोमेनची स्वल्पविरामाने-विभक्त सूची टाइप करा."</string>
-    <string name="proxy_error_empty_port" msgid="5539106187558215246">"आपल्याला पोर्ट फील्ड पूर्ण करण्‍याची आवश्यकता आहे"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"तुम्हाला पोर्ट फील्ड पूर्ण करण्‍याची आवश्यकता आहे"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"होस्ट फील्ड रिक्त असल्यास पोर्ट फील्ड रिक्त असणे आवश्यक आहे."</string>
     <string name="proxy_error_invalid_port" msgid="5988270202074492710">"आपण टाइप केलेला पोर्ट वैध नाही."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"ब्राउझरद्वारे HTTP प्रॉक्सी वापरले जाते परंतु अन्य अॅप्सद्वारे कदाचित वापरले जाणार नाही."</string>
@@ -224,8 +236,8 @@
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"USB स्टोरेज माउंट केलेले नाही."</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"कोणतेही SD कार्ड नाही."</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"उपलब्ध बाइट:"</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB स्टोरेज एक अत्याधिक स्टोरेज डीव्हाइस म्हणून वापरले जात आहे."</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD कार्ड एक अत्याधिक स्टोरेज डीव्हाइस म्हणून वापरले जात आहे."</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB स्टोरेज एक अत्याधिक स्टोरेज डिव्हाइस म्हणून वापरले जात आहे."</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD कार्ड एक अत्याधिक स्टोरेज डिव्हाइस म्हणून वापरले जात आहे."</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="5128923500235719226">"आता हे USB स्टोरेज काढून टाकण्यास सुरक्षित आहे."</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="666233604712540408">"SD कार्ड काढून टाकणे आता सुरक्षित आहे."</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB स्टोरेज वापरात असतानाच काढले!"</string>
@@ -255,7 +267,7 @@
     <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"तळाशी हलवा"</string>
     <string name="action_drag_label_remove" msgid="2861038147166966206">"भाषा काढा"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"अॅक्टिव्हिटी निवडा"</string>
-    <string name="device_info_label" msgid="6551553813651711205">"डीव्हाइस माहिती"</string>
+    <string name="device_info_label" msgid="6551553813651711205">"डिव्हाइस माहिती"</string>
     <string name="display_label" msgid="8074070940506840792">"स्क्रीन"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"टॅबलेट माहिती"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"फोन माहिती"</string>
@@ -265,7 +277,7 @@
     <string name="cancel" msgid="6859253417269739139">"रद्द करा"</string>
     <string name="okay" msgid="1997666393121016642">"ठीक आहे"</string>
     <string name="forget" msgid="1400428660472591263">"विसरा"</string>
-    <string name="save" msgid="879993180139353333">"जतन करा"</string>
+    <string name="save" msgid="879993180139353333">"सेव्ह करा"</string>
     <string name="done" msgid="6942539184162713160">"पूर्ण झाले"</string>
     <string name="settings_label" msgid="1626402585530130914">"सेटिंग्ज"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग्ज"</string>
@@ -274,7 +286,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"विमान मोड"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"अधिक"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"वायरलेस आणि नेटवर्क"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"वाय-फाय, ब्लूटुथ, विमान मोड, मोबाईल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, विमान मोड, मोबाईल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"मोबाइल डेटा"</string>
     <string name="calls_title" msgid="3544471959217176768">"कॉल"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS संदेश"</string>
@@ -301,7 +313,7 @@
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"नेटवर्कने-प्रदान केलेला टाइम झोन वापरा"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"नेटवर्कने-प्रदान केलेला टाइम झोन वापरा"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑तास स्वरूप"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"24-तास स्वरूप वापरा"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"२४-तास स्वरूप वापरा"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"वेळ"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"वेळ सेट करा"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"टाइम झोन"</string>
@@ -329,10 +341,10 @@
     <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="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>
+    <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>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"लॉक स्क्रीन प्राधान्ये"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल स्टोरेज लॉक सेट करा"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल स्टोरेज लॉक सेट करा"</string>
@@ -354,40 +366,39 @@
     <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_content_description" msgid="2058830032070449160">"डीव्हाइस आणि फिंगरप्रिंट सेंसर स्थानासह चित्रे"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"हे नंतर करा"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिंट सेटअप वगळायचे?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"आपण आपला फोन अनलॉक करण्याची एक पद्धत म्हणून आपण आपले फिंगरप्रिंट वापरणे निवडले. आता आपण वगळल्यास, आपल्याला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
     <string name="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>
@@ -404,51 +415,53 @@
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"आपण आपले फिंगरप्रिंट आपले कार्य प्रोफाइल अनलॉक करण्‍यासाठी, खरेद्या प्रमाणित करण्‍यासाठी किंवा कार्य अॅप्समध्‍ये साइन इन करण्‍यासाठी वापरू शकणार नाही"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"होय, काढा"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"सुरु ठेवण्‍यासाठी आपल्‍या फिंगरप्रिंटचा वापर करा."</string>
-    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"कूटबद्धीकरण"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टॅबलेट कूटबद्ध करा"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फोन कूटबद्ध करा"</string>
-    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"कूटबद्ध केले"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एंक्रिप्शन"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टॅबलेट एंक्रिप्ट करा"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फोन एंक्रिप्ट करा"</string>
+    <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एंक्रिप्ट केले"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेले अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला टॅब्लेट एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा संकेतशब्द) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही टॅब्लेट चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्शनला एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला टॅब्लेट प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"तुम्ही तुमची खाती, सेटिंग्ज, डाउनलोड केलेली अ‍ॅप्स आणि त्यांचा डेटा, मीडिया आणि इतर फायली एंक्रिप्ट करू शकता. तुम्ही आपला फोन एंक्रिप्ट केल्यानंतर, तुम्ही स्क्रीन लॉक (म्हणजे, एक पॅटर्न किंवा अंकीय पिन किंवा संकेतशब्द) सेट केला आहे हे गृहित धरून, प्रत्येकवेळी तुम्ही फोन चालू करता तेव्हा त्याचे एंक्रिप्ट करण्‍यासाठी आपल्‍याला स्क्रीन अनलॉक करण्‍याची आवश्यकता असेल. एंक्रिप्ट करण्‍याचा अन्य एकमेव मार्ग आपला सर्व डेटा मिटवून, फॅक्‍टरी डेटा रीसेट करणे हा होय.\n\nएंक्रिप्टीकरणास एक तास किंवा अधिक वेळ लागू शकतो. तुम्ही संपूर्ण प्रक्रियेत चार्ज केलेल्या बॅटरीसह प्रारंभ करणे आणि आपला फोन प्लग इन केलेला ठेवणे आवश्यक आहे. तुम्ही त्यात व्यत्यय आणल्यास, तुम्ही आपला काही किंवा सर्व डेटा गमवाल."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टॅबलेट कूटबद्ध करा"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फोन कूटबद्ध करा"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टॅबलेट एंक्रिप्ट करा"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फोन एंक्रिप्ट करा"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"आपली बॅटरी चार्ज करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"आपला चार्जर प्लग इन करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोणताही लॉक स्क्रीन पिन किंवा संकेतशब्द नाही"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"आपण एनक्रिप्शन सुरु करण्यापूर्वी आपल्याला एक लॉक स्क्रीन पिन ‍किंवा संकेतशब्द सेट करण्याची आवश्यकता आहे."</string>
-    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"कूटबद्ध करायचे?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"कूटबद्धीकरण कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. कूटबद्धीकरणास एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"कूटबद्धीकरण कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. कूटबद्धीकरणास एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
-    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"कूटबद्ध करत आहे"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"आपला टॅबलेट कूटबद्ध केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"आपला फोन कूटबद्ध केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"आपला टॅबलेट कूटबद्ध केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"आपला फोन कूटबद्ध केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एंक्रिप्ट करायचे?"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि आपण त्यात व्यत्यय आणल्यास, आपला डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
+    <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"एंक्रिप्ट करत आहे"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"आपला टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"आपला फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"आपला टॅब्लेट एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"आपला फोन एंक्रिप्ट केला जात असताना प्रतीक्षा करा. शिल्लक वेळ: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"आपला टॅबलेट अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"आपला फोन अनलॉक करण्‍यासाठी, तो बंद करा आणि नंतर चालू करा."</string>
-    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावणी: अनलॉक करण्‍याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्‍वी प्रयत्नांनंतर तुमचे डीव्हाइस पुसले जाईल."</string>
+    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावणी: अनलॉक करण्‍याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्‍वी प्रयत्नांनंतर तुमचे डिव्हाइस पुसले जाईल."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"आपला संकेतशब्द टाइप करा"</string>
-    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"कूटबद्धीकरण अयशस्वी"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n आपला टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर आपण आपला टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा पुनर्संचयित करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nआपला फोन वापरणे पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा आपण आपला फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा पुनर्संचयित करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एंक्रिप्शन अयशस्वी"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n आपला टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर आपण आपला टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nआपला फोन वापरणे पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा आपण आपला फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"विकूटन अयशस्वी"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"आपण प्रविष्ट केलेला संकेतशब्द चुकीचा आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला टॅबलेट वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर आपण आपला टॅबलेट सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा पुनर्संचयित करण्याची संधी असेल."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"आपण प्रविष्ट केलेला संकेतशब्द बरोबर आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला फोन वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर आपण आपला फोन सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा पुनर्संचयित करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"आपण एंटर केलेला पासवर्ड चुकीचा आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला टॅबलेट वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर आपण आपला टॅबलेट सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"आपण एंटर केलेला पासवर्ड बरोबर आहे, परंतु दुर्दैवाने आपला डेटा दूषित आहे. \n\nआपला फोन वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर आपण आपला फोन सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धत स्विच करा"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"स्क्रीन लॉक सेट करा"</string>
-    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"तुमचे डीव्हाइस संरक्षित करा"</string>
+    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"तुमचे डिव्हाइस संरक्षित करा"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"फिंगरप्रिंट वापरा"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"आपल्या फिंगरप्रिंटसह अनलॉक करा"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"स्क्रीन लॉक निवडा"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"कार्य लॉक निवडा"</string>
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"आपला टॅबलेट संरक्षित करा"</string>
-    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"तुमचे डीव्हाइस संरक्षित करा"</string>
+    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"तुमचे डिव्हाइस संरक्षित करा"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"आपला फोन संरक्षित करा"</string>
     <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"अतिरिक्त सुरक्षिततेसाठी, बॅकअप स्क्रीन लॉक सेट करा."</string>
-    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डीव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
-    <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="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिव्हाइस संरक्षण वैशिष्ट्ये अॅक्टिव्हेट करून तुमच्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
+    <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>
@@ -481,22 +494,22 @@
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"संकेतशब्द"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"एकदा आपण स्क्रीन लॉक सेट केल्यानंतर, आपण सेटिंग्ज &gt; सुरक्षितता मध्ये आपले फिंगरप्रिंट देखील सेट करू शकता."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"स्क्रीन लॉक बंद करा"</string>
-    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"डीव्हाइस संरक्षण काढायचे?"</string>
+    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"डिव्हाइस संरक्षण काढायचे?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"प्रोफाइल संरक्षण काढायचे?"</string>
-    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"तुमच्या पॅटर्नशिवाय डीव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"तुमच्या नमून्याशिवाय डीव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"तुमच्या पॅटर्नशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"तुमच्या नमून्याशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही.\""</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"तुमच्या पिनशिवाय डीव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"तुमच्या पिनशिवाय डीव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"तुमच्या पिनशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डीव्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही.\""</string>
-    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"तुमच्या पासवर्डाशिवाय डीव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"तुमच्या पासवर्डाशिवाय डीव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+</xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डिव्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही.\""</string>
+    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"तुमच्या पासवर्डाशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"तुमच्या पासवर्डाशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही.\""</string>
-    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"तुमच्या स्क्रीनलॉकशिवाय डीव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"तुमच्या स्क्रीनलॉकशिवाय डीव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"तुमच्या स्क्रीनलॉकशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"तुमच्या स्क्रीनलॉकशिवाय डिव्हाइस संरक्षण वैशिष्ट्ये कार्य करणार नाहीत.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>तुमचे सेव्ह केलेले फिंगरप्रिंट देखील या डि‍व्हाइसवरून दूर केले जातील आणि तुम्ही तुमचा फोन अनलॉक करण्यास, खरेदींना अधिकृत करण्यास किंवा त्यांच्यासह अॅप्समध्ये साइन इन करण्यास सक्षम राहणार नाही.\""</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"आपल्या नमुन्याशिवाय प्रोफाईल संरक्षण वैशिष्ट्ये कार्य करणार नाहीत."</string>
@@ -519,24 +532,32 @@
     <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="1688030823464420974">"तुम्‍ही पुढच्‍या प्रयत्‍नात एखादा चुकीचा पॅटर्न टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"तुम्‍ही पुढच्‍या प्रयत्‍नात एखादा चुकीचा पिन टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"तुम्‍ही पुढच्‍या प्रयत्‍नात एखादा चुकीचा पासवर्ड टाकल्‍यास, या डिव्‍हाइसचा डेटा हटवला जाईल"</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="5047439819181833824">"बरेच चुकीचे प्रयत्‍न. या डिव्‍हाइसचा डेटा हटवला जाईल."</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>
     <string name="lockpassword_password_too_long" msgid="4591720174765403476">"<xliff:g id="NUMBER">%d</xliff:g> वर्णांपेक्षा कमी असणे आवश्यक आहे"</string>
     <string name="lockpassword_pin_too_long" msgid="2079396149560490458">"<xliff:g id="NUMBER">%d</xliff:g> अंकांपेक्षा कमी असणे आवश्यक आहे"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="7284664023164191198">"केवळ 0-9 अंक असणे आवश्यक आहे"</string>
-    <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"डीव्हाइस प्रशासक अलीकडील पिन वापरण्याची अनुमती देत नाही"</string>
+    <string name="lockpassword_pin_recently_used" msgid="1401569207976460727">"डिव्हाइस प्रशासक अलीकडील पिन वापरण्याची अनुमती देत नाही"</string>
     <string name="lockpassword_illegal_character" msgid="8049611046639943217">"यामध्ये अवैध वर्ण समाविष्ट असू शकत नाही"</string>
     <string name="lockpassword_password_requires_alpha" msgid="3036589522150097731">"कमीत कमी एक अक्षर असणे आवश्यक आहे"</string>
     <string name="lockpassword_password_requires_digit" msgid="5140062925787058765">"कमीत कमी एक अंक असणे आवश्यक आहे"</string>
-    <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"कमीत कमी एक चिन्ह असणे आवश्यक आहे"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="5944350865681510893">"कमीत कमी एक आयकन असणे आवश्यक आहे"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="9013132344745898400">
       <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षर असणे आवश्यक आहे</item>
       <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षरे असणे आवश्यक आहे</item>
@@ -554,21 +575,21 @@
       <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> संख्यात्मक अंक असणे आवश्यक आहे</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="6751305770863640574">
-      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष चिन्ह असणे आवश्यक आहे</item>
-      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष चिन्हे असणे आवश्यक आहे</item>
+      <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष आयकन असणे आवश्यक आहे</item>
+      <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> विशेष आयकन असणे आवश्यक आहे</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="4440596998172043055">
       <item quantity="one">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षर नसलेला वर्ण असणे आवश्यक आहे</item>
       <item quantity="other">किमान <xliff:g id="COUNT">%d</xliff:g> अक्षर नसलेले वर्ण असणे आवश्यक आहे</item>
     </plurals>
-    <string name="lockpassword_password_recently_used" msgid="942665351220525547">"डीव्हाइस प्रशासक अलीकडील पासवर्ड वापरण्याची अनुमती देत नाही"</string>
+    <string name="lockpassword_password_recently_used" msgid="942665351220525547">"डिव्हाइस प्रशासक अलीकडील पासवर्ड वापरण्याची अनुमती देत नाही"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="680765285206990584">"अंकांच्या चढत्या, उतरत्या किंवा पुनरावृत्त क्रमाला अनुमती नाही"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ठीक"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"रद्द करा"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"रद्द करा"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"पुढील"</string>
     <string name="lock_setup" msgid="3355847066343753943">"सेटअप पूर्ण झाले आहे"</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"डीव्हाइस प्रशासक अॅप्‍स"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"डिव्हाइस प्रशासक अॅप्‍स"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"सक्रिय अ‍ॅप्स नाहीत"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> सक्रिय अॅप</item>
@@ -581,11 +602,11 @@
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> सक्रिय विश्वासू एजंट</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> सक्रिय विश्वासू एजंट</item>
     </plurals>
-    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ब्लूटुथ"</string>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ब्लूटूथ"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ब्लूटुथ चालू करा"</string>
-    <string name="bluetooth_settings" msgid="1810521656168174329">"ब्लूटुथ"</string>
-    <string name="bluetooth_settings_title" msgid="1908745291161353016">"ब्लूटुथ"</string>
-    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"कनेक्शन व्यवस्थापित करा, डीव्हाइस नाव आणि शोधयोग्यता सेट करा"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"ब्लूटूथ"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"ब्लूटूथ"</string>
+    <string name="bluetooth_settings_summary" msgid="2091062709530570462">"कनेक्शन व्यवस्थापित करा, डिव्हाइस नाव आणि शोधयोग्यता सेट करा"</string>
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह जोडायचे?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"ब्लूटूथ पेअरींग कोड"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"पेअरींग कोड टाइप करा नंतर Return किंवा Enter दाबा"</string>
@@ -595,7 +616,7 @@
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"आपल्याला इतर डिव्हाइसवर देखील हा पिन टाईप करण्याची आवश्यकता असू शकते."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"आपल्याला इतर डिव्हाइसवर देखील ही पासकी टाईप करण्याची आवश्यकता असू शकते."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"यासह जोडण्यासाठी:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;हे ही पासकी दर्शवत असल्याचे सुनिश्चित करा:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"यावरून:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;हे डीव्हाइस जोडायचे?"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"यावरून:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;हे डिव्हाइस जोडायचे?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"यासह जोडण्यासाठी:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>यावर टाइप करा:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, नंतर Return किंवा Enter दाबा."</string>
     <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ला आपले संपर्क आणि कॉल इतिहासामध्‍ये प्रवेश करण्‍याची अनुमती द्या"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
@@ -603,8 +624,8 @@
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"डिव्हाइसेससाठी स्कॅन करा"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"रीफ्रेश करा"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"शोधत आहे..."</string>
-    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"डीव्हाइस सेटिंग्ज"</string>
-    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"पेअर केलेले डीव्हाइस"</string>
+    <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"डिव्हाइस सेटिंग्ज"</string>
+    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"पेअर केलेले डिव्हाइस"</string>
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"नाव"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"इंटरनेट कनेक्शन"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"कीबोर्ड"</string>
@@ -612,7 +633,7 @@
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"या डिव्हाइसशी जोडायचे?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"फोन बुक सामायिक करायचे?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपल्या संपर्कांवर आणि कॉल इतिहासावर प्रवेश करू इच्छित आहे."</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटुथ सह जोडू इच्‍छिते. कनेक्‍ट केले असताना, त्यास आपल्‍या संपर्कांवर आणि कॉल इतिहासावर प्रवेश असेल."</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ सह जोडू इच्‍छिते. कनेक्‍ट केले असताना, त्यास आपल्‍या संपर्कांवर आणि कॉल इतिहासावर अॅक्सेस असेल."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"जोडलेली डिव्हाइसेस"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"उपलब्ध डिव्हाइसेस"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"कोणतेही डिव्हाइसेस उपलब्ध नाहीत"</string>
@@ -623,31 +644,39 @@
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"डिस्कनेक्ट करा आणि जोडणे रद्द करा"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"पर्याय…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"प्रगत"</string>
-    <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_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>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> इनपुट डिव्हाइसवरून डिस्कनेक्ट होईल."</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे इंटरनेट प्रवेश डिस्कनेक्ट केला जाईल."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> या टॅब्लेटचे इंटरनेट कनेक्शन सामायिक करण्यावरून डिस्कनेक्ट होईल."</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> या फोनचे इंटरनेट कनेक्शन सामायिक करण्यावरून डिस्कनेक्ट होईल."</string>
-    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"पेअर केलेले ब्लूटूथ डीव्हाइस"</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे इंटरनेट अॅक्सेस डिस्कनेक्ट केला जाईल."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> या टॅबलेटचे इंटरनेट कनेक्शन शेअर केल्याने डिस्कनेक्ट होईल."</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> या फोनचे इंटरनेट कनेक्शन शेअर केल्याने डिस्कनेक्ट होईल."</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"पेअर केलेले ब्लूटूथ डिव्हाइस"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"कनेक्ट करा"</string>
-    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ब्लूटुथ डिव्हाइसवर कनेक्ट करा"</string>
+    <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ब्लूटूथ डीव्हाइसवर कनेक्ट करा"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"यासाठी वापरा"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"पुनर्नामित करा"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"येणार्‍या फाईल स्थानांतरणांना अनुमती द्या"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"इंटरनेट प्रवेशासाठी डिव्हाइसवर कनेक्ट केले"</string>
-    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"डिव्हाइससह स्थानिक इंटरनेट कनेक्शन सामायिक करत आहे"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"इंटरनेट अॅक्सेससाठी डीव्हाइसवर कनेक्ट केले"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"डीव्हाइससह स्थानिक इंटरनेट कनेक्शन शेअर करत आहे"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"डॉक सेटिंग्ज"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ऑडिओसाठी डॉक वापरा"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"स्पीकर फोन म्हणून"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"संगीत आणि मीडियासाठी"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग्ज लक्षात ठेवा"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"कास्‍ट करा"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले चालू करा"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"वायरलेस डिस्प्ले सुरू करा"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"कोणतीही जवळपासची डिव्हाइसेस आढळली नाहीत."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"कनेक्ट करीत आहे"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"कनेक्ट केले"</string>
@@ -667,13 +696,13 @@
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"टॅबलेट दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"फोन दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC चालू करा"</string>
-    <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC हे डीव्हाइस आणि दुसरे जवळपासचे डीव्हाइस किंवा पेमेंट टर्मिनल, अॅक्सेस रीडर आणि सुसंवादी जाहिराती किंवा टॅग यासारख्या लक्ष्यांमधील डेटाची अदलाबदल करते."</string>
+    <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC हे डिव्हाइस आणि दुसरे जवळपासचे डिव्हाइस किंवा पेमेंट टर्मिनल, अॅक्सेस रीडर आणि सुसंवादी जाहिराती किंवा टॅग यासारख्या लक्ष्यांमधील डेटाची अदलाबदल करते."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android बीम"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC द्वारे अॅप सामग्री प्रक्षेपित करण्यास तयार"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"बंद"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC बंद असल्यामुळे अनुपलब्ध"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android बीम"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"जेव्हा हे वैशिष्ट्य चालू केलेले असते तेव्हा,डीव्हाइस एकत्र जवळ धरून दुसर्‍या NFC-सक्षम डीव्हाइस वर अॅप सामग्री बीम करू शकता. उदाहरणार्थ, तुम्ही वेब पृष्ठे, YouTube व्हिडिओ, संपर्क आणि बरेच काही बीम करू शकता.\n\nफक्त डीव्हाइस एकत्र आणा (विशेषतः पाठोपाठ) आणि नंतर आपली स्क्रीन टॅप करा. काय बीम केले जाते हे अॅप निर्धारित करते."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"जेव्हा हे वैशिष्ट्य चालू केलेले असते तेव्हा, तुम्ही डिव्हाइस एकत्र जवळ धरून दुसर्‍या NFC-सक्षम डिव्हाइस वर अॅप सामग्री बीम करू शकता. उदाहरणार्थ, तुम्ही वेब पृष्ठे, YouTube व्हिडिओ, संपर्क आणि बरेच काही बीम करू शकता.\n\nफक्त डिव्हाइस एकत्र आणा (विशेषतः पाठोपाठ) आणि नंतर स्क्रीन टॅप करा. काय बीम केले जाते हे अॅप निर्धारित करते."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"वाय-फाय"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"वाय-फाय चालू करा"</string>
     <string name="wifi_settings" msgid="29722149822540994">"वाय-फाय"</string>
@@ -681,9 +710,9 @@
     <string name="wifi_settings_title" msgid="3103415012485692233">"वाय-फाय"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस प्रवेश बिंदू सेट करा आणि  व्यवस्थापित करा"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"वाय-फाय निवडा"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"वाय-फाय चालू करीत आहे..."</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"वाय-फाय बंद करीत आहे…"</string>
-    <string name="wifi_error" msgid="3207971103917128179">"त्रुटी"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"वाय-फाय चालू करत आहे..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"वाय-फाय बंद करत आहे…"</string>
+    <string name="wifi_error" msgid="3207971103917128179">"एरर"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"या देशात 5 GHz बँड उपलब्‍ध नाही"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"विमान मोड मध्ये"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"नेटवर्क सूचना उघडा"</string>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"वाय-फाय स्वयंचलितपणे चालू करा"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"आपल्या होम नेटवर्कसारख्या उच्च दर्जाच्या जतन केलेल्या नेटवर्कजवळ वाय-फाय स्वयंचलितपणे परत चालू होईल"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"वाय-फाय स्कॅनिंग बंद केल्यामुळे उपलब्ध नाही"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"वापरण्‍यासाठी, नेटवर्क रेटिंग पुरवठादार निवडा"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्शन टाळा"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"वाय-फाय नेटवर्कचे चांगले इंटरनेट कनेक्शन नसल्यास त्याचा वापर करु नका"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"केवळ चांगले इंटरनेट कनेक्शन असलेली नेटवर्क वापरा"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"खुल्या नेटवर्कशी कनेक्ट करा"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"उच्च गुणवत्तेच्या सार्वजनिक नेटवर्कशी स्वयंचलितपणे कनेक्ट करा"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"वापरण्‍यासाठी, नेटवर्क रेटिंग पुरवठादार निवडा"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"वापरण्‍यासाठी, सुसंगत नेटवर्क रेटिंग पुरवठादार निवडा"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्रे इंस्टॉल करा"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"स्‍थान अचूकता सुधारण्‍यासाठी, सिस्टीम अ‍ॅप्स आणि सेवा अद्याप वाय-फाय नेटवर्कसाठी स्कॅन करू शकतात. आपण हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"स्‍थान अचूकता सुधारण्‍यासाठी, सिस्टम अ‍ॅप्स आणि सेवा अद्याप वाय-फाय नेटवर्कसाठी स्कॅन करू शकतात. तुम्ही हे <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्‍ये बदलू शकता."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"स्थान अचूकता वाढवण्यासाठी, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्कॅनिंग सेटिंग्ज<xliff:g id="LINK_END_1">LINK_END</xliff:g> मध्ये वाय-फाय स्कॅनिंग चालू करा."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"पुन्हा दर्शवू नका"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"निष्क्रिय असताना वाय-फाय चालू ठेवा"</string>
@@ -707,9 +739,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"वाय-फाय ऑप्टिमायझेशन"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"वाय-फाय चालू असताना बॅटरी वापर कमी करा"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"वाय-फाय द्वारे वापरलेल्या बॅटरीवर मर्यादा घाला"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"वाय-फाय ने इंटरनेट प्रवेश गमावल्यास मोबाइल डेटावर स्विच करा."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"वाय-फाय ने इंटरनेट अॅक्सेस गमावल्यास मोबाइल डेटावर स्विच करा."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"मोबाइल डेटावर स्‍वयंचलितपणे स्विच करा"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"वाय-फायवरून इंटरनेटवर प्रवेश नसताना मोबाइल डेटा वापरा. डेटा वापर लागू होऊ शकतो."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"वाय-फायवरून इंटरनेटवर अॅक्सेस नसताना मोबाइल डेटा वापरा. डेटा वापर लागू होऊ शकतो."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"नेटवर्क जोडा"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"वाय-फाय प्राधान्ये"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"वाय-फाय स्वयंचलितपणे परत चालू होते"</string>
@@ -718,7 +750,7 @@
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS पुश बटण"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"अधिक पर्याय"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टी"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाय-फाय थेट"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाय-फाय डिरेक्ट"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कॅन करा"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"प्रगत"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"कॉन्फिगर करा"</string>
@@ -729,7 +761,7 @@
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC टॅग वर लिहा"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"उपलब्ध नेटवर्क पाहण्यासाठी, वाय-फाय चालू करा."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"वाय-फाय नेटवर्क शोधत आहे…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"आपल्याला वाय-फाय नेटवर्क बदलण्याची परवानगी नाही."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"तुमच्याला वाय-फाय नेटवर्क बदलण्याची परवानगी नाही."</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्वयंचलित सेटअप (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"प्रगत पर्याय"</string>
@@ -737,10 +769,10 @@
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ड्रॉप-डाउन सूची प्रगत पर्याय. विस्तृत करण्‍यासाठी दोनदा-टॅप करा."</string>
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"वाय-फाय संरक्षित सेटअप"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ करीत आहे…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"आपल्या राउटरवरील वाय‑फाय संरक्षित सेटअप बटण दाबा. त्यास \"WPS\" म्हटले जाऊ शकते किंवा या चिन्हाने चिन्हांकित केले जाऊ शकते:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"आपल्या वाय-फाय राउटरवर पिन <xliff:g id="NUMBER">%1$s</xliff:g> प्रविष्ट करा. सेटअप पूर्ण होण्यास दोन मिनिटांपर्यंत लागू शकतात."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"तुमच्या राउटरवरील वाय‑फाय संरक्षित सेटअप बटण दाबा. त्यास \"WPS\" म्हटले जाऊ शकते किंवा या चिन्हाने चिन्हांकित केले जाऊ शकते:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"तुमच्या Wi‑Fi राउटरवर पिन <xliff:g id="NUMBER">%1$s</xliff:g> एंटर करा. सेटअप पूर्ण होण्यास दोन मिनिटे वेळ लागू शकतो."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS यशस्वी झाले. नेटवर्कशी कनेक्ट करत आहे..."</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"वाय-फाय नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट झाले"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट झाले"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS आधीपासून प्रगतीपथावर आहे आणि पूर्ण होण्यास दोन मिनिटे लागू शकतात"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WEP अयशस्वी. कृपया काही मिनिटांनी पुन्हा प्रयत्न करा."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"वायरलेस राउटर सुरक्षा सेटिंग (WEP) समर्थित नाही"</string>
@@ -753,11 +785,11 @@
     <string name="wifi_security" msgid="6603611185592956936">"सुरक्षितता"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"सिग्नल सामर्थ्य"</string>
     <string name="wifi_status" msgid="4824568012414605414">"स्थिती"</string>
-    <string name="wifi_speed" msgid="3526198708812322037">"दुवा गती"</string>
+    <string name="wifi_speed" msgid="3526198708812322037">"लिंक गती"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"वारंवारता"</string>
     <string name="wifi_ip_address" msgid="1440054061044402918">"IP पत्ता"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"द्वारे जतन केले"</string>
-    <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> क्रेडेन्शियल"</string>
+    <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> क्रेडेंशियल"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP पद्धत"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"टप्पा 2 प्रमाणीकरण"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA प्रमाणपत्र"</string>
@@ -771,14 +803,15 @@
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz बँड"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz बँड"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP सेटिंग्ज"</string>
-    <string name="wifi_shared" msgid="844142443226926070">"इतर डीव्हाइस वापरकर्त्यांसह शेअर करा"</string>
+    <string name="wifi_shared" msgid="844142443226926070">"इतर डिव्हाइस वापरकर्त्यांसह शेअर करा"</string>
     <string name="wifi_unchanged" msgid="3410422020930397102">"(न बदललेले)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"कृपया निवडा"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(एकाधिक प्रमाणपत्रे जोडली)"</string>
-    <string name="wifi_use_system_certs" msgid="5270879895056893783">"सिस्टीम प्रमाणपत्रे वापरा"</string>
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"सिस्टम प्रमाणपत्रे वापरा"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान करू नका"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"प्रमाणित करू नका"</string>
     <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोणतेही प्रमाणपत्र निर्दिष्ट केले नाही. आपले कनेक्शन खाजगी होणार नाही."</string>
+    <string name="wifi_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>
@@ -788,12 +821,12 @@
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमती द्या"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"नकार द्या"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"कनेक्ट करण्यासाठी साइन इन करायचे?"</string>
-    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी आपण नेटवर्कशी कनेक्ट करण्यापूर्वी आपल्याला ऑनलाइन साइन करण्याची आवश्यकता आहे."</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> साठी आपण नेटवर्कशी कनेक्ट करण्यापूर्वी तुम्हाला ऑनलाइन साइन करण्याची आवश्यकता आहे."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"कनेक्ट करा"</string>
-    <string name="no_internet_access_text" msgid="7133561752896706392">"या नेटवर्कवर इंटरनेट प्रवेश नाही. कनेक्‍ट केलेले राहायचे?"</string>
+    <string name="no_internet_access_text" msgid="7133561752896706392">"या नेटवर्कवर इंटरनेट अॅक्सेस नाही. कनेक्‍ट केलेले राहायचे?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"या नेटर्वकसाठी पुन्हा विचारू नका"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"वाय-फाय इंटरनेटशी कनेक्ट केलेले नाही"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"वाय-फायचे कनेक्शन खराब असताना आपण मोबाइल नेटवर्कवर स्विच करू शकता. डेटा वापर शुल्क लागू होऊ शकतात."</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"वाय-फायचे कनेक्शन खराब असताना तुम्ही मोबाइल नेटवर्कवर स्विच करू शकता. डेटा वापर शुल्क लागू होऊ शकतात."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"मोबाइलवर स्विच करा"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"वाय‑फाय वर सुरु ठेवा"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"पुन्हा कधीही दर्शवू नका"</string>
@@ -801,7 +834,7 @@
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्कशी कनेक्‍ट करण्‍यात अयशस्वी"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"विसरा"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"नेटवर्क विसरण्यात अयशस्वी"</string>
-    <string name="wifi_save" msgid="3331121567988522826">"जतन करा"</string>
+    <string name="wifi_save" msgid="3331121567988522826">"सेव्ह करा"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"नेटवर्क जतन करण्यात अयशस्वी"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"रद्द करा"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"जतन केलेली नेटवर्क"</string>
@@ -810,7 +843,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>
@@ -819,18 +851,18 @@
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"जतन केलेली नेटवर्क"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP सेटिंग्ज"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"वाय‑फाय प्रगत सेटिंग्ज या वापरकर्त्यासाठी उपलब्ध नाहीत"</string>
-    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"जतन करा"</string>
+    <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"सेव्ह करा"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"रद्द करा"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"वैध IP पत्ता टाइप करा."</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"वैध गेटवे पत्ता टाइप करा."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"वैध DNS पत्ता टाइप करा."</string>
-    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"0 आणि 32 दरम्यान नेटवर्क प्रत्यय लांबी टाइप करा."</string>
+    <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"0 आणि 32 दरम्यान नेटवर्क उपसर्ग लांबी टाइप करा."</string>
     <string name="wifi_dns1" msgid="7344118050720080045">"DNS 1"</string>
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"नेटवर्क उपसर्ग लांबी"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"वाय-फाय थेट"</string>
-    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"डीव्हाइस माहिती"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"वाय-फाय डिरेक्ट"</string>
+    <string name="wifi_p2p_device_info" msgid="3191876744469364173">"डिव्हाइस माहिती"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"हे कनेक्शन लक्षात ठेवा"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"डिव्हाइसेस शोधा"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"शोधत आहे..."</string>
@@ -847,13 +879,21 @@
     <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>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"पोर्टेबल वाय-फाय हॉटस्पॉट त्रुटी"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"पोर्टेबल वाय-फाय हॉटस्पॉट एरर"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"वाय-फाय हॉटस्पॉट सेट करा"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"वाय-फाय हॉटस्पॉट सेटअप"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK हॉटस्पॉट"</string>
@@ -869,7 +909,7 @@
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"रोमिंग प्राधान्य"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"वाय-फाय प्राधान्यकृत"</item>
+    <item msgid="2124257075906188844">"वाय-फाय अग्रमानांकित"</item>
     <item msgid="1335127656328817518">"प्राधान्य दिलेला मोबाइल"</item>
     <item msgid="3132912693346866895">"केवळ वाय-फाय"</item>
   </string-array>
@@ -884,7 +924,7 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"वाय-फाय प्राधान्यकृत"</item>
+    <item msgid="5782108782860004851">"वाय-फाय अग्रमानांकित"</item>
     <item msgid="5074515506087318555">"प्राधान्य दिलेला मोबाइल"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -895,10 +935,11 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"वाय-फाय कॉलिंग चालू असताना, आपला फोन आपल्या प्राधान्यावर आणि कोणता सिग्नल मजबूत आहे याच्या आधारावर, वाय-फाय नेटवर्क किंवा आपल्या वाहकाच्या नेटवर्कद्वारे कॉल मार्गस्थ करू शकतो. हे वैशिष्ट्य चालू करण्यापूर्वी, फी आणि इतर तपशीलांच्या संबंधात आपल्या वाहकास विचारा."</string>
+    <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>
+    <string name="display_settings_title" msgid="1708697328627382561">"डिस्प्ले"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनी"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"संगीत प्रभाव"</string>
@@ -923,10 +964,10 @@
     <string name="volume_ring_description" msgid="5936851631698298989">"रिंगटोन आणि सूचना"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"सूचना"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"अलार्म"</string>
-    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन आणि सूचना नि:शब्द करा"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"संगीत आणि इतर मीडिया नि:शब्द करा"</string>
-    <string name="volume_notification_mute" msgid="7955193480006444159">"सूचना नि:शब्द करा"</string>
-    <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म नि:शब्द करा"</string>
+    <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन आणि सूचना म्युट"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"संगीत आणि इतर मीडिया म्युट करा"</string>
+    <string name="volume_notification_mute" msgid="7955193480006444159">"सूचना म्युट करा"</string>
+    <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म म्युट करा"</string>
     <string name="dock_settings" msgid="1820107306693002541">"डॉक"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"डॉक सेटिंग्ज"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"ऑडिओ"</string>
@@ -951,8 +992,9 @@
     <string name="search_settings" msgid="1910951467596035063">"शोध"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"शोध सेटिंग्ज आणि इतिहास व्यवस्थापित करा"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"कोणतेही परिणाम नाहीत"</string>
-    <string name="display_settings" msgid="7965901687241669598">"प्रदर्शन"</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>
@@ -980,23 +1022,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>
@@ -1016,12 +1057,18 @@
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"फोन डॉक केलेला असताना आणि/किंवा निष्क्रिय असताना काय होते हे नियंत्रित करण्यासाठी स्क्रीन सेव्हर चालू करा."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"कधी सुरू करायचे"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"वर्तमान स्क्रीन सेव्हर"</string>
-    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"आता प्रारंभ करा"</string>
+    <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"आता सुरू करा"</string>
     <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="7337555569694794132">"नेहमी चालू / बॅटरीचा वाढलेला वापर"</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="6978257596231155345">"वेळ, सूचना आयकॉन आणि इतर माहिती दाखवा. बॅटरीचा वाढलेला वापर."</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>
@@ -1054,8 +1101,8 @@
     <string name="sim_change_data_title" msgid="294357201685244532">"डेटा सिम बदलायचे?"</string>
     <string name="sim_change_data_message" msgid="5854582807996717811">"मोबाइल डेटासाठी <xliff:g id="OLD_SIM">%2$s</xliff:g> ऐवजी <xliff:g id="NEW_SIM">%1$s</xliff:g> वापरायचे?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"प्राधान्यीकृत सिम कार्ड अपडेट करायचे?"</string>
-    <string name="sim_preferred_message" msgid="8466930554330635780">"आपल्‍या मोबाइल डिव्‍हाइसमध्‍ये केवळ <xliff:g id="NEW_SIM">%1$s</xliff:g> सिम आहे. आपण मोबाइल डेटा, कॉल आणि SMS संदेशांसाठी हे सिम वापरू इच्छिता का?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"सिम पिन कोड चुकीचा आहे तुम्ही आता तुमचे डीव्हाइस अनलॉक करण्‍यासाठी तुमच्या वाहकाशी संपर्क साधावा."</string>
+    <string name="sim_preferred_message" msgid="8466930554330635780">"आपल्‍या मोबाइल डिव्‍हाइसमध्‍ये केवळ <xliff:g id="NEW_SIM">%1$s</xliff:g> सिम आहे. तुम्ही मोबाइल डेटा, कॉल आणि SMS संदेशांसाठी हे सिम वापरू इच्छिता का?"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"सिम पिन कोड चुकीचा आहे तुम्ही आता तुमचे डिव्हाइस अनलॉक करण्‍यासाठी तुमच्या वाहकाशी संपर्क साधावा."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
       <item quantity="one">चुकीचा सिम पिन कोड, तुमच्याकडे <xliff:g id="NUMBER_1">%d</xliff:g> प्रयत्न शिल्लक आहे.</item>
       <item quantity="other">चुकीचा सिम पिन कोड, तुमच्याकडे <xliff:g id="NUMBER_1">%d</xliff:g> प्रयत्न शिल्लक आहेत.</item>
@@ -1100,8 +1147,8 @@
     <string name="status_roaming" msgid="2638800467430913403">"रोमिंग"</string>
     <string name="status_operator" msgid="2274875196954742087">"नेटवर्क"</string>
     <string name="status_wifi_mac_address" msgid="2202206684020765378">"वाय-फाय MAC पत्ता"</string>
-    <string name="status_bt_address" msgid="4195174192087439720">"ब्लूटुथ पत्ता"</string>
-    <string name="status_serial_number" msgid="2257111183374628137">"अनुक्रमांक"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"ब्लूटूथ पत्ता"</string>
+    <string name="status_serial_number" msgid="2257111183374628137">"सीरीअल नंबर"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
     <string name="status_up_time" msgid="7294859476816760399">"चालू असल्याचा कालावधी"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"सक्रिय वेळ"</string>
@@ -1164,14 +1211,14 @@
     <string name="storage_menu_manage" msgid="5914482953856430780">"संचय व्यवस्थापित करा"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB संगणक कनेक्शन"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"म्हणून कनेक्ट करा"</string>
-    <string name="usb_mtp_title" msgid="3399663424394065964">"मीडिया डीव्हाइस (MTP)"</string>
+    <string name="usb_mtp_title" msgid="3399663424394065964">"मीडिया डिव्हाइस (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows वरील मीडिया फायली वापरून किंवा Mac वरील Android फाईल स्थानांतरण वापरून आपल्याला मीडिया फायली स्थानांतरण करू देते (www.android.com/filetransfer पहा)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"कॅमेरा (PTP)"</string>
     <string name="usb_ptp_summary" msgid="7406889433172511530">"आपल्याला कॅमेरा सॉफ्टवेअर वापरून फोटो स्थानांतर आणि MTP वर समर्थित नसलेल्या संगणकावर कोणत्याही फायली स्थानांतर करू देते"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
     <string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम असलेल्या अनुप्रयोगांना आपल्या संगणकावर MIDI सॉफ्टवेअरसह USB वर कार्य करू द्या."</string>
     <string name="storage_other_users" msgid="808708845102611856">"इतर वापरकर्ते"</string>
-    <string name="storage_internal_title" msgid="690771193137801021">"डीव्हाइस स्टोरेज"</string>
+    <string name="storage_internal_title" msgid="690771193137801021">"डिव्हाइस स्टोरेज"</string>
     <string name="storage_external_title" msgid="3433462910096848696">"पोर्टेबल संचयन"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="TOTAL">%2$s</xliff:g> पैकी <xliff:g id="USED">%1$s</xliff:g> वापरले"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
@@ -1186,21 +1233,21 @@
     <string name="storage_rename_title" msgid="8242663969839491485">"संचयन पुनर्नामित करा"</string>
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"हे <xliff:g id="NAME_0">^1</xliff:g> सुरक्षितपणे बाहेर काढले आहे परंतु अद्याप उपलब्‍ध आहे. \n\nहे <xliff:g id="NAME_1">^1</xliff:g> वापरण्यासाठी, आपल्‍याला प्रथम ते माउंट करणे आवश्‍यक आहे."</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"हे <xliff:g id="NAME_0">^1</xliff:g> दूषित झाले आहे. \n\n हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी, आपल्‍याला प्रथम ते सेट करणे आव्‍ाश्यक आहे."</string>
-    <string name="storage_dialog_unsupported" msgid="4503128224360482228">"हे डीव्हाइस या <xliff:g id="NAME_0">^1</xliff:g> चे सपोर्ट करत नाही. \n\nया डिव्‍हाइससह हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी आपल्‍याला प्रथम ते सेट करणे आवश्‍यक आहे."</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"फॉर्मेट झाल्यानंतर, तुम्ही हे <xliff:g id="NAME_0">^1</xliff:g> इतर डीव्हाइसमध्‍ये वापरू शकता. \n\nया <xliff:g id="NAME_1">^1</xliff:g> वरील सर्व डेटा मिटविला जाईल. बॅकअप घेण्‍याचा प्रथम विचार करा. \n\n"<b>"फोटो आणि इतर मीडियाचा बॅकअप घ्‍या"</b>\n"या डीव्हाइस वरील पर्यायी स्टोरेजवर तुमच्या मीडिया फायली हलवा किंवा USB केबल वापरून त्या कॉंप्युटरवर ट्रांसफर करा. \n\n"<b>"अ‍ॅप्सचा बॅकअप घ्‍या"</b>\n" <xliff:g id="NAME_6">^1</xliff:g> वर स्टोअर केलेली सर्व अ‍ॅप्स अनइंस्टॉल केली जातील आणि त्यांचा डेटा मिटविला जाईल. हे अ‍ॅप्स ठेवण्‍यासाठी, ते या डीव्हाइस वरील पर्यायी स्टोरेजवर हलवा."</string>
+    <string name="storage_dialog_unsupported" msgid="4503128224360482228">"हे डिव्हाइस या <xliff:g id="NAME_0">^1</xliff:g> चे सपोर्ट करत नाही. \n\nया डिव्‍हाइससह हे <xliff:g id="NAME_1">^1</xliff:g> वापरण्‍यासाठी आपल्‍याला प्रथम ते सेट करणे आवश्‍यक आहे."</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"फॉर्मेट झाल्यानंतर, तुम्ही हे <xliff:g id="NAME_0">^1</xliff:g> इतर डिव्हाइसमध्‍ये वापरू शकता. \n\nया <xliff:g id="NAME_1">^1</xliff:g> वरील सर्व डेटा मिटविला जाईल. बॅकअप घेण्‍याचा प्रथम विचार करा. \n\n"<b>"फोटो आणि इतर मीडियाचा बॅकअप घ्‍या"</b>\n"या डिव्हाइस वरील पर्यायी स्टोरेजवर तुमच्या मीडिया फायली हलवा किंवा USB केबल वापरून त्या कॉंप्युटरवर ट्रांसफर करा. \n\n"<b>"अ‍ॅप्सचा बॅकअप घ्‍या"</b>\n" <xliff:g id="NAME_6">^1</xliff:g> वर स्टोअर केलेली सर्व अ‍ॅप्स अनइंस्टॉल केली जातील आणि त्यांचा डेटा मिटविला जाईल. हे अ‍ॅप्स ठेवण्‍यासाठी, ते या डिव्हाइस वरील पर्यायी स्टोरेजवर हलवा."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"आपण <xliff:g id="NAME_0">^1</xliff:g> हे बाहेर काढता तेव्‍हा, त्यावर संचयित केलेले अ‍ॅप्स कार्य करणे थांबवतील आणि ते पुन्हा घातले जाईपर्यंत त्यावर संचयित केलेल्‍या मीडिया फायली उपलब्ध असणार नाहीत."</b>" \n\nहे <xliff:g id="NAME_1">^1</xliff:g> केवळ या डिव्‍हाइसवर कार्य करण्‍यासाठी स्वरूपित केले आहे. ते इतर कशावरही कार्य करणार नाही."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"अॅप्स, फोटो किंवा या <xliff:g id="NAME">^1</xliff:g> मध्ये असलेला डेटा वापरण्यासाठी, तो पुन्हा घाला. \n\nपर्यायीपणे, डीव्हाइस उपलब्ध नसल्यास तुम्ही हे स्टोरेज विसरणे निवडू शकता. \n\nतुम्ही विसरणे निवडल्यास, डीव्हाइस मध्ये असलेला सर्व डेटा नेहमीसाठी गमावला जाईल. \n\nतुम्ही नंतर अॅप्स पुन्हा इंस्टॉल करू शकता, परंतु या डीव्हाइस वर स्टोअर केलेला त्यांचा डेटा गमावला जाईल."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"अॅप्स, फोटो किंवा या <xliff:g id="NAME">^1</xliff:g> मध्ये असलेला डेटा वापरण्यासाठी, तो पुन्हा घाला. \n\nपर्यायीपणे, डिव्हाइस उपलब्ध नसल्यास तुम्ही हे स्टोरेज विसरणे निवडू शकता. \n\nतुम्ही विसरणे निवडल्यास, डिव्हाइस मध्ये असलेला सर्व डेटा नेहमीसाठी गमावला जाईल. \n\nतुम्ही नंतर अॅप्स पुन्हा इंस्टॉल करू शकता, परंतु या डिव्हाइस वर स्टोअर केलेला त्यांचा डेटा गमावला जाईल."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g> ला विसरला?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"या <xliff:g id="NAME">^1</xliff:g> वर संचयित केलेले सर्व अ‍ॅप्स, फोटो आणि डेटा कायमचा गमावला जाईल."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"अॅप्स"</string>
-    <string name="storage_detail_images" msgid="6950678857740634769">"प्रतिमा"</string>
+    <string name="storage_detail_images" msgid="6950678857740634769">"इमेज"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"व्हिडिओ"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ऑडिओ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"कॅश केलेला डेटा"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"इतर"</string>
-    <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टीम"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"अन्यमध्ये अ‍ॅप्सद्वारे जतन केलेल्या सामायिक केलेल्या फायली, इंटरनेट किंवा ब्लूटुथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश होतो. \n\n<xliff:g id="NAME">^1</xliff:g> ची दृश्यमान सामग्री पाहण्यासाठी, एक्सप्लोर करा टॅप करा."</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"इतर गोष्टींमध्ये अ‍ॅप्सद्वारे सेव्ह केलेल्या शेअर केलेल्या फायली, इंटरनेट किंवा ब्लूटूथ वरून डाउनलोड केलेल्या फायली, Android फायली आणि इत्यादीचा समावेश होतो. \n\n<xliff:g id="NAME">^1</xliff:g> चा दृश्यमान अाशय पाहण्यासाठी, एक्सप्लोर करा टॅप करा."</string>
     <string name="storage_detail_dialog_system" msgid="862835644848361569">"सिस्टममध्ये अशा फायली आहेत ज्यांचा वापर Android आवृत्ती <xliff:g id="VERSION">%s</xliff:g> चालवण्यासाठी केला जातो"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> कडे <xliff:g id="SIZE">^2</xliff:g> संचय वापरणारे, जतन केलेले फोटो, संगीत, अॅप्स किंवा इतर डेटा असू शकतो. \n\nतपशील पाहण्यासाठी, <xliff:g id="USER_1">^1</xliff:g> वर स्विच करा."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"आपले <xliff:g id="NAME">^1</xliff:g> सेट करा"</string>
@@ -1223,7 +1270,7 @@
     <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"हलविण्यास सुमारे <xliff:g id="TIME">^1</xliff:g> लागू शकतो. ते <xliff:g id="NAME">^3</xliff:g> वर <xliff:g id="SIZE">^2</xliff:g> रिक्त केले जाईल."</b></string>
     <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"हलवा"</string>
     <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"डेटा हलवित आहे…"</string>
-    <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"हलवण्‍यादरम्यान: \n• <xliff:g id="NAME">^1</xliff:g>काढू नका. \n• काही अ‍ॅप्स योग्यरीत्या कार्य करणार नाहीत. \n• डीव्हाइस चार्ज केलेले ठेवा."</string>
+    <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"हलवण्‍यादरम्यान: \n• <xliff:g id="NAME">^1</xliff:g>काढू नका. \n• काही अ‍ॅप्स योग्यरीत्या कार्य करणार नाहीत. \n• डिव्हाइस चार्ज केलेले ठेवा."</string>
     <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> तयार आहे"</string>
     <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"आपले <xliff:g id="NAME">^1</xliff:g> फोटो आणि इतर मीडियासह वापरण्‍यासाठी तयार आहे."</string>
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"आपले नवीन <xliff:g id="NAME">^1</xliff:g> कार्य करीत आहे. \n\nया डिव्‍हाइसवर फोटो, फायली आणि अ‍ॅप डेटा हलविण्‍यासाठी, सेटिंग्ज &gt; संचयनावर जा."</string>
@@ -1266,13 +1313,14 @@
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO मूल्य"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN हटवा"</string>
     <string name="menu_new" msgid="3014205883303921729">"नवीन APN"</string>
-    <string name="menu_save" msgid="8109345640668285399">"जतन करा"</string>
+    <string name="menu_save" msgid="8109345640668285399">"सेव्ह करा"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"टाकून द्या"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"नाव फील्ड रिक्त असू शकत नाही."</string>
     <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>
@@ -1292,16 +1340,21 @@
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"अंतर्गत स्टोरेज आणि सर्व डेटा रीसेट केला जाईल"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल,                                                                     यासह:\n\n"<li>"आपले Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"हे आपल्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"आपले Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"हे आपल्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"आपले Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"आपण खालील खात्यांवर सध्या साइन इन केले आहे:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फोटो"</li>\n<li>"अन्य वापरकर्ता डेटा"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM वरील वाहक"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"असे केल्‍याने तुमच्‍या मोबाइल सेवा प्‍लॅन रद्द होणार नाही."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"USB स्टोरेज"</b>" मिटविणे आवश्यक आहे."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"SD कार्ड"</b>" पुसण्याची आवश्यकता आहे."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB स्टोरेज मिटवा"</string>
     <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>
@@ -1315,45 +1368,34 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"व्हॉइसमेल, कॉल फॉरवर्डिंग, कॉल प्रतीक्षा, कॉलर आयडी सेट करा"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB टेदरिंग"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"पोर्टेबल हॉटस्पॉट"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटुथ टेदरिंग"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टिथरिंग"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"हॉटस्‍पॉट आणि टिथरिंग"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"हॉटस्पॉट चालू, टिथरिंग करत आहे"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ब्लूटूथ टेदरिंग"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"टेदरिंग"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"हॉटस्‍पॉट आणि टेदरिंग"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"हॉटस्पॉट चालू, टेदरिंग करत आहे"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"हॉटस्पॉट चालू"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"टिथरिंग"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"टेदरिंग"</string>
     <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="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_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="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_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_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>
     <string name="sms_application_title" msgid="4903928270533250448">"SMS अ‍ॅप"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS अॅप बदलायचा?"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> च्याऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> आपला SMS अॅप म्हणून वापरायचा?"</string>
-    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"आपला SMS अॅप म्हणून <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> च्याऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> ला तुमचा SMS अॅप म्हणून वापराय?"</string>
+    <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"तुमचा SMS अॅप म्हणून <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"नेटवर्क रेटिंग प्रदाता"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"काहीही नाही"</string>
-    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"वाय-फाय सहाय्यक बदलायचे?"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"वाय-फाय साहाय्यक बदलायचा?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"आपली नेटवर्क कनेक्शन व्यवस्थापित करण्यासाठी <xliff:g id="CURRENT_APP">%2$s</xliff:g> ऐवजी <xliff:g id="NEW_APP">%1$s</xliff:g> वापरायचा?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"आपली नेटवर्क कनेक्शन व्यवस्थापित करण्यासाठी <xliff:g id="NEW_APP">%s</xliff:g> वापरायचा?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"अज्ञात सिम ऑपरेटर"</string>
@@ -1365,7 +1407,7 @@
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च अचूकता"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"बॅटरी बचत"</string>
-    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"केवळ डीव्हाइस"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"केवळ डिव्हाइस"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"स्थान बंद"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"अॅप-दर्जा परवानग्या"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"अलीकडील स्थान विनंत्या"</string>
@@ -1376,24 +1418,24 @@
     <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>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्लूटुथ स्कॅन करणे"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"सिस्टीम अ‍ॅप्‍स आणि सेवांना कधीही ब्लूटुथ डिव्‍हाइसेस शोधण्‍याची अनुमती देउन स्थान सुधारित करा."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"सिस्टम अ‍ॅप्‍स आणि सेवांना कधीही वाय-फाय नेटवर्क शोधण्‍याची अनुमती देऊन स्थान सुधारित करा."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ब्लूटूथ स्कॅन करणे"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"सिस्टम अ‍ॅप्‍स आणि सेवांना कधीही ब्लूटूथ डिव्हाइस शोधण्‍याची अनुमती देउन स्थान सुधारित करा."</string>
     <string name="location_network_based" msgid="9134175479520582215">"वाय-फाय आणि मोबाईल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी अॅप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"वाय-फाय द्वारे निर्धारित केलेले स्थान"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS उपग्रह"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"आपले स्थान सूचित करण्यासाठी आपल्या टॅब्लेटवर अॅप्सना GPS वापरु द्या"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"आपले स्थान सूचित करण्यासाठी आपल्या फोनवर अॅप्सना GPS वापरु द्या"</string>
-    <string name="assisted_gps" msgid="4649317129586736885">"सहाय्यक GPS वापरा"</string>
-    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ला सहाय्य करण्यासाठी सर्व्हर वापरा (नेटवर्क वापर कमी करण्यासाठी अनचेक करा)"</string>
-    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ला सहाय्य करण्यासाठी सर्व्हर वापरा (GPS कार्यप्रदर्शन सुधारण्यासाठी अनचेक करा)"</string>
+    <string name="assisted_gps" msgid="4649317129586736885">"साहाय्यक GPS वापरा"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (नेटवर्क वापर कमी करण्यासाठी अनचेक करा)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ला साहाय्य करण्यासाठी सर्व्हर वापरा (GPS कामगिरी सुधारण्यासाठी अनचेक करा)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"स्थान आणि Google शोध"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Google ला शोध परिणाम आणि अन्य सेवा सुधारण्यासाठी आपले स्थान वापरू द्या"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"माझ्या स्थानामध्ये प्रवेश करा"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"माझी स्थाने अॅक्सेस करा"</string>
     <string name="location_access_summary" msgid="69031404093194341">"आपली परवानगी विचारणार्‍या अॅप्सना आपली स्थान माहिती वापरु द्या"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"स्थान स्रोत"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"टॅबलेट विषयी"</string>
@@ -1408,9 +1450,9 @@
     <string name="copyright_title" msgid="865906688917260647">"कॉपीराइट"</string>
     <string name="license_title" msgid="1990487604356037871">"परवाना"</string>
     <string name="terms_title" msgid="7697580845616764642">"अटी आणि नियम"</string>
-    <string name="webview_license_title" msgid="2813507464175738967">"सिस्टीम WebView परवाना"</string>
+    <string name="webview_license_title" msgid="2813507464175738967">"सिस्टम WebView परवाना"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वॉलपेपर"</string>
-    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"उपग्रह प्रतिमा प्रदाते:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"उपग्रह इमेज प्रदाते:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"व्यक्तिचलित"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"व्यक्तिचलित लोड करताना समस्या आली."</string>
     <string name="settings_license_activity_title" msgid="8525014571806471216">"तृतीय-पक्ष परवाने"</string>
@@ -1421,8 +1463,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>
@@ -1432,22 +1477,22 @@
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"संकेतशब्द सेट केला गेला आहे"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"पिन सेट केला आहे"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"पॅटर्न सेट केला गेला आहे"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"सुरु ठेवण्यासाठी तुमच्या डीव्हाइस पॅटर्नचा वापर करा"</string>
-    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"सुरु ठेवण्यासाठी तुमचे डीव्हाइस पिन एंटर करा"</string>
-    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"सुरु ठेवण्यासाठी तुमचे डीव्हाइस पासवर्ड एंटर करा"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"सुरु ठेवण्यासाठी तुमच्या डिव्हाइस पॅटर्नचा वापर करा"</string>
+    <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"सुरु ठेवण्यासाठी तुमचे डिव्हाइस पिन एंटर करा"</string>
+    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"सुरु ठेवण्यासाठी तुमचे डिव्हाइस पासवर्ड एंटर करा"</string>
     <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"सुरु ठेवण्यासाठी आपल्या कार्य नमुन्याचा वापर करा"</string>
     <string name="lockpassword_confirm_your_pin_generic_profile" msgid="3730141667547002246">"सुरु ठेवण्यासाठी आपला कार्य पिन प्रविष्ट करा"</string>
     <string name="lockpassword_confirm_your_password_generic_profile" msgid="4250642723467019894">"सुरु ठेवण्यासाठी आपला कार्य संकेतशब्द प्रविष्ट करा"</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"सुरू ठेवण्यासाठी तुमचा डीव्हाइस पॅटर्न वापरा. डीव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"सुरू ठेवण्यासाठी तुमचा डीव्हाइस पिन एंटर करा. डीव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"सुरू ठेवण्यासाठी तुमचे डीव्हाइस पासवर्ड एंटर करा. डीव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"सुरू ठेवण्यासाठी तुमचा कार्य पॅटर्न वापरा. डीव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"सुरू ठेवण्यासाठी तुमचा कार्य पिन एंटर करा. डीव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"सुरू ठेवण्यासाठी तुमचा कार्य पासवर्ड एंटर करा. डीव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
+    <string name="lockpassword_strong_auth_required_reason_restart_device_pattern" msgid="8548464672947477043">"सुरू ठेवण्यासाठी तुमचा डिव्हाइस पॅटर्न वापरा. डिव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
+    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"सुरू ठेवण्यासाठी तुमचा डिव्हाइस पिन एंटर करा. डिव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
+    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"सुरू ठेवण्यासाठी तुमचे डिव्हाइस पासवर्ड एंटर करा. डिव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
+    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"सुरू ठेवण्यासाठी तुमचा कार्य पॅटर्न वापरा. डिव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
+    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"सुरू ठेवण्यासाठी तुमचा कार्य पिन एंटर करा. डिव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
+    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"सुरू ठेवण्यासाठी तुमचा कार्य पासवर्ड एंटर करा. डिव्हाइस रीस्टार्ट झाल्यानंतर आवश्यक आहे."</string>
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"चुकीचा पिन"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"चुकीचा संकेतशब्द"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"चुकीचा पॅटर्न"</string>
-    <string name="lock_settings_title" msgid="4213839087748988686">"डीव्हाइस सुरक्षितता"</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"डिव्हाइस सुरक्षितता"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"अनलॉक पॅटर्न बदला"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"अनलॉक पिन बदला"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"अनलॉक पॅटर्न रेखाटा"</string>
@@ -1477,20 +1522,23 @@
     <string name="lock_settings_profile_title" msgid="2121876391814535295">"कार्य प्रोफाइल सुरक्षा"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"कार्य प्रोफाईल स्क्रीन लॉक"</string>
     <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"एक लॉक वापरा"</string>
-    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"कार्य प्रोफाईल आणि डीव्हाइस स्क्रीनसाठी एक लॉक वापरा"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"कार्य प्रोफाईल आणि डिव्हाइस स्क्रीनसाठी एक लॉक वापरा"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"एक लॉक वापरायचे?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"तुमचे डीव्हाइस कार्य प्रोफाइल स्क्रीन लॉक वापरेल. दोन्ही लॉकना कार्य धोरणे लागू होतील."</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"तुमचा कार्य प्रोफाइल लॉक तुमच्या संस्थेच्या सुरक्षा आवश्यकतांची पूर्तता करत नाही. तुम्ही तुमच्या डीव्हाइस स्क्रीन आणि तुमच्या कार्य प्रोफाईलसाठी समान लॉक वापरू शकता, परंतु कोणतीही कार्य लॉक धोरणे लागू होतील."</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"तुमचे डिव्हाइस कार्य प्रोफाइल स्क्रीन लॉक वापरेल. दोन्ही लॉकना कार्य धोरणे लागू होतील."</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"तुमचा कार्य प्रोफाइल लॉक तुमच्या संस्थेच्या सुरक्षा आवश्यकतांची पूर्तता करत नाही. तुम्ही तुमच्या डिव्हाइस स्क्रीन आणि तुमच्या कार्य प्रोफाईलसाठी समान लॉक वापरू शकता, परंतु कोणतीही कार्य लॉक धोरणे लागू होतील."</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"एक लॉक वापरा"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"एक लॉक वापरा"</string>
-    <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"डीव्हाइस स्क्रीन लॉक सारखेच"</string>
+    <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"डिव्हाइस स्क्रीन लॉक सारखेच"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"अ‍ॅप्स व्यवस्थापित करा"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्टॉल अॅप्स व्यवइंस्टॉल करा आणि काढा"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"इंस्टॉल अॅप्स व्यवस्थापित करा आणि काढा"</string>
     <string name="applications_settings" msgid="5281808652705396152">"अॅप माहिती"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"अॅप्स व्यवस्थापित करा, द्रुत लाँच शॉर्टकट सेट करा"</string>
     <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>
@@ -1524,7 +1572,7 @@
     <string name="enable_text" msgid="9217362512327828987">"सक्षम करा"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"डेटा साफ करा"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"अपडेट अनइंस्टॉल करा"</string>
-    <string name="auto_launch_enable_text" msgid="4275746249511874845">"आपण काही क्रियांसाठी डीफॉल्टनुसार हा अॅप लाँच करणे निवडले आहे."</string>
+    <string name="auto_launch_enable_text" msgid="4275746249511874845">"तुम्ही काही क्रियांसाठी डीफॉल्टनुसार हा अॅप लाँच करणे निवडले आहे."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"आपण या अॅपला विजेट तयार करण्याची आणि त्यांच्या डेटामध्ये प्रवेश करण्याची अनुमती देण्यासाठी निवडले आहे."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"कोणताही डीफॉल्ट सेट केलेला नाही."</string>
     <string name="clear_activities" msgid="7408923511535174430">"डीफॉल्ट साफ करा"</string>
@@ -1594,7 +1642,7 @@
     <string name="app_forward_locked" msgid="6331564656683790866">"अॅप कॉपी-संरक्षित आहे."</string>
     <string name="invalid_location" msgid="4354595459063675191">"स्थापना स्थान वैध नाही."</string>
     <string name="system_package" msgid="1352722848400644991">"बाह्य मीडियावर सिस्टम अपडेट इंस्टॉल केली जाऊ शकत नाहीत."</string>
-    <string name="move_error_device_admin" msgid="8673026002690505763">"डीव्हाइस प्रशासक अॅप बाह्य मीडियावर इंस्टॉल केले जाऊ शकत नाही"</string>
+    <string name="move_error_device_admin" msgid="8673026002690505763">"डिव्हाइस प्रशासक अॅप बाह्य मीडियावर इंस्टॉल केले जाऊ शकत नाही"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"सक्तीने थांबवायचे?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"आपण अॅप थांबविण्याची सक्ती केल्यास, ते गैरवर्तन करू शकते."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
@@ -1635,9 +1683,9 @@
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया आणि <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया आणि <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया आणि <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
-    <string name="running_processes_header_title" msgid="6588371727640789560">"डीव्हाइस मेमरी"</string>
+    <string name="running_processes_header_title" msgid="6588371727640789560">"डिव्हाइस मेमरी"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"अ‍ॅप RAM वापर"</string>
-    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"सिस्टीम"</string>
+    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"सिस्टम"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"अॅप्स"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"मोकळी"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"वापरलेली"</string>
@@ -1659,6 +1707,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>
@@ -1754,12 +1806,13 @@
     <string name="usage_time_label" msgid="295954901452833058">"वापर वेळ"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"प्रवेशयोग्यता"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"प्रवेशयोग्यता सेटिंग्ज"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, प्रदर्शन, परस्‍परसंवाद नियंत्रणे"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रीन रीडर, डिस्प्ले, परस्‍परसंवाद नियंत्रणे"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृष्टी सेटिंग्ज"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"तुमच्या गरजा पूर्ण करण्यासाठी तुम्ही हे डीव्हाइस कस्टमाइझ करू शकता. नंतर सेटिंग्जमध्ये ही अॅक्सेसयोग्यता वैशिष्ट्ये बदलू शकता."</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"तुमच्या गरजा पूर्ण करण्यासाठी तुम्ही हे डिव्हाइस कस्टमाइझ करू शकता. नंतर सेटिंग्जमध्ये ही अॅक्सेसयोग्यता वैशिष्ट्ये बदलू शकता."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"फॉंटचा आकार वाढवा"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"स्क्रीन वाचक"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ऑडिओ आणि स्क्रीनवरील मजकूर"</string>
-    <string name="display_category_title" msgid="685461049938269166">"प्रदर्शन"</string>
+    <string name="display_category_title" msgid="685461049938269166">"डिस्प्ले"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"संवादात्मकता नियंत्रणे"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"डाउनलोड केलेल्या सेवा"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"प्रायोगिक"</string>
@@ -1785,7 +1838,7 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रीन विस्तृतीकरण स्वयं अद्ययावत करा"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"अॅप संक्रमणांवर स्क्रीन विस्तृतीकरण अद्ययावत करा"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"पॉवर बटण कॉल समाप्त करते"</string>
-    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"मोठा माऊस पॉईंटर"</string>
+    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"मोठा माउस पॉइंटर"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"मोनो ऑडिओ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ऑडिओ प्ले करताना चॅनेल एकत्र करा"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"स्पर्श आणि धरण्याचा विलंब"</string>
@@ -1825,12 +1878,12 @@
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"मानक पर्याय"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"भाषा"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"मजकूर आकार"</string>
-    <string name="captioning_preset" msgid="8939737196538429044">"मथळा शैली"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"कॅप्शन स्टाइल"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"सानुकूल पर्याय"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"पार्श्वभूमी रंग"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"पार्श्वभूमी अपारदर्शकता"</string>
-    <string name="captioning_window_color" msgid="6902052743419717394">"मथळा विंडो रंग"</string>
-    <string name="captioning_window_opacity" msgid="5041556024849862376">"मथळा विंडो अपारदर्शकता"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"कॅप्शन विंडो रंग"</string>
+    <string name="captioning_window_opacity" msgid="5041556024849862376">"कॅप्शन विंडो अपारदर्शकता"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"मजकूर रंग"</string>
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"मजकूर अपारदर्शकता"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"किनारीचा रंग"</string>
@@ -1853,12 +1906,12 @@
     <string name="color_magenta" msgid="5059212823607815549">"किरमिजी तांबडा"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> वापरायचे?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"यासाठी <xliff:g id="SERVICE">%1$s</xliff:g> आवश्यक आहे:"</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपला प्रतिसाद सत्यापित करू शकत नाहीत."</string>
-    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"तुम्ही <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्‍यास, तुमचे डीव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
-    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"तुम्ही अॅक्सेसयोग्यता सेवा चालू केली असल्‍यामुळे, तुमचे डीव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा कूटबद्धीकरण प्रभावित होते, आपल्याला आपल्या नमुन्याची पुष्टी करण्याची आवश्यकता आहे."</string>
-    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्याने कूटबद्धीकरण डेटा प्रभावित होतो, आपल्याला आपल्या पिन ची पुष्टी करण्याची आवश्यकता आहे."</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा कूटबद्धीकरण प्रभावित होते, आपल्याला आपल्या संकेतशब्दाची पुष्टी करण्याची आवश्यकता आहे."</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"अ‍ॅप परवानगी विनंती अस्पष्‍ट करीत असल्‍याने, सेटिंग्ज आपल्या प्रतिसादाची पडताळणी करू शकत नाहीत."</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"तुम्ही <xliff:g id="SERVICE">%1$s</xliff:g> चालू केल्‍यास, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"तुम्ही अॅक्सेसयोग्यता सेवा चालू केली असल्‍यामुळे, तुमचे डिव्हाइस डेटा एंक्रिप्शन वर्धित करण्‍यासाठी तुमचे स्क्रीन लॉक वापरणार नाही."</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पॅटर्नची पुष्टी करण्याची आवश्यकता आहे."</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्याने एंक्रिप्शन डेटा प्रभावित होतो, तुम्हाला तुमच्या पिन ची पुष्टी करण्याची आवश्यकता आहे."</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> चालू करण्यामुळे डेटा एंक्रिप्शनवर परिणाम होतो, तुम्हाला तुमच्या पासवर्डची पुष्टी करण्याची आवश्यकता आहे."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"आपल्या क्रियांचे निरीक्षण करा"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"आपण अॅपसह परस्परसंवाद करत असताना सूचना प्राप्त करा."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> थांबवायचे?"</string>
@@ -1873,6 +1926,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>
@@ -1892,7 +1949,7 @@
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> मुद्रण करीत आहे"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> रद्द करीत आहे"</string>
-    <string name="print_failed_state_title_template" msgid="1436099128973357969">"प्रिंटर त्रुटी <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="print_failed_state_title_template" msgid="1436099128973357969">"प्रिंटर एरर <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"प्रिंटरने <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> अवरोधित केले"</string>
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"शोध बॉक्स दर्शविला"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"शोध बॉक्स लपविला"</string>
@@ -1913,9 +1970,9 @@
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कॅनिंग"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पूर्वी"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"पूर्ण चार्ज झाल्यापासून अॅप वापर (<xliff:g id="TIME">^1</xliff:g> पूर्वी)"</string>
-    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"पूर्ण चार्ज झाल्यापासूनचा डीव्हाइस वापर (<xliff:g id="TIME">^1</xliff:g> पूर्वी)"</string>
+    <string name="power_usage_list_summary_device" msgid="7036566616386864302">"पूर्ण चार्ज झाल्यापासूनचा डिव्हाइस वापर (<xliff:g id="TIME">^1</xliff:g> पूर्वी)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्जपासून स्क्रीन चालू असण्याच्या वेळाचे प्रमाण"</string>
-    <string name="device_usage_list_summary" msgid="5623036661468763251">"शेवटच्या पूर्ण चार्जपासून डीव्हाइस वापर"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"शेवटच्या पूर्ण चार्जपासून डिव्हाइस वापर"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग केल्यापासून बॅटरी वापर"</string>
     <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>
@@ -1930,7 +1987,7 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"मोबाईल नेटवर्क सिग्नल"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="awake" msgid="387122265874485088">"डीव्हाइस अॅक्टिव्हेट होण्याची वेळ"</string>
+    <string name="awake" msgid="387122265874485088">"डिव्हाइस अॅक्टिव्हेट होण्याची वेळ"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"वाय-फाय चालू केल्याची वेळ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"वाय-फाय चालू केल्याची वेळ"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"प्रगत बॅटरी वापर"</string>
@@ -1939,11 +1996,34 @@
     <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="4006631636646776488">"तुमचा फोन, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या फोनला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास, बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या टॅबलेटला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या डिव्हाइस ला जागे ठेवते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास, बॅटरीचे कामगिरी सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"तुमचा फोन, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या फोनला जागे करत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही<xliff:g id="APP_1">%1$s</xliff:g> बंद करू शकता.\n\nहे होत राहिल्यास तुम्हाला कदाचित अ‍ॅप अनइंस्टॉल करावे लागेल."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या टॅबलेटला जागे करत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू शकता.\n\nहे होत राहिल्यास बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइस ला जागे करत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही <xliff:g id="APP_1">%1$s</xliff:g>बंद करू शकता.\n\nहे होत राहिल्यास बॅटरीचे कामगिरी सुधारण्यासाठी तुम्हाला कदाचित अ‍ॅप अनइंंस्टॉल करावे लागेल."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"अ‍ॅप बंद करा"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"बॅकग्राउंडवर वापर बंद करायचा आणि अ‍ॅप थांबवायचे का?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइस ला जागे करत राहते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू आणि त्याचे बॅकग्राउंडमध्ये रन होत राहणे प्रतिबंधित करू शकता."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइसला जागे करत राहते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू आणि त्याचे बॅकग्राउंडमध्ये चालत राहणे प्रतिबंधित करू शकता."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP_0">%1$s</xliff:g> तुमच्या डिव्हाइस ला जागे करत राहते.\n\nही समस्या सोडवण्याच्या दृष्टीने तुम्ही <xliff:g id="APP_1">%1$s</xliff:g> थांबवू आणि ते बॅकग्राउंंडवर रन होत राहणे प्रतिबंधित करू शकता."</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="7774807745601479888">"तुमचा फोन, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुम्ही अ‍ॅप वापरत नसताना तुमची स्थानसंबंधित माहिती विचारत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही या अ‍ॅपची स्थानसंबंधित माहिती बंद करू शकता."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुम्ही अ‍ॅप वापरत नसताना तुमची स्थानसंबंधित माहिती विचारत राहते.\n\nही समस्या सोडवण्यासाठी तुम्ही या अ‍ॅपची स्थानसंबंधित माहिती बंद करू शकता."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"तुमचे डिव्हाइस , बॅटरी सामान्यपणे हाताळू शकत नाही कारण <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>
     <string name="power_wifi" msgid="1135085252964054957">"वाय-फाय"</string>
-    <string name="power_bluetooth" msgid="4373329044379008289">"ब्लूटुथ"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"ब्लूटूथ"</string>
     <string name="power_cell" msgid="3392999761958982492">"मोबाइल नेटवर्क स्टँडबाय"</string>
     <string name="power_phone" msgid="5392641106474567277">"व्हॉइस कॉल"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"टॅबलेट निष्क्रिय"</string>
@@ -1953,7 +2033,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>
@@ -1980,7 +2060,7 @@
     <string name="battery_action_app_settings" msgid="4570481408106287454">"अ‍ॅप सेटिंग्ज"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"स्क्रीन सेटिंग्ज"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"वाय-फाय सेटिंग्ज"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"ब्लूटुथ सेटिंग्ज"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"ब्लूटूथ सेटिंग्ज"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"व्हॉइस कॉलद्वारे वापरलेली बॅटरी"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"टॅबलेट निष्क्रिय असताना वापरलेली बॅटरी"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"फोन निष्क्रिय असताना वापरलेली बॅटरी"</string>
@@ -1988,13 +2068,13 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"सेल कव्हरेज नसलेल्या क्षेत्रांमध्ये पॉवर वाचविण्यासाठी विमान मोड वर स्विच करा"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"फ्‍लॅशलाइट द्वारे वापरलेली बॅटरी"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"कॅमेर्‍याद्वारे वापरलेली बॅटरी"</string>
-    <string name="battery_desc_display" msgid="5432795282958076557">"प्रदर्शन आणि बॅकलाइटद्वारे वापरलेली बॅटरी"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"डिस्प्ले आणि बॅकलाइटद्वारे वापरलेली बॅटरी"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"स्क्रीन चकाकी आणि/किंवा स्क्रीन टाइमआउट कमी करते"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"वाय-फाय द्वारे वापरलेली बॅटरी"</string>
     <string name="battery_sugg_wifi" msgid="7776093125855397043">"जेव्हा वाय-फाय वापरत नसाल किंवा ते उपलब्ध नसेल तेव्हा ते बंद करा"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ब्लूटुथ द्वारे वापरलेली बॅटरी"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"आपण ब्लूटुथ वापरत नसता तेव्हा ते बंद करा"</string>
-    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"एका भिन्न ब्लूटुथ उपकरणावर कनेक्ट करून पहा"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ब्लूटूथ द्वारे वापरलेली बॅटरी"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"तुम्ही ब्लूटूथ वापरत नसता तेव्हा ते बंद करा"</string>
+    <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"एका भिन्न ब्लूटूथ उपकरणावर कनेक्ट करून पहा"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"अॅपद्वारे वापरलेली बॅटरी"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"अॅप थांबवा किंवा अनइंस्टॉल करा"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बॅटरी बचत मोड निवडा"</string>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"मागच्या वेळेस पूर्ण चार्ज झाल्यापासूनचा ब्रेकडाउन"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"शेवटचे पूर्ण चार्ज"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"शिल्लक बॅटरी वेळ अंदाजे आहे आणि वापराच्या आधारे बदलू शकतो"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"बॅटरी वापर डेटा अंदाजे आहे आणि वापराच्या आधारे बदलू शकतो"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"सक्रिय वापरात असताना"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"पार्श्वभूमीत असताना"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"बॅटरी वापर"</string>
@@ -2096,7 +2177,7 @@
     <string name="tts_reset" msgid="2661752909256313270">"रीसेट करा"</string>
     <string name="tts_play" msgid="2628469503798633884">"प्ले करा"</string>
     <string name="gadget_title" msgid="5519037532720577836">"पॉवर नियंत्रण"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाय-फाय सेटिंग अद्ययावत करीत आहे"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाय-फाय सेटिंग अपडेट करत आहे"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटुथ सेटिंग्ज अपडेट करत आहे"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"वर"</string>
@@ -2104,7 +2185,7 @@
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"चालू करीत आहे"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद करीत आहे"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"वाय-फाय"</string>
-    <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटुथ"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटूथ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
     <string name="gadget_sync" msgid="858895763714222152">"संकालन करा"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"चकाकी <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2118,30 +2199,30 @@
     <string name="credentials_install" product="default" msgid="953914549998062317">"SD कार्ड वरून इंस्टॉल करा"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"संचयनामधील प्रमाणपत्रे इंस्टॉल करा"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD कार्डमधील प्रमाणपत्रे इंस्टॉल करा"</string>
-    <string name="credentials_reset" msgid="3239382277144980418">"क्रेडेन्शियल साफ करा"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"क्रेडेंशियल साफ करा"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"सर्व प्रमाणपत्रे काढा"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"विश्वसनीय क्रेडेन्शियल"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"विश्वसनीय क्रेडेंशियल"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वसनीय CA प्रमाणपत्रे प्रदर्शित करा"</string>
-    <string name="user_credentials" msgid="3719013347787187083">"वापरकर्ता क्रेडेन्शियल"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"संचयित केलेले क्रेडेन्शियल पहा आणि सुधारित करा"</string>
+    <string name="user_credentials" msgid="3719013347787187083">"वापरकर्ता क्रेडेंशियल"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"स्टोअर केलेले क्रेडेंशियल पहा आणि सुधारित करा"</string>
     <string name="advanced_security_title" msgid="2434776238010578865">"प्रगत"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"संचयन प्रकार"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेअर-बॅक अप घेतला"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"केवळ सॉफ्टवेअर"</string>
-    <string name="credentials_settings_not_available" msgid="7968275634486624215">"या वापरकर्त्यासाठी क्रेडेन्शियल उपलब्ध नाहीत"</string>
+    <string name="credentials_settings_not_available" msgid="7968275634486624215">"या वापरकर्त्यासाठी क्रेडेंशियल उपलब्ध नाहीत"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN आणि अॅप्ससाठी इंस्टॉल केले"</string>
     <string name="credential_for_wifi" msgid="6228425986551591864">"वाय-फाय साठी इंस्टॉल केले"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
-    <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेन्शियल संचयनासाठी संकेतशब्द टाइप करा."</string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"क्रेडेंशियल स्टोरेजसाठी पासवर्ड टाइप करा."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"वर्तमान संकेतशब्द:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"सर्व सामग्री काढायची?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"संकेतशब्दामध्ये कमीत कमी 8 वर्ण असणे आवश्यक आहे."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"पासवर्डमध्ये कमीत कमी 8 वर्ण असणे आवश्यक आहे."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"अयोग्य संकेतशब्द."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"अयोग्य पासवर्ड. क्रेडेन्शियल स्टोरेज मिटवले जाण्यापूर्वी आपल्याकडे एक आणखी संधी आहे."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"अयोग्य पासवर्ड. क्रेडेन्शियल स्टोरेज मिटवले जाण्यापूर्वी आपल्याकडे आणखी <xliff:g id="NUMBER">%1$d</xliff:g> संधी आहेत."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"क्रेडेन्शियल स्टोरेज मिटवले आहे."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"क्रेडेन्शियल स्टोरेज मिटवता आले नाही."</string>
-    <string name="credentials_enabled" msgid="7588607413349978930">"क्रेडेन्शियल स्टोरेज सक्षम केले आहे."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"क्रेडेन्शियल स्टोरेज सुरू केले आहे."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"आपण क्रेडेन्शियल स्टोरेज वापरु शकण्यापूर्वी आपल्याला एक लॉक स्क्रीन पिन ‍किंवा पासवर्ड सेट करण्याची आवश्यकता आहे."</string>
     <string name="usage_access_title" msgid="332333405495457839">"वापर प्रवेश असलेले अ‍ॅप्स"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"आणीबाणी टोन"</string>
@@ -2150,30 +2231,30 @@
     <string name="backup_section_title" msgid="7952232291452882740">"बॅकअप घ्या आणि पुनर्संचयित करा"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"वैयक्तिक डेटा"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"माझ्या डेटाचा बॅकअप घ्या"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Google सर्व्हरमध्ये अॅप डेटा, वाय-फाय संकेतशब्द आणि इतर सेटिंग्जचा बॅक अप घ्या"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Google सर्व्हरमध्ये अॅप डेटा, वाय-फाय पासवर्ड आणि इतर सेटिंग्जचा बॅक अप घ्या"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"बॅकअप खाते"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"अॅप डेटा समाविष्ट करा"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"स्वयंचलित पुनर्संचयन"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"अॅप पुनर्स्थापित करताना, बॅक अप घेतलेल्या सेटिंग्ज आणि डेटा पुनर्संचयित करा"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"अॅप पुन्हा इंस्टॉल करताना, बॅक अप घेतलेल्या सेटिंग्ज आणि डेटा रीस्टोअर करा"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"बॅक अप सेवा सक्रिय नाही"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"कोणतेही खाते सध्या बॅक अप घेतलेला डेटा संचयित करत नाहीये"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"कोणतेही खाते सध्या बॅक अप घेतलेला डेटा स्टोअर करत नाहीये"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Google सर्व्हरवरील आपल्या वाय-फाय संकेतशब्द, बुकमार्क, इतर सेटिंग्ज आणि अॅप डेटाचा बॅक अप घेणे थांबवायचे तसेच सर्व प्रतिलिपी मिटवायच्या?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"डीव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि (अॅप्सद्वारे स्टोअर केलेल्या सेटिंग्ज आणि फायली यासारख्या) अॅप डेटाचा बॅकअप घेणे थांबवायचे, तसेच दूरस्थ सर्व्हर वरील सर्व प्रती मिटवायच्या?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"आपोआप डीव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि अ‍ॅप डेटाचा (जसे की अ‍ॅप्‍स द्वारे स्टोअर केलेल्या सेटिंग्ज आणि फायली) दूरस्‍थपणे बॅकअप घ्‍या.\n\nतुम्ही स्वयंचलित बॅकअप चालू करता तेव्‍हा, डीव्हाइस आणि अ‍ॅप डेटा ठराविक कालावधीने दूरस्‍थपणे सेव्ह केला जातो. अ‍ॅप डेटा हा संपर्क, संदेश आणि फोटो यासारख्‍या संभाव्य संवेदनशील डेटासह अ‍ॅपने सेव्ह केलेला (डेव्हलपरच्या सेटिंग्जवर आधारित) कोणताही डेटा असू शकतो."</string>
-    <string name="device_admin_settings_title" msgid="4960761799560705902">"डीव्हाइस प्रशासक सेटिंग्ज"</string>
-    <string name="active_device_admin_msg" msgid="578748451637360192">"डीव्हाइस प्रशासक अॅप"</string>
-    <string name="remove_device_admin" msgid="9207368982033308173">"हे डीव्हाइस प्रशासक अॅप निष्क्रिय करा"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Google सर्व्हरवरील आपल्या वाय-फाय पासवर्ड, बुकमार्क, इतर सेटिंग्ज आणि अॅप डेटाचा बॅक अप घेणे थांबवायचे तसेच सर्व प्रती मिटवायच्या?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"डिव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि (अॅप्सद्वारे स्टोअर केलेल्या सेटिंग्ज आणि फायली यासारख्या) अॅप डेटाचा बॅकअप घेणे थांबवायचे, तसेच दूरस्थ सर्व्हर वरील सर्व प्रती मिटवायच्या?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"आपोआप डिव्हाइस डेटाचा (जसे की वाय-फाय पासवर्ड आणि कॉल इतिहास) आणि अ‍ॅप डेटाचा (जसे की अ‍ॅप्‍स द्वारे स्टोअर केलेल्या सेटिंग्ज आणि फायली) दूरस्‍थपणे बॅकअप घ्‍या.\n\nतुम्ही स्वयंचलित बॅकअप चालू करता तेव्‍हा, डिव्हाइस आणि अ‍ॅप डेटा ठराविक कालावधीने दूरस्‍थपणे सेव्ह केला जातो. अ‍ॅप डेटा हा संपर्क, संदेश आणि फोटो यासारख्‍या संभाव्य संवेदनशील डेटासह अ‍ॅपने सेव्ह केलेला (डेव्हलपरच्या सेटिंग्जवर आधारित) कोणताही डेटा असू शकतो."</string>
+    <string name="device_admin_settings_title" msgid="4960761799560705902">"डिव्हाइस प्रशासक सेटिंग्ज"</string>
+    <string name="active_device_admin_msg" msgid="578748451637360192">"डिव्हाइस प्रशासक अॅप"</string>
+    <string name="remove_device_admin" msgid="9207368982033308173">"हे डिव्हाइस प्रशासक अॅप निष्क्रिय करा"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"अॅप अनइंस्टॉल करा"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"निष्क्रिय करा आणि अनइंस्टॉल करा"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"डीव्हाइस प्रशासक अॅप्‍स"</string>
-    <string name="no_device_admins" msgid="4846602835339095768">"कोणतेही डीव्हाइस प्रशासक अॅप्स उपलब्ध नाहीत"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"डिव्हाइस प्रशासक अॅप्‍स"</string>
+    <string name="no_device_admins" msgid="4846602835339095768">"कोणतेही डिव्हाइस प्रशासक अॅप्स उपलब्ध नाहीत"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"वैयक्तिक"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"कार्य"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"कोणतेही विश्वासू एजंट उपलब्ध नाहीत"</string>
-    <string name="add_device_admin_msg" msgid="1501847129819382149">"डीव्हाइस प्रशासक अॅप अॅक्टिव्हेट करायचे?"</string>
-    <string name="add_device_admin" msgid="4192055385312215731">"हे डीव्हाइस प्रशासक अॅप अॅक्टिव्हेट करा"</string>
-    <string name="device_admin_add_title" msgid="3140663753671809044">"डीव्हाइस प्रशासक"</string>
+    <string name="add_device_admin_msg" msgid="1501847129819382149">"डिव्हाइस प्रशासक अॅप अॅक्टिव्हेट करायचे?"</string>
+    <string name="add_device_admin" msgid="4192055385312215731">"हे डिव्हाइस प्रशासक अॅप अॅक्टिव्हेट करा"</string>
+    <string name="device_admin_add_title" msgid="3140663753671809044">"डिव्हाइस प्रशासक"</string>
     <string name="device_admin_warning" msgid="7482834776510188134">"हे प्रशासक अ‍ॅप सक्रिय केल्याने ते <xliff:g id="APP_NAME">%1$s</xliff:g> अ‍ॅपला पुढील ऑपरेशन करण्याची अनुमती देईल:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"हे प्रशासक अ‍ॅप सक्रिय आहे आणि ते <xliff:g id="APP_NAME">%1$s</xliff:g> अ‍ॅपला पुढील ऑपरेशन करण्याची अनुमती देते:"</string>
     <string name="profile_owner_add_title" msgid="6249331160676175009">"प्रोफाईल व्‍यवस्‍थापक सक्रिय करायचे?"</string>
@@ -2186,9 +2267,9 @@
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"कॉल रिंगटोन आणि कंपन"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"सिस्टम"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"वाय-फाय सेटअप"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"वाय-फाय नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट करा"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"वाय-फाय नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट करीत आहे..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"वाय-फाय नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट झाले"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट करा"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट करत आहे..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> शी कनेक्ट झाले"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"एक नेटवर्क जोडा"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"कनेक्ट केले नाही"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"नेटवर्क जोडा"</string>
@@ -2199,7 +2280,7 @@
     <string name="wifi_setup_detail" msgid="2336990478140503605">"नेटवर्क तपशील"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"कनेक्ट करा"</string>
     <string name="wifi_setup_forget" msgid="2562847595567347526">"विसरा"</string>
-    <string name="wifi_setup_save" msgid="3659235094218508211">"जतन करा"</string>
+    <string name="wifi_setup_save" msgid="3659235094218508211">"सेव्ह करा"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"रद्द करा"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"नेटवर्क स्कॅन करत आहे…"</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"नेटवर्कशी कनेक्ट करण्यासाठी त्यावर टॅप करा"</string>
@@ -2210,13 +2291,13 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"कनेक्ट करीत आहे..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"पुढील चरणावर जा"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP समर्थित नाही."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"आपण सेटअप दरम्यान EAP वाय-फाय कनेक्शन कॉन्फिगर करु शकत नाही, आपण ते सेटिंग्ज &gt; वायरलेस &amp; नेटवर्क मध्ये करु शकता."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"तुम्ही सेटअप दरम्यान EAP Wi‑Fi कनेक्शन कॉंफिगर करु शकत नाही, तुम्ही ते सेटिंग्ज &gt; वायरलेस &amp; नेटवर्क मध्ये करु शकता."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्ट करण्यास काही मिनिटे लागू शकतात…"</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"सेटअप सुरू ठेवण्यासाठी "<b>"पुढील"</b>" वर टॅप करा.\n\nएका भिन्न वाय‑फाय नेटवर्कशी कनेक्ट करण्यासाठी "<b>"परत"</b>" वर टॅप करा."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"सेटअप सुरू ठेवण्यासाठी "<b>"पुढील"</b>" वर टॅप करा.\n\nएका वेगळ्या वाय‑फाय नेटवर्कशी कनेक्ट करण्यासाठी "<b>"परत"</b>" वर टॅप करा."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"संकालन सक्षम केले"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"संकालन अक्षम केले"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"आता संकालन करीत आहे"</string>
-    <string name="accessibility_sync_error" msgid="8703299118794272041">"संकालन त्रुटी."</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"सिंक एरर."</string>
     <string name="sync_failed" msgid="1696499856374109647">"संकालन अयशस्वी"</string>
     <string name="sync_active" msgid="8476943765960863040">"संकालन सक्रिय"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"संकालन करा"</string>
@@ -2233,7 +2314,7 @@
     <string name="sync_automatically" msgid="1682730255435062059">"अॅप डेटा स्वयं-संकालित करा"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"संकालन चालू आहे"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"संकालन बंद आहे"</string>
-    <string name="sync_error" msgid="5060969083117872149">"संकालन त्रुटी"</string>
+    <string name="sync_error" msgid="5060969083117872149">"सिंक एरर"</string>
     <string name="last_synced" msgid="4242919465367022234">"अंतिम संकालन केले: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"आता संकालन करीत आहे…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"बॅक अप सेटिंग्ज"</string>
@@ -2346,9 +2427,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"आपल्या टॅबलेटने आपण सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या टॅबलेटद्वारे डेटा वापर मोजला जात असल्याने आणि आपला वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"आपल्या फोनने आपण सेट केलेली मर्यादा गाठताच तो मोबाइल डेटा बंद करेल.\n\nआपल्या फोनद्वारे डेटा वापर मोजला जात असल्याने आणि आपला वाहक वापराची गणना वेगळ्या प्रकारे करू शकत असल्याने, कमी मर्यादा सेट करणे विचारात घ्या."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पार्श्वभूमीवरील डेटा प्रतिबंधित करायचा?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"आपण पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, आपण वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा कार्य करणार नाहीत."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"आपण पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, आपण वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा कार्य करणार नाहीत.\n\nहे सेटिंग या टॅबलेटवरील सर्व वापरकर्त्यांना प्रभावित करते."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"आपण पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, आपण वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा कार्य करणार नाहीत.\n\nहे सेटिंग या फोनवरील सर्व वापरकर्त्यांना प्रभावित करते."</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या टॅबलेटवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"तुम्ही पार्श्वभूमी मोबाइल डेटा प्रतिबंधित केल्यास, तुम्ही वाय-फाय शी कनेक्ट असल्याशिवाय काही अॅप्स आणि सेवा काम करणार नाहीत.\n\nहे सेटिंग या फोनवरील सर्व वापरकर्त्यांवर परिणाम करते."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"चेतावणी"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"मर्यादा"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"काढलेले अॅप्स"</string>
@@ -2368,7 +2449,7 @@
     <string name="vpn_name" msgid="4689699885361002297">"नाव"</string>
     <string name="vpn_type" msgid="5435733139514388070">"प्रकार"</string>
     <string name="vpn_server" msgid="2123096727287421913">"सर्व्हर पत्ता"</string>
-    <string name="vpn_mppe" msgid="6639001940500288972">"PPP कूटबद्धीकरण (MPPE)"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP एंक्रिप्शन (MPPE)"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP गुपीत"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec ओळखकर्ता"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec पूर्व-सामायिक की"</string>
@@ -2381,7 +2462,7 @@
     <string name="vpn_routes" msgid="3818655448226312232">"अग्रेषण मार्ग (उदा. 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"वापरकर्तानाव"</string>
     <string name="vpn_password" msgid="6756043647233596772">"संकेतशब्द"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"खाते माहिती जतन करा"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"खाते माहिती सेव्ह करा"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(वापरले नाही)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(सर्व्हर सत्यापित करू नका)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्व्हरवरुन प्राप्त झालेले)"</string>
@@ -2392,7 +2473,7 @@
     <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"प्रविष्ट केलेली माहिती नेहमी-चालू VPN ला समर्थित करत नाही"</string>
     <string name="vpn_cancel" msgid="1979937976123659332">"रद्द करा"</string>
     <string name="vpn_done" msgid="8678655203910995914">"डिसमिस करा"</string>
-    <string name="vpn_save" msgid="4233484051644764510">"जतन करा"</string>
+    <string name="vpn_save" msgid="4233484051644764510">"सेव्ह करा"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"कनेक्ट करा"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"पुनर्स्थित करा"</string>
     <string name="vpn_edit" msgid="8647191407179996943">"VPN प्रोफाईल संपादित करा"</string>
@@ -2443,13 +2524,13 @@
     <string name="one_usercrt" msgid="2150319011101639509">"एक वापरकर्ता प्रमाणपत्र"</string>
     <string name="one_cacrt" msgid="6844397037970164809">"एक CA प्रमाणपत्र"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA प्रमाणपत्रे"</string>
-    <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेन्शियल तपशील"</string>
-    <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेन्शियल काढले: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
-    <string name="user_credential_none_installed" msgid="3729607560420971841">"कोणतेही वापरकर्ता क्रेडेन्शियल इंस्टॉल केलेले नाहीत"</string>
+    <string name="user_credential_title" msgid="1954061209643070652">"क्रेडेंशियल तपशील"</string>
+    <string name="user_credential_removed" msgid="6514189495799401838">"क्रेडेंशियल काढले: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
+    <string name="user_credential_none_installed" msgid="3729607560420971841">"कोणतेही वापरकर्ता क्रेडेंशियल इंस्टॉल केलेले नाहीत"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"शब्दलेखन तपासक"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"येथे आपला वर्तमान पूर्ण बॅकअप संकेतशब्द टाइप करा"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"येथे पूर्ण बॅकअप साठी एक नवीन संकेतशब्द टाइप करा"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"येथे आपला नवीन पूर्ण बॅकअप संकेतशब्द परत टाइप करा"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"येथे आपला नवीन पूर्ण बॅकअप पासवर्ड परत टाइप करा"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"बॅकअप संकेतशब्द सेट करा"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"रद्द करा"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"अतिरिक्त सिस्टम अपडेट"</string>
@@ -2459,18 +2540,18 @@
     <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"नेटवर्कचे परीक्षण केले जाऊ शकते"</string>
     <string name="done_button" msgid="1991471253042622230">"पूर्ण झाले"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
-      <item quantity="one">विश्वासू किंवा काढा प्रमाणपत्र</item>
-      <item quantity="other">विश्वासू किंवा काढा प्रमाणपत्रे</item>
+      <item quantity="one">प्रमाणपत्रावर विश्वास ठेवा अथवा काढून टाका</item>
+      <item quantity="other">प्रमाणपत्रांवर विश्वास ठेवा अथवा काढून टाका</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डीव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केला आहे, जो त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डीव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतो.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डीव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डीव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी तुमच्या डिव्हाइस वर एक प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह तुमच्या डिव्हाइस नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाईलसाठी प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाईलसाठी प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, आपल्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाइलसाठी प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> नी आपल्या कार्य प्रोफाइलसाठी प्रमाणप‍त्र अधिकार इंस्टॉल केले आहेत, जे त्यांना ईमेल, अॅप्स आणि सुरक्षित वेबसाइटसह कार्य नेटवर्क क्रियाकलापाचे परीक्षण करण्याची अनुमती देऊ शकतात.\n\nया प्रमाणपत्रांंविषयी अधिक माहितीसाठी, तुमच्या प्रशासकाशी संपर्क साधा.</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"एक तृतीय पक्ष ईमेल, अॅप्स आणि सुरक्षित वेबसाइट यासह, आपल्या नेटवर्क क्रियाकलापाचे परीक्षण करण्यास सक्षम आहे.\n\nआपल्या डिव्हाइसवर इंस्टॉल केलेले विश्वसनीय क्रेडेन्शियल हे शक्य करत आहे."</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"एक तृतीय पक्ष ईमेल, अॅप्स आणि सुरक्षित वेबसाइट यासह, आपल्या नेटवर्क अॅक्टिव्हिटीचे परीक्षण करण्यास सक्षम आहे.\n\nआपल्या डीव्हाइसवर इंस्टॉल केलेले विश्वसनीय क्रेडेंशियल हे शक्य करते."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
       <item quantity="one">प्रमाणपत्र तपासा</item>
       <item quantity="other">प्रमाणपत्रे तपासा</item>
@@ -2495,10 +2576,10 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"वापरकर्ता"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफाईल"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"नवीन वापरकर्ता जोडायचा?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"तुम्ही अतिरिक्त वापरकर्ते तयार करून इतर लोकांबरोबर हे डीव्हाइस शेअर करू शकता. प्रत्येक वापरकर्त्यास त्यांचे स्वतःचे स्थान असते, जे ते त्यांच्या अ‍ॅप्स, वॉलपेपर आणि यासारख्‍या गोष्टींसह कस्टमाइझ करू शकतात. वापरकर्ते प्रत्येकजणास प्रभावित करणार्‍या वाय-फाय सारख्या डीव्हाइस सेटिंग्ज देखील समायोजित करू शकतात.\n\nतुम्ही एक नवीन वापरकर्ता जोडता तेव्हा, त्या व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अ‍ॅप्स अपडेट करू शकतो."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"तुम्ही अतिरिक्त वापरकर्ते तयार करून इतर लोकांबरोबर हे डिव्हाइस शेअर करू शकता. प्रत्येक वापरकर्त्यास त्यांचे स्वतःचे स्थान असते, जे ते त्यांच्या अ‍ॅप्स, वॉलपेपर आणि यासारख्‍या गोष्टींसह कस्टमाइझ करू शकतात. वापरकर्ते प्रत्येकजणास प्रभावित करणार्‍या वाय-फाय सारख्या डिव्हाइस सेटिंग्ज देखील समायोजित करू शकतात.\n\nतुम्ही एक नवीन वापरकर्ता जोडता तेव्हा, त्या व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अ‍ॅप्स अपडेट करू शकतो."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"आपण एक नवीन वापरकर्ता जोडता तेव्हा, त्या व्यक्तीस त्यांचे स्थान सेट करण्याची आवश्यकता असते.\n\nकोणताही वापरकर्ता इतर सर्व वापरकर्त्यांसाठी अॅप्स अपडेट करू शकतो."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"आता वापरकर्ता सेट करायचा?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"डीव्हाइस घेण्यासाठी आणि त्यांचे स्थान सेट करण्यासाठी व्यक्ती उपलब्ध असल्याची खात्री करा"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"डिव्हाइस घेण्यासाठी आणि त्यांचे स्थान सेट करण्यासाठी व्यक्ती उपलब्ध असल्याची खात्री करा"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"आता प्रोफाईल सेट करायचा?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"आता सेट करा"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"आत्ता नाही"</string>
@@ -2533,7 +2614,7 @@
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"फोन कॉल चालू करायचे?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"या वापरकर्त्याशी कॉल इतिहास सामायिक केला जाईल."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कॉल आणि SMS चालू करायचे?"</string>
-    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"या वापरकर्त्याशी कॉल आणि SMS इतिहास सामायिक केला जाईल."</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"या वापरकर्त्याशी कॉल आणि SMS इतिहास शेअर केला जाईल."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"आणीबाणी माहिती"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी माहिती आणि संपर्क"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"अॅप्स आणि सामग्रीला अनुमती द्या"</string>
@@ -2542,7 +2623,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ही सेटिंग या टॅब्लेटवरील सर्व वापरकर्त्यांना प्रभावित करते."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ही सेटिंग या फोनवरील सर्व वापरकर्त्यांना प्रभावित करते."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदला"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"टॅप आणि पे"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"टॅप करा आणि पे करा"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"हे कसे कार्य करते"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"दुकानांमध्‍ये आपल्‍या फोनद्वारे देयक द्या"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"देयक डीफॉल्ट"</string>
@@ -2553,7 +2634,7 @@
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"दुसरा देयक अॅप खुला असतो तेव्हा त्यास वगळून"</string>
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"टॅप आणि पे टर्मिनलवर, यासह पे करा:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"टर्मिनलवर देय द्या"</string>
-    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"देयक अॅप सेट करा. त्यानंतर संपर्करहित चिन्ह असलेल्या कोणत्याही टर्मिनलवर आपल्‍या फोनची मागील बाजू धरा."</string>
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"देयक अॅप सेट करा. त्यानंतर संपर्करहित आयकन असलेल्या कोणत्याही टर्मिनलवर आपल्‍या फोनची मागील बाजू धरा."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"समजले"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"आणखी..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"आपले प्राधान्य म्हणून सेट करायचे?"</string>
@@ -2564,7 +2645,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>
@@ -2595,8 +2676,8 @@
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"हा अ‍ॅप आपल्‍या खात्यांमध्‍ये प्रवेश करू शकतो. <xliff:g id="APP">%1$s</xliff:g> द्वारे नियंत्रित"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"वाय-फाय आणि मोबाईल"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"वाय-फाय आणि मोबाईल सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
-    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"ब्लूटुथ"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"ब्लूटुथ जोडण्या आणि सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"ब्लूटूथ"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"ब्लूटूथ जोडण्या आणि सेटिंग्जच्या सुधारणेस अनुमती द्या"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"जेव्हा हे <xliff:g id="DEVICE_NAME">%1$s</xliff:g> दुसर्‍या NFC डिव्हाइसला स्पर्श करते तेव्हा डेटा विनिमयास अनुमती द्या"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"टॅबलेट दुसर्‍या डिव्हाइसला स्पर्श करतो तेव्हा डेटा अदलाबदलीस अनुमती द्या"</string>
@@ -2640,7 +2721,7 @@
     <string name="sim_other_call_settings" msgid="8247802316114482477">"इतर कॉल सेटिंग्ज"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"अग्रमानांकित नेटवर्क ऑफलोड"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"नेटवर्क नाव प्रसारण अक्षम करा"</string>
-    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"नेटवर्क नाव प्रसारण अक्षम करा आपल्या नेटवर्क माहितीवर तृतीय पक्षांना प्रवेश मिळण्यापासून संरक्षित करते."</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"नेटवर्क नाव प्रसारण अक्षम करा प्रसारण तुमच्या नेटवर्क माहितीवर तृतीय पक्षांना प्रवेश मिळण्यापासून संरक्षित करते."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"नेटवर्क नाव प्रसारण अक्षम केल्याने लपलेल्या नेटवर्कवर स्वयंचलित कनेक्शन प्रतिबंधित होईल."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"सिम कार्ड बदलली."</string>
@@ -2654,9 +2735,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_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>
@@ -2666,7 +2750,7 @@
     <string name="search_menu" msgid="6283419262313758339">"सेटिंग्ज शोधा"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"सेटिंग्ज शोधा"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"वायफाय, वाय-फाय, नेटवर्क कनेक्शन"</string>
-    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"मजकूर संदेश, मजकूर पाठविणे, संदेश, मेसेजिंग"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"मजकूर संदेश, मजकूर पाठवणे, संदेश, मेसेजिंग"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"सेल्युलर, मोबाइल, सेल वाहक, वायरलेस, डेटा, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"वायफाय, वाय-फाय, कॉल, कॉलिंग"</string>
     <string name="keywords_home" msgid="3626170808219458848">"लाँचर"</string>
@@ -2674,17 +2758,17 @@
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"मंद स्क्रीन, टचस्क्रीन, बॅटरी"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"मंद स्क्रीन, टचस्क्रीन, बॅटरी"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"मंद स्क्रीन, रात्र, रंगछटा"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"पार्श्वभूमी, वैयक्तीकृत करा, सानुकूल प्रदर्शन"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"पार्श्वभूमी, वैयक्तीकृत करा, सानुकूल डिस्प्ले"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"मजकूर आकार"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"प्रोजेक्ट, कास्‍ट करा"</string>
-    <string name="keywords_storage" msgid="3299217909546089225">"स्थान, डिस्क, हार्ड ड्राइव्ह, डीव्हाइस वापर"</string>
+    <string name="keywords_storage" msgid="3299217909546089225">"स्थान, डिस्क, हार्ड ड्राइव्ह, डिव्हाइस वापर"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"पॉवर वापर, चार्ज"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"शब्दलेखन, शब्दकोश, शब्दलेखन-तपासक, स्वयं-दुरुस्ती"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"ओळखकर्ता, इनपुट, उच्चारण, बोलणे, भाषा, हँड्सफ्री, हँड फ्री, ओळख, चीड आणणारे, शब्द, ऑडिओ, इतिहास, ब्लूटुथ हेडसेट"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"ओळखकर्ता, इनपुट, उच्चारण, बोलणे, भाषा, हँड्सफ्री, हँड फ्री, ओळख, आक्षेपार्ह, शब्द, ऑडिओ, इतिहास, ब्लूटूथ हेडसेट"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"रेट करा, भाषा, डीफॉल्ट, बोला, बोलणे, tts, प्रवेशयोग्यता, स्क्रीन रीडर, दृष्‍टीहीन"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"घड्‍याळ, लष्करी"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"रीसेट करा, पुनर्संचयित करा, फॅक्टरी"</string>
-    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"पुसा, हटवा, पुनर्संचयित करा, साफ करा, काढा"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"पुसा, हटवा, पुनर्स्टोअर करा, साफ करा, काढा"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"प्रिंटर"</string>
     <string name="keywords_sounds" msgid="7146245090127541167">"स्पीकर बीप"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"व्यत्यय आणू नका, व्यत्यय आणा, व्यत्यय, खंडित करा"</string>
@@ -2693,11 +2777,11 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"अचूकता"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"खाते"</string>
     <string name="keywords_users" msgid="3434190133131387942">"प्रतिबंध, प्रतिबंधित करा, प्रतिबंधित"</string>
-    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"मजकूर सुधारणा, योग्य, ध्वनी, कंपन, स्वयं, भाषा, जेश्चर, सुचवा, सूचना, थीम, चीड आणणारे, शब्द, प्रकार, इमोजी, आंतरराष्ट्रीय"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"मजकूर सुधारणा, योग्य, ध्वनी, कंपन, अॉटो, भाषा, जेश्चर, सुचवा, सूचना, थीम, आक्षेपार्ह, शब्द, प्रकार, ईमोजी, आंतरराष्ट्रीय"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"रीसेट करा, प्राधान्ये, डीफॉल्‍ट"</string>
     <string name="keywords_emergency_app" msgid="3143078441279044780">"आणीबाणी, हिम, अॅप, डीफॉल्ट"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"फोन, डायलर, डीफॉल्ट"</string>
-    <string name="keywords_all_apps" msgid="7814015440655563156">"अॅप्स, डाउनलोड, अॅप्लिकेशन, सिस्टीम"</string>
+    <string name="keywords_all_apps" msgid="7814015440655563156">"अॅप्स, डाउनलोड, अॅप्लिकेशन, सिस्टम"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"अॅप्स, परवानग्या, सुरक्षितता"</string>
     <string name="keywords_default_apps" msgid="223872637509160136">"अ‍ॅप्‍स, डीफॉल्‍ट"</string>
     <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ऑप्टिमायझेशन, डोझ, अॅप स्टँडबायकडे दुर्लक्ष करा"</string>
@@ -2706,13 +2790,14 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"अनलॉक करण्यासाठी स्लाइड करा, पासवर्ड, पॅटर्न, पिन"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"कार्य आव्हान, कार्य, प्रोफाईल"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"कार्य प्रोफाईल, व्यवस्थापित केलेले प्रोफाईल, एकीकरण, एकीकरण करणे, कार्य, प्रोफाईल"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"जेश्चर"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"जेश्चर"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"देय द्या, टॅप करा, पेमेंट"</string>
     <string name="keywords_backup" msgid="470070289135403022">"बॅकअप, बॅक अप"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"जेश्चर"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"वाय-फाय NFC टॅग सेट अप"</string>
     <string name="write_tag" msgid="8571858602896222537">"लिहा"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिहिण्यासाठी एक टॅग टॅप करा..."</string>
-    <string name="status_invalid_password" msgid="2575271864572897406">"अवैध संकेतशब्द, पुन्हा प्रयत्न करा."</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"अवैध पासवर्ड, पुन्हा प्रयत्न करा."</string>
     <string name="status_write_success" msgid="5228419086308251169">"यशस्वी!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC टॅग मध्ये डेटा लिहिण्यास अक्षम. समस्या कायम राहिल्यास, भिन्न टॅग वापरुन पहा"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC टॅग लिहीण्यायोग्य नाही. कृपया भिन्न टॅग वापरा."</string>
@@ -2752,7 +2837,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> स्वयंचलित नियम चालू केले</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"व्यत्यय आणू नका प्राधान्ये"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"केवळ प्राधान्य अनुमती देते"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"केवळ प्राधान्यला अनुमती देते"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"स्वयंचलित नियम"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"व्यत्यय आणू नका नियम सेट करा"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"विशिष्ट वेळी ध्वनी आणि कंपने मर्यादित करा"</string>
@@ -2779,19 +2864,20 @@
     <string name="advanced_section_header" msgid="8833934850242546903">"प्रगत"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"कार्य सूचना"</string>
     <string name="notification_badging_title" msgid="5938709971403474078">"सूचना बिंदूंना अनुमती द्या"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"लुकलुकता प्रकाश"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"ब्लिंक लाइट"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीनवर"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सर्व सूचना सामग्री दर्शवा"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील सूचना सामग्री लपवा"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"सूचना अजिबात दर्शवू नका"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"तुमचे डीव्हाइस लॉक केले असताना, सूचना कशा दर्शविल्या जाव्यात असे तुम्ही इच्छिता?"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"तुमचे डिव्हाइस लॉक केले असताना, सूचना कशा दर्शविल्या जाव्यात असे तुम्ही इच्छिता?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"सूचना"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"सर्व कार्य सूचना सामग्री दर्शवा"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"संवेदनशील कार्य सूचना सामग्री लपवा"</string>
     <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_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>
@@ -2806,7 +2892,11 @@
     <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="default_notification_assistant" msgid="7631945224761430146">"सूचना सहाय्यक"</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>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"अॅप्स सूचनांचे वाचन करु शकत नाहीत"</string>
@@ -2816,7 +2906,7 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"इंस्टॉल केलेल्या कोणत्याही अ‍ॅप्सने सूचना प्रवेशाची विनंती केली नाही."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी सूचना प्रवेशास अनुमती द्यायची?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> आपण प्राप्त करता ती संपर्क नावे आणि मजकूर संदेश यासारख्या वैयक्तिक माहितीसह सर्व सूचना वाचण्यात सक्षम असेल. तो सूचना डिसमिस करण्यात किंवा त्यामध्ये असलेली क्रिया बटणे ट्रिगर करण्यात देखील सक्षम असेल. \n\nहे अॅपला व्यत्यय आणू नका चालू किंवा बंद करण्याची आणि सबंधित सेटिंग्ज बदलण्याची क्षमता देखील देईल."</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> तुम्ही प्राप्त करता ती संपर्क नावे आणि मजकूर संदेश यासारख्या वैयक्तिक माहितीसह सर्व सूचना वाचण्यात सक्षम असेल. तो सूचना डिसमिस करण्यात किंवा त्यामध्ये असलेली क्रिया बटणे ट्रिगर करण्यात देखील सक्षम असेल. \n\nहे अॅपला व्यत्यय आणू नका चालू किंवा बंद करण्याची आणि सबंधित सेटिंग्ज बदलण्याची क्षमता देखील देईल."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"आपण <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> साठी सूचनांमधील प्रवेश बंद केल्यास, व्यत्यय आणू नका मधील प्रवेश देखील बंद केला जाऊ शकतो."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"बंद करा"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"रद्द करा"</string>
@@ -2824,7 +2914,7 @@
     <string name="no_vr_listeners" msgid="2689382881717507390">"कोणत्याही इंस्टॉल अॅप्सनी VR मदतकर्ता सेवा म्हणून चालविण्यासाठी विनंती केली नाही."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"<xliff:g id="SERVICE">%1$s</xliff:g> साठी VR सेवा प्रवेशाची अनुमती द्यायची?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"आपण आभासी वास्तविकता मोडमध्ये अॅप्लिकेशन वापरता तेव्हा <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> चालविण्यास सक्षम असेल."</string>
-    <string name="display_vr_pref_title" msgid="8104485269504335481">"डीव्हाइस VR मध्ये असताना"</string>
+    <string name="display_vr_pref_title" msgid="8104485269504335481">"डिव्हाइस VR मध्ये असताना"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"अस्पष्टता कमी करा (शिफारस केलेले)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"फ्लिकर कमी करा"</string>
     <string name="picture_in_picture_title" msgid="5824849294270017113">"चित्रा-मध्ये-चित्र"</string>
@@ -2833,8 +2923,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>
@@ -2862,14 +2950,14 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"सूचना बिंदूला अनुमती द्या"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"सूचना बिंदू दाखवा"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"व्यत्यय आणू नका अधिशून्य करा"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"व्यत्यय आणू नका केवळ प्राधान्यावर सेट केले असते तेव्‍हा या सूचनांना व्यत्यय आणणे सुरु ठेवू द्या"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"व्यत्यय आणू नका केवळ प्राधान्यावर सेट केले असते तेव्‍हा या सूचनांना व्यत्यय आणू द्या"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"लॉक स्क्रीनवर"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरोधित"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"प्राधान्य"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"संवेदनशील"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"पूर्ण झाले"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"महत्त्व"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"लुकलुकता प्रकाश"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"ब्लिंक लाइट"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"कंपन"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"ध्वनी"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"हटवा"</string>
@@ -2918,12 +3006,13 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"केवळ तारांकित संपर्कांकडून"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"काहीही नाही"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्म"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"अलार्म नेहमी प्राधान्य दिलेले असतात आणि आवाज करतात"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"स्मरणपत्रे"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"इव्हेंट"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"सर्व कॉलकर्ता"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"निवडलेले कॉलर"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"कॉलरची पुनरावृत्ती करा"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"दुसर्‍या वेळी समान व्‍यक्ती <xliff:g id="MINUTES">%d</xliff:g> मिनिटाच्या कालावधीत कॉल करीत असल्यास, त्यास अनुमती द्या"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"नियमित कॉलर"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"एखादी व्‍यक्ती <xliff:g id="MINUTES">%d</xliff:g> मिनिटांत दुसर्‍याांदा कॉल करत असेल तर, त्यास अनुमती द्या"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"स्वयंचलितपणे चालू करा"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"कधीही नाही"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"प्रत्येक रात्री"</string>
@@ -2952,8 +3041,8 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"स्क्रीन बंद असताना"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"स्क्रीन चालू किंवा बंद असताना"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग्ज"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"या डीव्हाइस बद्दल अभिप्राय पाठवा"</string>
-    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"प्रशासक पिन प्रविष्ट करा"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"या डिव्हाइस बद्दल अभिप्राय पाठवा"</string>
+    <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"प्रशासक पिन एंटर करा"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"बंद"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"स्‍क्रीन पिन करणे"</string>
@@ -2961,32 +3050,27 @@
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"अनपिन करण्‍यापूर्वी अनलॉक नमुन्यासाठी विचारा"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करण्‍यापूर्वी पिन साठी विचारा"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करण्‍यापूर्वी संकेतशब्दासाठी विचारा"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन करताना डीव्हाइस लॉक करा"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन करताना डिव्हाइस लॉक करा"</string>
     <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>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"सुरू होण्यापूर्वी तुमचा पॅटर्न आवश्यक करून तुम्ही हे डीव्हाइस अधिक संरक्षित करू शकता. डीव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डीव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डीव्हाइस सुरू करण्यासाठी पॅटर्न हवा?"</string>
-    <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_pin" msgid="2317181134653424679">"सुरू होण्यापूर्वी तुमचा पिन आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पिन हवा?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"सुरू होण्यापूर्वी तुमचा पॅटर्न आवश्यक करून तुम्ही हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न हवा?"</string>
+    <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="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>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"पॅटर्न आवश्यक?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"संकेतशब्द आवश्यक?"</string>
     <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"या डिव्हाइसचा प्रारंभ करण्यासाठी आपण आपला पिन प्रविष्ट करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्धता असणार नाही."</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"हे डीव्हाइस सुरू करण्यासाठी तुम्ही तुमचा पॅटर्न एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"हे डिव्हाइस सुरू करण्यासाठी तुम्ही तुमचा पॅटर्न एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"या डिव्हाइसचा प्रारंभ करण्यासाठी आपण आपला संकेतशब्द प्रविष्ट करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
-    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"टीप: रीबूट केल्यानंतर, आपण आपला फोन अनलॉक करे पर्यंत हा अॅप प्रारंभ होऊ शकत नाही"</string>
+    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"टीप: रीबूट केल्यानंतर, तुम्ही आपला फोन अनलॉक करे पर्यंत हे अॅप सुरू होऊ शकत नाही"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI माहिती"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI सापेक्ष माहिती"</string>
     <string name="slot_number" msgid="3762676044904653577">"(स्लॉट<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3046,7 +3130,7 @@
     <string name="app_permissions" msgid="4148222031991883874">"अॅप परवानग्या"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> वापरणारी अॅप्स"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"सक्रिय करण्यासाठी टॅप करा"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"डीव्हाइस अॅक्टिव्हेट करण्यासाठी स्क्रीनवर कुठेही दोनदा टॅप करा"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"डिव्हाइस अॅक्टिव्हेट करण्यासाठी स्क्रीनवर कुठेही दोनदा टॅप करा"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"उघडणारे दुवे"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"समर्थित दुवे उघडू नका"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> उघडा"</string>
@@ -3064,8 +3148,8 @@
     <string name="default_for_work" msgid="9152194239366247932">"कार्यासाठी डीफॉल्ट"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"सहाय्य आणि व्हॉइस इनपुट"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"साहाय्य अ‍ॅप"</string>
-    <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ला आपला सहाय्यक बनवायचे?"</string>
-    <string name="assistant_security_warning" msgid="8498726261327239136">"आपल्‍या स्क्रीनवर दृश्‍यमान असलेली किंवा अॅप्समध्‍ये प्रवेश करण्‍यायोग्य माहितीसह, आपल्‍या सिस्टीम वरील वापरात असलेल्या अॅप्सविषयी माहिती वाचण्‍यात सहाय्यक सक्षम असेल."</string>
+    <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ला आपला साहाय्यक बनवायचे?"</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"आपल्‍या स्क्रीनवर दृश्‍यमान असलेली किंवा अॅप्समध्‍ये प्रवेश करण्‍यायोग्य माहितीसह, आपल्‍या सिस्टम वरील वापरात असलेल्या अॅप्सविषयी माहिती वाचण्‍यात साहाय्यक सक्षम असेल."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"सहमत आहे"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"सहमत नाही"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"व्हॉइस इनपुट निवडा"</string>
@@ -3073,7 +3157,7 @@
     <string name="default_browser_title_none" msgid="2124785489953628553">"कोणतेही डीफॉल्‍ट ब्राउझर नाही"</string>
     <string name="default_phone_title" msgid="282005908059637350">"फोन अॅप"</string>
     <string name="default_app" msgid="6864503001385843060">"(डीफॉल्ट)"</string>
-    <string name="system_app" msgid="9068313769550747372">"(सिस्टीम)"</string>
+    <string name="system_app" msgid="9068313769550747372">"(सिस्टम)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(सिस्टम डीफॉल्ट)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"अ‍ॅप्स संचयन"</string>
     <string name="usage_access" msgid="5479504953931038165">"वापर प्रवेश"</string>
@@ -3093,8 +3177,17 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"बॅटरी ऑप्टिमायझेशन"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"वापरासंबंधी सूचना"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"पूर्ण डीव्हाइस वापर दाखवा"</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>
@@ -3102,23 +3195,23 @@
     <string name="high_power_desc" msgid="6283926163708585760">"बॅटरी ऑप्टिमायझेशन वापरू नका. आपली बॅटरी अधिक द्रुतपणे संपवू शकते."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"अॅप नेहमी पार्श्वभूमीत चालू द्यायचे?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> नेहमी पार्श्वभूमीमध्ये चालू दिल्याने बॅटरीचे आयुर्मान कमी होऊ शकते. \n\nआपण हे नंतर सेटिंग्ज &gt; अ‍ॅप्स आणि सूचना मधून बदलू शकता."</string>
-    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> शेवटचे पूर्ण चार्ज झाल्यानंतरचा वापर"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"शेवटच्या पूर्ण चार्जनंतर <xliff:g id="PERCENTAGE">%1$s</xliff:g> वापर"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"ऊर्जा व्यवस्थापन"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"पूर्ण चार्ज झाल्यानंतर बॅटरी वापर नाही"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"अ‍ॅप सेटिंग्ज"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI ट्यूनर दर्शवा"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त परवानग्या"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> अधिक"</string>
-    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"दोष अहवाल सामायिक करायचा?"</string>
+    <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"बग रीपोर्ट शेअर करायचा?"</string>
     <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अॅप्स आणि डेटा सामायिक केले जाऊ शकतात."</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"तुमच्या IT प्रशासकाने या डीव्हाइस च्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात आणि तुमचे डीव्हाइस तात्पुरते धीमे होऊ शकते."</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"हा दोष अहवाल आपल्या IT प्रशासकासह सामायिक केला जात आहे. अधिक तपशीलांसाठी त्यांच्याशी संपर्क साधा."</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"तुमच्या IT प्रशासकाने या डिव्हाइस च्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात आणि तुमचे डिव्हाइस तात्पुरते धीमे होऊ शकते."</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"हा बग रीपोर्ट आपल्या IT प्रशासकासह शेअर केला जात आहे. अधिक तपशीलांसाठी त्यांच्याशी संपर्क साधा."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"सामायिक करा"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"नकार द्या"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"हे डीव्हाइस चार्ज करा"</string>
-    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"फक्त हे डीव्हाइस चार्ज करा"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"हे डिव्हाइस चार्ज करा"</string>
+    <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"फक्त हे डिव्हाइस चार्ज करा"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"पॉवर पुरवठा करा"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"कनेक्ट केलेले डीव्हाइस चार्ज करा. केवळ USB चार्जिंग सपोर्ट असलेल्या करणार्‍या डीव्हाइससह कार्य करते."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"कनेक्ट केलेले डिव्हाइस चार्ज करा. केवळ USB चार्जिंगला सपोर्ट असलेल्या डिव्हाइससह कार्य करते."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"फायली स्थानांतरित करा"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"दुसऱ्या डिव्हाइसवर फायली स्थानांतरित करा"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"फोटो स्थानांतरित करा (PTP)"</string>
@@ -3127,20 +3220,20 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"या डिव्हाइसचा MIDI म्हणून वापर करा"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB वापरा आणि"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"हे डीव्हाइस चार्ज करणे"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"हे डिव्हाइस चार्ज करणे"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"पॉवर पुरवठा करणे"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"फायली हस्तांतरित करणे"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"फोटो हस्तांतरित करणे (PTP)"</string>
-    <string name="usb_summary_MIDI" msgid="5687906612187885908">"डीव्हाइस MIDI म्हणून वापरणे"</string>
+    <string name="usb_summary_MIDI" msgid="5687906612187885908">"डिव्हाइस MIDI म्हणून वापरणे"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"पार्श्वभूमी तपासणे"</string>
     <string name="background_check_title" msgid="4534254315824525593">"पूर्ण पार्श्वभूमी प्रवेश"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"स्क्रीनवरील मजकूर वापरा"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी सहाय्यक अॅपला अनुमती द्या"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"स्क्रीन सामग्रींमध्ये मजकूर म्हणून प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"स्क्रीनशॉट वापरा"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी सहाय्यक अॅपला अनुमती द्या"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"स्क्रीन फ्लॅश करा"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"साहाय्य अॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकूरअॅक्सेस करते तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"सहाय्यक अॅप्स आपण पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर आपल्याला मदत करू शकतात. काही अॅप्स आपल्याला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
+    <string name="assist_footer" msgid="1982791172085896864">"साहाय्यक अॅप्स आपण पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर आपल्याला मदत करू शकतात. काही अॅप्स आपल्याला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
     <string name="average_memory_use" msgid="829566450150198512">"सरासरी मेमरी वापर"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"कमाल मेमरी वापर"</string>
     <string name="memory_usage" msgid="1781358557214390033">"मेमरी वापर"</string>
@@ -3174,7 +3267,7 @@
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"बॅटरी ऑप्टिमायझेशनकडे दुर्लक्ष करण्यासाठी <xliff:g id="APP">%s</xliff:g> ला अनुमती द्यायची?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"काहीही नाही"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"या अ‍ॅपसाठी वापर प्रवेश बंद करणे आपल्या प्रशासकाला आपल्या कार्य प्रोफाइलमधील अ‍ॅप्सच्या डेटा वापराचा मागोवा घेण्यास प्रतिबंधित करत नाही"</string>
-    <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> वर्ण वापरले"</string>
+    <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_0">%1$d</xliff:g> पैकी <xliff:g id="COUNT_1">%2$d</xliff:g> वर्ण वापरले"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"इतर अ‍ॅप्सच्या वर प्रदर्शित करा"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"अॅप्स"</string>
@@ -3183,15 +3276,15 @@
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"अ‍ॅपच्या शीर्षस्थानी प्रदर्शनाची परवानगी"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"या अ‍ॅपला आपण वापरत असलेल्या इतर अ‍ॅप्सच्या शीर्षस्थानी प्रदर्शित होण्याची अनुमती द्या. ते आपल्या त्या अ‍ॅप्सच्या वापरात हस्तक्षेप करू शकते किंवा त्यांच्या दिसण्यात किंवा वर्तणुकीत बदल करू शकते."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr आभासी वास्तविकता श्रोता स्टीरीओ मदतकर्ता सेवा"</string>
-    <string name="keywords_system_alert_window" msgid="5049498015597864850">"इतर अ‍ॅप्सच्या शीर्षस्थानी प्रणाली सूचना विंडो संवाद प्रदर्शन"</string>
+    <string name="keywords_system_alert_window" msgid="5049498015597864850">"इतर अ‍ॅप्सच्या शीर्षस्थानी प्रणाली सूचना विंडो संवाद डिस्प्ले"</string>
     <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>
+    <string name="keywords_write_settings" msgid="6415597272561105138">"सिस्टम सेटिंग्ज सुधारित करा लिहा"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"सिस्‍टीम सेटिंग्ज सुधारित करण्‍यासाठी <xliff:g id="COUNT_1">%2$d</xliff:g> पैकी <xliff:g id="COUNT_0">%1$d</xliff:g> अॅप्सनी अनुमती दिली"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"इतर अॅप्स इंस्टॉल करू शकतात"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"सिस्‍टीम सेटिंग्ज सुधारित करू शकतात"</string>
@@ -3199,7 +3292,7 @@
     <string name="write_system_settings" msgid="3482913590601096763">"सिस्टम सेटिंग्ज सुधारित करा"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"अॅप सिस्‍टीम सेटिंग्ज परवानगी सुधारित करतो"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"सिस्‍टीम सेटिंग्ज सुधारित करण्‍याची अनुमती द्या"</string>
-    <string name="write_settings_description" msgid="6868293938839954623">"ही परवानगी अॅपला सिस्टीम सेटिंग्ज सुधारित करण्‍याची अनुमती देते."</string>
+    <string name="write_settings_description" msgid="6868293938839954623">"ही परवानगी अॅपला सिस्टम सेटिंग्ज सुधारित करण्‍याची अनुमती देते."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"होय"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"नाही"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"या स्त्रोतातून अनुमती द्या"</string>
@@ -3207,9 +3300,9 @@
     <string name="camera_gesture_desc" msgid="1831390075255870960">"आपले मनगट दोनदा वळवून कॅमेरा अॅप उघडा"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कॅमेर्‍यासाठी पॉवर बटण दोनदा दाबा"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"आपली स्क्रीन अनलॉक न करता कॅमेरा द्रुतपणे उघडा"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"प्रदर्शन आकार"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"डिस्प्ले आकार"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"स्क्रीन वरील आयटम आणखी मोठे किंवा आणखी लहान करा"</string>
-    <string name="screen_zoom_keywords" msgid="9176477565403352552">"प्रदर्शन घनता, स्क्रीन झूम, मापन, मापन करीत आहे"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"डिस्प्ले घनता, स्क्रीन झूम, मापन, मापन करीत आहे"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"आपल्या स्क्रीन वरील आयटम आणखी लहान किंवा आणखी मोठे करा. आपल्या स्क्रीन वरील काही अॅप्स स्थान बदलू शकतात."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"पूर्वावलोकन"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"आणखी लहान करा"</string>
@@ -3218,7 +3311,7 @@
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"हाय पीट!"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"अरे, आज कॉफी प्यायला चलायचं?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"हो नक्की. मला जवळचे एक चांगले ठिकाण माहित आहे."</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"हो नक्की. मला जवळचे एक चांगले ठिकाण माहीत आहे."</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"छान!"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"मंगळवारी 6:00PM वाजता"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"मंगळवारी 6:01PM वाजता"</string>
@@ -3262,27 +3355,36 @@
     <string name="condition_expand_show" msgid="608202020023489939">"दर्शवा"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"लपवा"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"हॉटस्पॉट चालू आहे"</string>
-    <string name="condition_hotspot_summary" msgid="3433182779269409683">"पोर्टेबल वाय-फाय हॉटस्पॉट <xliff:g id="ID_1">%1$s</xliff:g> सक्रिय आहे, या डिव्हाइसकरिता वाय-फाय बंद केले आहे."</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"पोर्टेबल वाय-फाय हॉटस्पॉट <xliff:g id="ID_1">%1$s</xliff:g> चालू आहे, या डीव्हाइसकरिता वाय-फाय बंद केले आहे."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"विमान मोड चालू आहे"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"वाय-फाय, ब्लूटुथ आणि मोबाइल नेटवर्क बंद केले आहेत. आपण फोन कॉल करू शकत नाही किंवा इंटरनेटशी कनेक्ट करू शकत नाही."</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"वाय-फाय, ब्लूटुथ आणि मोबाइल नेटवर्क बंद केले आहेत. तुम्ही फोन कॉल करू शकत नाही किंवा इंटरनेटशी कनेक्ट करू शकत नाही."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"व्यत्यय आणू नका चालू आहे ( <xliff:g id="ID_1">%1$s</xliff:g> )"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"बॅटरी बचतकर्ता चालू आहे"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"कामगिरी कमी झाली आहे. स्थान सेवा आणि पार्श्वभूमीवरील डेटा बंद केला आहेत."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"मोबाइल डेटा बंद आहे"</string>
-    <string name="condition_cellular_summary" msgid="1818046558419658463">"इंटरनेट केवळ Wi-Fi द्वारे उपलब्ध आहे"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"इंटरनेट केवळ वाय-फाय द्वारे उपलब्ध आहे"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"डेटा बचतकर्ता चालू आहे"</string>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"पार्श्वभूमीवरील डेटा केवळ Wi-Fi द्वारे उपलब्ध आहे. Wi-Fi उपलब्ध नसते तेव्हा काही अॅप्स किंवा सेवांवर परिणाम होऊ शकतो."</string>
+    <string name="condition_bg_data_summary" msgid="656957852895282228">"पार्श्वभूमीवरील डेटा केवळ वाय-फाय द्वारे उपलब्ध आहे. वाय-फाय उपलब्ध नसते तेव्हा काही अॅप्स किंवा सेवांवर परिणाम होऊ शकतो."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"कार्य प्रोफाइल बंद आहे"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"आपल्या कार्य प्रोफाइल संबंधित अॅप्स, पार्श्वभूमी संकालन आणि इतर वैशिष्ट्ये बंद केली आहेत."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"रात्रीचा प्रकाश चालू आहे"</string>
     <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>
+    <string name="color_temperature_desc" msgid="4793729830226404052">"आणखी छान डिस्प्ले रंग वापरा"</string>
     <string name="color_temperature_toast" msgid="4974218172133854827">"रंग बदल लागू करण्यासाठी, स्क्रीन बंद करा"</string>
-    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलिफोनी मॉनिटर बदल लागू करण्‍यासाठी, डीव्हाइस रीबूट करा"</string>
+    <string name="telephony_monitor_toast" msgid="7003764250271195384">"टेलिफोनी मॉनिटर बदल लागू करण्‍यासाठी, डिव्हाइस रीबूट करा"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"स्वयंचलित सिस्टम अपडेट"</string>
     <string name="usage" msgid="2977875522080448986">"वापर"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"मोबाइल डेटा वापर"</string>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3326,9 +3427,9 @@
     <string name="home_app" msgid="4066188520886810030">"होम अॅप"</string>
     <string name="no_default_home" msgid="7184117487704520238">"डीफॉल्ट होम नाही"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"सुरक्षित प्रारंभ"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"तुमचे डीव्हाइस सुरू करण्यासाठी पॅटर्न आवश्यक आहे. बंद केले असताना, या डीव्हाइस ला कॉल, संदेश, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"तुमचे डीव्हाइस सुरू करण्यासाठी पिन आवश्यक आहे. बंद केले असताना, या डीव्हाइस ला कॉल, संदेश, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
-    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"तुमचे डीव्हाइस सुरू करण्यासाठी पासवर्ड आवश्यक आहे. बंद केले असताना, या डीव्हाइसला कॉल, संदेश, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न आवश्यक आहे. बंद केले असताना, या डिव्हाइस ला कॉल, संदेश, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"तुमचे डिव्हाइस सुरू करण्यासाठी पिन आवश्यक आहे. बंद केले असताना, या डिव्हाइस ला कॉल, संदेश, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
+    <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड आवश्यक आहे. बंद केले असताना, या डिव्हाइसला कॉल, संदेश, सूचना किंवा अलार्म प्राप्त होणार नाहीत."</string>
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"आणखी एक फिंगरप्रिंट जोडा"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"दुसर्‍या बोटाने अनलॉक करा"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"चालू / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3336,7 +3437,7 @@
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"कधीही स्वयंचलितपणे चालू करू नका"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s बॅटरी असताना स्वयंचलितपणे चालू करा"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"बॅटरी ऑप्टिमायझेशन वापरत नाही"</string>
-    <string name="lockscreen_remote_input" msgid="969871538778211843">"डीव्हाइस लॉक केले असल्यास, प्रत्युत्तरे किंवा सूचनांमध्ये इतर मजकूर टाइप करण्यास प्रतिबंधित करा"</string>
+    <string name="lockscreen_remote_input" msgid="969871538778211843">"डिव्हाइस लॉक केले असल्यास, प्रत्युत्तरे किंवा सूचनांमध्ये इतर मजकूर टाइप करण्यास प्रतिबंधित करा"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"डीफॉल्ट शब्दलेखन तपासक"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"शब्दलेखन तपासक निवडा"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"न निवडलेले"</string>
@@ -3355,12 +3456,12 @@
     <string name="notification_log_details_content_intent" msgid="1113554570409128083">"हेतू"</string>
     <string name="notification_log_details_delete_intent" msgid="905118520685297007">"हेतू हटवा"</string>
     <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"पूर्ण स्क्रीन हेतू"</string>
-    <string name="notification_log_details_actions" msgid="242523930165118066">"कारवाई"</string>
+    <string name="notification_log_details_actions" msgid="242523930165118066">"कृती:"</string>
     <string name="notification_log_details_title" msgid="7177091647508863295">"शीर्षक"</string>
     <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"दूरस्थ इनपुट"</string>
     <string name="notification_log_details_content_view" msgid="6638731378278561786">"सानुकूल दृश्य"</string>
     <string name="notification_log_details_extras" msgid="4188418723779942047">"अतिरिक्त"</string>
-    <string name="notification_log_details_icon" msgid="8939114059726188218">"चिन्ह"</string>
+    <string name="notification_log_details_icon" msgid="8939114059726188218">"आयकन"</string>
     <string name="notification_log_details_parcel" msgid="243148037601903212">"पार्सल आकार"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"अश्मेम"</string>
     <string name="notification_log_details_sound" msgid="5506232879598808099">"ध्वनी"</string>
@@ -3381,23 +3482,22 @@
     <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>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"प्रीमियम SMS मुळे तुम्हाला कदाचित शुल्क द्यावे लागू शकेल आणि आपल्या कॅरियर बिलिंग मध्ये जोडले जाईल. तुम्ही अॅपसाठी परवानगी सक्षम केल्यास, तो अॅप वापरून तुम्ही प्रीमियम SMS पाठविण्यात सक्षम असाल."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"प्रीमियम SMS प्रवेश"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"इतर डिव्हाइसेसना दृश्यमान नाही"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>शी कनेक्ट केले"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"एकाधिक डिव्हाइसशी कनेक्ट केले"</string>
-    <string name="demo_mode" msgid="2798762752209330277">"सिस्टीम UI डेमो मोड"</string>
+    <string name="demo_mode" msgid="2798762752209330277">"सिस्टम UI डेमो मोड"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"द्रुत सेटिंग्ज विकासक टाइल"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"मदत करण्यासाठी आम्ही येथे आहोत"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"आम्ही आपल्यासाठी 24/7 येथे आहोत"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"आम्ही आपल्यासाठी 24/7 येथे आहोत"</string>
     <string name="support_escalation_summary" msgid="8473084168776014405">"कोणत्याही समस्येचे निराकरण करण्यात मदत करण्यासाठी आमचा सहाय्य कार्यसंघ येथे आहे"</string>
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"आमचा सहाय्य कार्यसंघ दररोज, दिवसभर येथे आहे"</string>
-    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदत शोधा किंवा सहाय्य तासांदरम्यान (स्थानिक वेळ) परत या:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
+    <string name="support_escalation_closed_summary" msgid="2240967274380168303">"मदत शोधा किंवा साहाय्य तासांदरम्यान (स्थानिक वेळ) परत या:&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"फोन सहाय्य तास (स्थानिक वेळ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"मदत शोधा किंवा टिपा आणि युक्त्या एक्सप्लोर करा"</string>
     <string name="support_country_list_title" msgid="823853371280534111">"यासाठी समर्थन:"</string>
@@ -3412,11 +3512,11 @@
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"सहाय्याशी संपर्क साधा"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"साइन इन करा"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"साइन इन करू शकत नाही?"</string>
-    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टीम माहिती पाठवा"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"परत दर्शवू नका"</string>
+    <string name="support_disclaimer_title" msgid="4825302018208770031">"सिस्टम माहिती पाठवा"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"परत दाखवू नका"</string>
     <string name="support_account_request_prefix" msgid="6387847874661861650">"हे विनंती करत आहेत"</string>
     <string name="support_account_picker_add_account" msgid="5076277544846506214">"खाते जोडा"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टिम माहिती"</string>
+    <string name="support_system_information_title" msgid="3439905790018934773">"सिस्टम माहिती"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइल सेटिंग्ज"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क शोध"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉलर आणि संपर्कांना ओळखण्यासाठी आपल्या संस्थेनुसार संपर्क शोधांची अनुमती द्या"</string>
@@ -3436,12 +3536,12 @@
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"संगणक"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"हेडसेट"</string>
     <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"फोन"</string>
-    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"प्रतिमा"</string>
+    <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"इमेज"</string>
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"हेडफोन"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"इनपुट परिधीय"</string>
-    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ब्लूटुथ"</string>
+    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ब्लूटूथ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"संचय व्यवस्थापित करा"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"स्टोरेज स्थान मोकळे करण्यात मदत करण्यासाठी, स्टोरेज व्यवस्थापक तुमच्या डीव्हाइस वरून बॅक अप घेतलेले फोटो आणि व्हिडिओ काढतो."</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"स्टोरेज स्थान मोकळे करण्यात मदत करण्यासाठी, स्टोरेज व्यवस्थापक तुमच्या डिव्हाइस वरून बॅक अप घेतलेले फोटो आणि व्हिडिओ काढतो."</string>
     <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"फोटो आणि व्हिडिओ काढा"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"संचय व्यवस्थापक"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"स्वयंचलित"</string>
@@ -3450,28 +3550,35 @@
     <string name="gesture_preference_title" msgid="5280023307132819052">"जेश्चर"</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="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_title" product="device" msgid="3423781975742145894">"डिव्हाइस तपासण्‍यासाठी दोनदा टॅप करा"</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_title" product="device" msgid="5380534405773531175">"डिव्हाइस तपासण्‍यासाठी ते उचला"</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="assist_gesture_title" msgid="7746563137898655539">"सहाय्यता जेश्चर"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"संवेदनशीलता"</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="gesture_setting_on" msgid="3455094265233870280">"चालू"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"बंद"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"बुटलोडर आधीपासून अनलॉक केले"</string>
@@ -3492,7 +3599,10 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"कार्य डेटा स्वयंचलितपणे संकालित करा"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"अ‍ॅप्सना डेटा स्वयंचलितपणे रीफ्रेश करू द्या"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"खाते संकालन"</string>
-    <string name="enterprise_privacy_settings" msgid="1177106810374146496">"व्यवस्थापित डीव्हाइस माहिती"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> पैकी <xliff:g id="ID_1">%1$d</xliff:g> आयटमसाठी सिंक करणे चालू आहे"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"सर्व आयटमसाठी सिंक करणे चालू करा"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"सर्व आयटमसाठी सिंक करणे बंद करा"</string>
+    <string name="enterprise_privacy_settings" msgid="1177106810374146496">"व्यवस्थापित डिव्हाइस माहिती"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"आपल्‍या संस्‍थेद्वारे व्‍यवस्‍थापित बदल आणि सेटिंग्‍ज"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे व्‍यवस्‍थापित बदल आणि सेटिंग्‍ज"</string>
     <string name="enterprise_privacy_header" msgid="7402406406883832509">"आपल्या कार्य डेटामध्ये प्रवेश प्रदान करण्यासाठी, आपली संस्था सेटिंग्जमध्ये बदल करून आपल्या डिव्हाइसवर सॉफ्टवेअर इंस्टॉल करू शकते.\n\nअधिक तपशीलांसाठी, आपल्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
@@ -3503,7 +3613,7 @@
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"आपल्या डिव्हाइसवरील अ‍ॅप्सची सूची"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"प्रत्येक अ‍ॅपमध्ये वापरलेला वेळ आणि डेटा यांचे प्रमाण"</string>
     <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"सर्वात अलीकडील नेटवर्क रहदारी लॉग"</string>
-    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सर्वात अलीकडील दोष अहवाल"</string>
+    <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सर्वात अलीकडील बग रीपोर्ट"</string>
     <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"सर्वात अलीकडील सुरक्षा लॉग"</string>
     <string name="enterprise_privacy_none" msgid="7706621148858381189">"काहीही नाही"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"इंस्टॉल केलेले अॅप्स"</string>
@@ -3526,21 +3636,21 @@
     <string name="enterprise_privacy_always_on_vpn_personal" msgid="9217774730260037434">"आपल्‍या वैयक्तिक प्रोफाइलमध्‍ये नेहमी VPN चालू असणे सक्रिय आहे"</string>
     <string name="enterprise_privacy_always_on_vpn_work" msgid="7244472958208315814">"आपल्‍या कार्य प्रोफाइलमध्‍ये नेहमी VPN चालू असणे सक्रिय आहे"</string>
     <string name="enterprise_privacy_global_http_proxy" msgid="7936664553416257333">"जागतिक HTTP प्रॉक्‍सी सेट आहे"</string>
-    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"विश्वासू क्रेडेन्शियल"</string>
+    <string name="enterprise_privacy_ca_certs" msgid="5885892204903688909">"विश्वासू क्रेडेंशियल"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="526375234629534165">
       <item quantity="one">किमान <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्र</item>
       <item quantity="other">किमान <xliff:g id="COUNT_1">%d</xliff:g> CA प्रमाणपत्रे</item>
     </plurals>
-    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"प्रशासक डीव्हाइस लॉक करू शकतो आणि पासवर्ड रीसेट करू शकतो"</string>
+    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"प्रशासक डिव्हाइस लॉक करू शकतो आणि पासवर्ड रीसेट करू शकतो"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"प्रशासक डिव्हाइसवरील सर्व डेटा हटवू शकतो"</string>
-    <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"सर्व डीव्हाइस डेटा हटवण्यापूर्वी अयशस्वी झालेले पासवर्ड प्रयत्न"</string>
+    <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"सर्व डिव्हाइस डेटा हटवण्यापूर्वी अयशस्वी झालेले पासवर्ड प्रयत्न"</string>
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"सर्व कार्य प्रोफाइल डेटा हटवण्यापूर्वी अयशस्वी झालेले संकेतशब्द प्रयत्न"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
       <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="do_disclosure_generic" msgid="8653670456990823307">"हे डीव्हाइस तुमच्या संस्थेने व्यवस्थापित केले आहे."</string>
-    <string name="do_disclosure_with_name" msgid="1141081465968481380">"हे डीव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे व्यवस्थापित आहे."</string>
+    <string name="do_disclosure_generic" msgid="8653670456990823307">"हे डिव्हाइस तुमच्या संस्थेने व्यवस्थापित केले आहे."</string>
+    <string name="do_disclosure_with_name" msgid="1141081465968481380">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे व्यवस्थापित आहे."</string>
     <string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
     <string name="do_disclosure_learn_more" msgid="2416766240581561009">"अधिक जाणून घ्या"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="1134677050353971363">
@@ -3572,12 +3682,13 @@
     <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>
     <string name="autofill_keywords" msgid="7485591824120812710">"स्वयं, भरा, स्वयंभरण"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;आपला या अॅपवर विश्वास असल्याचे सुनिश्चित करा&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी आपल्या स्क्रीनवर काय आहे याचा वापर करते."</string>
-    <string name="device_theme" msgid="4571803018917608588">"डीव्हाइस थीम"</string>
+    <string name="device_theme" msgid="4571803018917608588">"डिव्हाइस थीम"</string>
     <string name="default_theme" msgid="7085644992078579076">"डीफॉल्ट"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"संचय व्यवस्थापक: <xliff:g id="STATUS">^1</xliff:g>"</string>
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"बंद"</string>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"नवीन आणि रोमांचक असे काय आहे?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"टॉप 5 वैशिष्ट्ये पहा"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS नोंदणी स्थिती"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"नोंदवलेले"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"नोंदवलेले नाही"</string>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 45beac6bcc0b652766a98c3df423a1ef7c233405..cca58e65f7e9d898c840da42c18e90b141b7262b 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 8b1b2dd21e795965e31cbbcab0f5e0b7bf1238e5..21083cf4a4ddac10cf04e4f1ac65ee05f1724fd8 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Lakukan kemudian"</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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Hidupkan Wi-Fi secara automatik"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi akan dihidupkan kembali berdekatan dengan rangkaian disimpan yang berkualiti tinggi, seperti rangkaian rumah"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Tidak tersedia kerana pengimbasan Wi-Fi dimatikan"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Untuk menggunakan ciri, pilih pembekal penilaian rangkaian"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Elakkan sambungan lemah"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Jangan gunakan rangkaian Wi-Fi melainkan jika rangkaian itu mempunyai sambungan internet yang baik"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Guna rangkaian dengan sambungan Internet yang stabil sahaja"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Sambung ke rangkaian terbuka"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Sambung ke rangkaian awam berkualiti tinggi secara automatik"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Untuk menggunakan ciri, pilih pembekal penilaian rangkaian"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Untuk menggunakan ciri, pilih pembekal penilaian rangkaian yang serasi"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Pasang sijil"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Untuk meningkatkan ketepatan lokasi, apl sistem dan perkhidmatan masih dapat mengimbas rangkaian Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Untuk meningkatkan ketepatan lokasi, hidupkan pengimbasan Wi-Fi dalam <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tetapan pengimbasan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Sentiasa hidup/Penggunaan bateri bertambah"</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="6978257596231155345">"Tunjukkan masa, ikon pemberitahuan dan maklumat lain. Penggunaan bateri bertambah."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Terdapat pengguna lain pada peranti ini.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Pembawa pada eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ini tidak akan membatalkan pelan perkhidmatan mudah alih anda."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Padamkan storan USB"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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">"Buat corak utk guna cap 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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Pembaca skrin, paparan, kawalan interaksi"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Tetapan Penglihatan"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Anda boleh menyesuaikan peranti ini mengikut keperluan anda. Ciri kebolehaksesan ini boleh diubah kemudian dalam Tetapan."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Besarkan saiz fon"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Pembaca skrin"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio &amp; teks pada skrin"</string>
     <string name="display_category_title" msgid="685461049938269166">"Paparan"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Telefon anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> membuatkan telefon sentiasa berjaga.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan 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="2369957934555162428">"Tablet anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> membuatkan tablet sentiasa berjaga.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan 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="6195430620406365292">"Peranti anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> membuatkan peranti sentiasa berjaga.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan apl itu.\n\nJika perkara ini kerap berlaku, anda mungkin perlu menyahpasang apl tersebut untuk meningkatkan prestasi bateri."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefon anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP_0">%1$s</xliff:g> membuatkan telefon sentiasa berjaga.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan <xliff:g id="APP_1">%1$s</xliff:g>.\n\nJika perkara ini kerap berlaku, anda mungkin perlu menyahpasang apl tersebut untuk meningkatkan prestasi bateri."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tablet anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP_0">%1$s</xliff:g> membuatkan tablet sentiasa berjaga.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan <xliff:g id="APP_1">%1$s</xliff:g>.\n\nJika perkara ini kerap berlaku, anda mungkin perlu menyahpasang apl tersebut untuk meningkatkan prestasi bateri."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Peranti anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP_0">%1$s</xliff:g> membuatkan peranti sentiasa berjaga.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Matikan penggunaan latar belakang &amp; hentikan apl?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefon anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP_0">%1$s</xliff:g> asyik membangkitkan telefon.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan <xliff:g id="APP_1">%1$s</xliff:g> dan menghalang apl itu daripada berjalan di latar belakang."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tablet anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP_0">%1$s</xliff:g> asyik membangkitkan tablet.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan <xliff:g id="APP_1">%1$s</xliff:g> dan menghalang apl itu daripada berjalan di latar belakang."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Peranti anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP_0">%1$s</xliff:g> asyik membangkitkan peranti.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan <xliff:g id="APP_1">%1$s</xliff:g> dan menghalang apl itu 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pecahan sejak cas penuh terakhir"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Cas penuh terakhir"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Baki masa bateri adalah anggaran dan boleh berubah berdasarkan penggunaan"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Data penggunaan bateri adalah anggaran dan boleh berubah berdasarkan penggunaan"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Semasa dalam penggunaan aktif"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Semasa di latar belakang"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Penggunaan bateri"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"luncur untuk membuka kunci, kata laluan, corak, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"cabaran kerja, kerja, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil kerja, profil terurus, menyatukan, penyatuan, kerja, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gerak isyarat"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"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_assist_gesture_launch" msgid="813968759791342591">"gerak isyarat"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Daripada kenalan dibintangkan sahaja"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Tiada"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Penggera"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Penggera sentiasa dianggap keutamaan dan berbunyi"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Peringatan"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Acara"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Semua pemanggil"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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_pickup_title" product="default" msgid="818688002837687268">"Angkat untuk menyemak telefon"</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 utk 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Hidup"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Mati"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Pemuat but sudah dibuka"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Segerakkan data kerja secara automatik"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Benarkan apl memuatkan semula data secara automatik"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Penyegerakan akaun"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Penyegerakan dihidupkan untuk <xliff:g id="ID_1">%1$d</xliff:g> daripada <xliff:g id="ID_2">%2$d</xliff:g> item"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Penyegerakan dihidupkan untuk semua item"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Penyegerakan dimatikan untuk semua item"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Maklumat peranti terurus"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Perubahan &amp; tetapan diurus oleh organisasi anda"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Perubahan &amp; tetapan diurus oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Apakah yang baharu dan menarik?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Lihatlah 5 ciri teratas"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Keadaan pendaftaran IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Berdaftar"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Tidak didaftarkan"</string>
 </resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 6afd1392ec5ac3e8ad13872c54d33e72f11357b9..c5d6f5000354c26c625803a6b3a8894d2c0bca68 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>
@@ -423,7 +413,7 @@
     <item msgid="758587126802411846">"အဖြူပေါ်အမည်း"</item>
     <item msgid="1495307195241623402">"အမည်းပေါ်အဝါ"</item>
     <item msgid="6039700130994371612">"အပြာပေါ်အဝါ"</item>
-    <item msgid="7169235156349580064">"မိမိစိတ်ကြိုက်"</item>
+    <item msgid="7169235156349580064">"စိတ်ကြိုက်"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP VPN"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 9f97482cdbac9ed6e9ebdeaa5596940992b0e94d..e43115d9d9188afa603163bc98b92283c5a8f15e 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) -->
@@ -238,7 +250,7 @@
     <string name="skip_label" msgid="47510779345218297">"ကျော်ရန်"</string>
     <string name="next_label" msgid="4693520878012668114">"ရှေ့သို့"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"ဘာသာစကားများ"</string>
-    <string name="pref_title_lang_selection" msgid="2014920136978776034">"ဘာသာစကားဆိုင်ရာ မိမိစိတ်ကြိုက်ဆက်တင်များ"</string>
+    <string name="pref_title_lang_selection" msgid="2014920136978776034">"စိတ်ကြိုက်ဘာသာစကား"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"ဖယ်ရှားပါ"</string>
     <string name="add_a_language" msgid="2330538812283783022">"ဘာသာစကားတစ်ခု ပေါင်းထည့်ပါ"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -285,10 +297,10 @@
     <string name="roaming_disable" msgid="1295279574370898378">"ရုန်းမင်းပြုလုပ်နေစဉ် ဒေတာဝန်ဆောင်မှုများကို ဆက်သွယ်ခြင်း"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"ဒေတာဆက်သွယ်မှုပြတ်တောက်သွားပါသည် အဘယ်ကြောင့်ဆိုသော် သင့်အိမ်၏ကွန်ယက်မှထွက်ကာ ဒေတာရုန်းမင်းကွန်ယက်ကိုလဲပိတ်ထားသောကြောင့်ဖြစ်သည်"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"ဖွင့်မည်"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"သိသာသည့် ငွေကြေးကုန်ကျမှုများ ရှိနိုင်ပါသည်။"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"ငွေကြေး အတော်အတန်ကုန်ကျနိုင်ပါသည်။"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်းကို သင် ခွင့်ပြုလျှင် သိသာကြီးမာသောသုံးစွဲခ ကျခံရလိမ့်မည် !\n\n ဤအစီအမံသည် ဤတက်ဘလက်မှ သူံးစွဲသူအားလုံးကို အကျိုးသက်ရောက်လိမ့်မည်။"</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"ကွန်ယက်ပြင်ပဒေတာအသုံးပြုခြင်းကို သင် ခွင့်ပြုလျှင် သိသာကြီးမာသောသုံးစွဲခ ကျခံရလိမ့်မည် !\n\n ဤအစီအမံသည် ဤဖုန်းမှ သူံးစွဲသူအားလုံးကို အကျိုးသက်ရောက်လိမ့်မည်။"</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"ကွန်ရက်ပြင်ပဒေတာအသုံးပြုခြင်း ခွင့်​ပြုမည်လား?"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"ကွန်ရက်ပြင်ပဒေတာ သုံးခွင့်​ပြုမလား။"</string>
     <string name="networks" msgid="6333316876545927039">"ဖုန်းလိုင်းကုမ္ပဏီရွေးချယ်မှု"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"ကွန်ယက်ဝန်ဆောင်မှုကို ရွေးချယ်ပါ"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"ရက်စွဲနှင့် အချိန်"</string>
@@ -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>
@@ -347,50 +359,49 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"လက်ဗွေထည့်သွင်းမည်"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ဖုန်းမျက်နှာပြင်အား သော့ချရန်"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> လက်ဗွေရာများ ပြင်ဆင်သတ်မှတ်ရန်</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> လက်ဗွေရာ ပြင်ဆင်သတ်မှတ်ရန်</item>
+      <item quantity="other">လက်ဗွေရာ <xliff:g id="COUNT_1">%1$d</xliff:g> ခု ပြင်ဆင်သတ်မှတ်ရန်</item>
+      <item quantity="one">လက်ဗွေရာ <xliff:g id="COUNT_0">%1$d</xliff:g> ခု ပြင်ဆင်သတ်မှတ်ရန်</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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_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_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="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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"နောက်မှလုပ်ရန်"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"လက်ဗွေရာ သတ်မှတ်မှုကို ကျော်မလား"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"သင့်လက်ဗွေဖြင့် သင့်ဖုန်းကို သော့ဖွင့်ရန် နည်းလမ်းတစ်ခုအဖြစ် ရွေးချယ်ခဲ့သည်။ အကယ်၍ယခုကျော်သွားလျှင်၊ ၎င်းကိုနောက်နှောင်တွင် သတ်မှတ်ရပါလိမ့်မည်။ သတ်မှတ်ခြင်းသည် မိနစ်အနည်းငယ်သာ ကြာပါသည်။"</string>
     <string name="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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"လက်ဗွေထည့်သွင်းမှု အဆင်မပြေပါ။ အခြားလက်ချောင်းကို သုံးပါ သို့မဟုတ် ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"နောက်တစ်ခု ထည့်ရန်"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ရှေ့သို့"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"သင့်ဖုန်းကို သော့ဖွင့်ရန်အပြင်၊ သင်သည်သင့်လက်ဗွေကို ဝယ်ယူမှုများနှင့် အပ်ဖ်အသုံးပြုခွင့်ကို ခွင့်ပြုရန် အသုံးပြုနိုင်သည်။ "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation></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="1688030823464420974">"မှားယွင်းသည့် ပုံစံကို နောက်တစ်ကြိမ်ထည့်သွင်းပါက ဤစက်ပစ္စည်းပေါ်ရှိ ဒေတာများကို ဖျက်လိုက်ပါမည်"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"မှားယွင်းသည့် ပင်နံပါတ်ကို နောက်တစ်ကြိမ်ထည့်သွင်းပါက ဤစက်ပစ္စည်းပေါ်ရှိ ဒေတာများကို ဖျက်လိုက်ပါမည်"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"မှားယွင်းသည့် စကားဝှက်ကို နောက်တစ်ကြိမ်ထည့်သွင်းပါက ဤစက်ပစ္စည်းပေါ်ရှိ ဒေတာများကို ဖျက်လိုက်ပါမည်"</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="5047439819181833824">"မှားယွင်းသည့် အခေါက်ရေ အလွန်များနေပါပြီ။ ဤစက်ပစ္စည်း၏ ဒေတာများကို ဖျက်လိုက်ပါမည်။"</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>
@@ -624,8 +645,16 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"ရွေးချယ်စရာများ"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"အဆင့်မြင့်"</string>
     <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_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>
@@ -686,18 +715,21 @@
     <string name="wifi_error" msgid="3207971103917128179">"အမှား"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz ဘန်းဤနိုင်ငံတွင်မရပါ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"လေယာဉ်ပျံပေါ်သုံးစနစ်"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"ပွင့်လင်းကွန်ရက် အကြောင်းကြားချက်"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"အများသုံးကွန်ရက် အကြောင်းကြားချက်"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"အရည်အသွေးမြင့် အများသုံးကွန်ရက်ရှိလျှင် အကြောင်းကြားပေးရန်"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi-Fi ကို အလိုအလျောက် ဖွင့်ရန်"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"သင်၏နေအိမ်ကွန်ရက်ကဲ့သို့သော သိမ်းဆည်းထားသည့် အရည်အသွေးမြင့် ကွန်ရက်များအနီးသို့ ရောက်သည့်အခါ Wi-Fi ကို ဖွင့်လိုက်ပါမည်"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi စကင်ဖတ်ခြင်းကို ပိတ်ထားသောကြောင့် မရနိုင်ပါ"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"အသုံးပြုရန် ကွန်ရက်အဆင့် သတ်မှတ်ပေးသူကို ရွေးချယ်ပါ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"အားနည်းသော ချိတ်ဆက်မှုများကို ရှောင်ကြဉ်ရန်"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ကောင်းမွန်သော အင်တာနက် ချိတ်ဆက်မှု မရှိသော ဝိုင်ဖိုင်ကွန်ရက်အား မသုံးပါနှင့်"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"အင်တာနက် ချိတ်ဆက်မှု ကောင်းသည့် ကွန်ရက်များကိုသာ အသုံးပြုရန်"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"အများသုံး ကွန်ရက်များသို့ ချိတ်ဆက်ရန်"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"အရည်အသွေးမြင့် အများသုံးကွန်ရက်များသို့ အလိုအလျောက် ချိတ်ဆက်ရန်"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"အသုံးပြုရန် ကွန်ရက်အဆင့် သတ်မှတ်ပေးသူကို ရွေးချယ်ပါ"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"အသုံးပြုရန် ကိုက်ညီမှုရှိသည့် ကွန်ရက်အဆင့် သတ်မှတ်ပေးသူကို ရွေးချယ်ပါ"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"အသိအမှတ်ပြုလက်မှတ်များထည့်သွင်းရန်"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"တည်နေရာမှန်ကန်မှု တိုးတက်စေရန် စနစ်အက်ပ်များနှင့် ဝန်ဆောင်မှုများသည် 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="wifi_scan_notify_text" msgid="5593805423071186757">"တည်နေရာမှန်ကန်မှု ကောင်းလာစေရန် စနစ်အက်ပ်များနှင့် ဝန်ဆောင်မှုများသည် 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"တည်နေရာ ပိုမိုတိကျလာစေရန် <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ရှာဖွေမှု ဆက်တင်များ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ရှိ Wi-Fi ရှာဖွေခြင်းကို ဖွင့်ပါ။"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"နောက်ထပ်မပြပါနှင့်"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"စက်ပိတ်ထားစဉ် Wi-Fi ဖွင့်ထားပါ"</string>
@@ -710,7 +742,7 @@
     <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi-Fi တွင် အင်တာနက် ချိတ်ဆက်မှုမရှိတော့ပါက မိုဘိုင်းဒေတာသို့ ပြောင်းပါ။"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"မိုဘိုင်းဒေတာစနစ်သို့ အလိုအလျောက် ပြောင်းရန်"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Wi-Fi တွင် အင်တာနက်ချိတ်ဆက်မှု မရှိသည့်အခါ မိုဘိုင်းဒေတာကို အသုံးပြုပါ။ ဒေတာသုံးစွဲခ ကျသင့်နိုင်ပါသည်။"</string>
-    <string name="wifi_add_network" msgid="6234851776910938957">"ကွန်ယက်ထပ်ထည့်ရန်"</string>
+    <string name="wifi_add_network" msgid="6234851776910938957">"ကွန်ရက်ထပ်ထည့်ရန်"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi စိတ်ကြိုက် ရွေးချယ်မှုများ"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi သည် အလိုအလျှောက် ပြန်ဖွင့်သည်"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi သည် အလိုအလျှောက် ပြန်မဖွင့်ပါ"</string>
@@ -727,7 +759,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ကွန်ရက်အား မေ့ရန်"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ကွန်ယက်အား ပြင်ရန်"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC တဲဂ် သို့ ရေးရန်"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ရရှိနိုင်သည့်ကွန်ရက်များကို မြင်ရန် ဝိုင်ဖိုင်ဖွင့်ပါ"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ရနိုင်သည့်ကွန်ရက်များကို မြင်ရန် Wi-Fi ဖွင့်ပါ"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"ဝိုင်ဖိုင်ကွန်ယက်များရှာဖွေနေသည်"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"သင့်မှာ Wi-Fi  ကွန်ရက်ကို ပြောင်းလဲရန် ခွင့်ပြုချက် မရှိပါ။"</string>
     <string name="wifi_more" msgid="3195296805089107950">"နောက်ထပ်"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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,10 +878,18 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်ရန် ဖိတ်ကြားချက်ကို သင်ဖျက်သိမ်းချင်သလား?"</string>
     <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_checkbox_text" msgid="7763495093333664887">"Wi-Fi ဟော့စပေါ့"</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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"အမြဲဖွင့်ထားရန် / ဘက်ထရီအသုံးပြုမှု တိုးလာသည်"</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="6978257596231155345">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို ပြသပါ။ ဘက်ထရီအသုံးပြုမှု တိုးလာသည်။"</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>
@@ -1065,14 +1112,14 @@
     <string name="device_info_settings" product="default" msgid="475872867864762157">"ဖုန်းအခြေအနေ"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"စနစ်အားတိုးမြင့်ခြင်း"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Androidဗားရှင်း"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android ဗားရှင်း"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android လုံခြုံမှု ပက်ခ်ျ အဆင့်"</string>
     <string name="model_info" msgid="1952009518045740889">"မော်ဒယ်"</string>
-    <string name="hardware_info" msgid="2605080746512527805">"မော်ဒယ်နှင့် စက်ပစ္စည်းဆိုင်ရာ"</string>
+    <string name="hardware_info" msgid="2605080746512527805">"မော်ဒယ်နှင့် စက်ပစ္စည်း"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"စက်ပစ္စည်းဗားရှင်း"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"စက်ပစ္စည်း အမှတ်"</string>
     <string name="baseband_version" msgid="1848990160763524801">"baseband ဗားရှင်း"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"kernelဗားရှင်း"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Kernel ဗားရှင်း"</string>
     <string name="build_number" msgid="3075795840572241758">"တည်ဆောင်မှုနံပါတ်"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux အခြေအနေ"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"မရရှိနိုင်ပါ"</string>
@@ -1273,6 +1320,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>
@@ -1292,18 +1340,23 @@
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"စက်တွင်းသိုလှောင်ခန်းနှင့် ဒေတာအားလုံးကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ဤသည်မှာ သင့်တက်ဘလက်ထဲရှိ"<b></b>"သင့်ဂူးဂဲလ်အကောင့်\n\n"<li>"စနစ်နှင့် အက်ပ်ဒေတာနှင့် ဆက်တင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အက်ပ်"</li>"iအပါအဝင်\n"<li>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</li>"များကို ဖျက်ပါလိမ့်မည်"</string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ဤသည်မှာ သင့်ဖုန်းထဲရှိ\n"<li>"သင့်ဂူးဂဲလ်အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာနှင့် အဆင်အပြင်များ"</li>\n<li>"ဒေါင်းလုပ်ပြုလုပ်ထားသော အက်ပ်"</li>"iအပါအဝင်\n"<b>"စက်အတွင်းသိမ်းဆည်းထားခြင်း"</b>"များကို ဖျက်ပါလိမ့်မည်"</string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"သင်သည် လက်ရှိဤအကောင့်များကို ဆိုင်းအင်လုပ်ထားပါသည်\n"</string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ဤသည်က သင့်ဖုန်း၏"<b>"စက်အတွင်းသိုလှောင်မှု"</b>" အပါအဝင် အောက်ပါတို့ကို ဖျက်ပါလိမ့်မည်- \n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"သင်သည် လက်ရှိတွင် အောက်ပါအကောင့်များကို ဝင်ရောက်ထားပါသည်\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ဤစက်ပစ္စည်းပေါ်တွင် အခြားအသုံးပြုသူများလဲ ရှိသည်။\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"သီချင်း"</li>\n<li>"ဓာတ်ပုံများ"</li>\n<li>"အသုံးပြုသူ၏တခြားဒေတာ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM ရှိ ဖုန်းကုမ္ပဏီများ"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"၎င်းက သင်၏ မိုဘိုင်းဝန်ဆောင်မှုအစီအစဉ်ကို ဖျက်သိမ်းမည်မဟုတ်ပါ။"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏တခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USBသိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"သီချင်း၊ ပုံများနှင့် တခြားသောအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SDကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USBသိုလှောင်ကိရိယာအား ဖျက်ခြင်း"</string>
     <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_button_text" product="default" msgid="7550632653343157971">"ဖုန်းကို ပြန်သတ်မှတ်ရန်"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"သင့်ကိုယ်ပိုင်အချက်အလက်များနှင့် ဒေါင်းလုပ်ပြုလုပ်ထားသောအပလီကေးရှင်းများကို ဖျက်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍မရပါ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"အားလုံးကိုဖျက်ရန်"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"စနစ်အားရှင်းလင်းခြင်းဝန်ဆောင်မှုမရှိသောကြောင့် အစမှပြန်လည်စတင်နိုင်ခြင်းအားမပြုလုပ်နိုင်ပါ"</string>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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 +1463,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>
@@ -1491,6 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"မျက်နှာပြင် ဖတ်စနစ်များ၊ မျက်နှာပြင် ပြသမှု၊ အပြန်အလှန်ဆက်သွယ်ချက် ထိန်းချုပ်မှုများ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"မြင်ကွင်း ဆက်တင်များ"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီမှုရှိစေရန် ဤစက်ပစ္စည်းကို သင့်စိတ်ကြိုက်ပြင်ဆင်နိုင်သည်။ သုံးရလွယ်သည့် ဤဝန်ဆောင်မှုများကို ဆက်တင်များထဲ၌ နောက်ပိုင်းတွင် ပြောင်းလဲနိုင်သည်။"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"စာလုံးအရွယ်အစားကို ကြီးအောင်ပြုလုပ်ရန်"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"မျက်နှာပြင် ဖတ်စနစ်များ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"အသံနှင့် ဖန်သားပြင်ပေါ်ရှိ စာသား"</string>
     <string name="display_category_title" msgid="685461049938269166">"မျက်နှာပြင်ပြသမှု"</string>
@@ -1873,6 +1926,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>
@@ -1880,7 +1937,7 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ပရင်တာများထည့်ရန်"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ပွင့်နေသည်"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ပိတ်ထားသည်"</string>
-    <string name="print_menu_item_add_service" msgid="3811645167869797802">"ဆားဗစ် အသစ်ထည့်ရန်"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"ဝန်ဆောင်မှုထည့်ရန်"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ပရင်တာ ထည့်ရန်"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ရှာဖွေခြင်း"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"စာထုတ်စက်များကို ရှာနေပါသည်"</string>
@@ -1939,8 +1996,31 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏ဖုန်းကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏တက်ဘလက်ကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏စက်ပစ္စည်းကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရှိပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> က သင်၏ဖုန်းကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် <xliff:g id="APP_1">%1$s</xliff:g> ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> က သင်၏တက်ဘလက်ကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် <xliff:g id="APP_1">%1$s</xliff:g> ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> က သင်၏စက်ပစ္စည်းကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် <xliff:g id="APP_1">%1$s</xliff:g> ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"အက်ပ်ကို ရပ်ဆိုင်းရန်"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"နောက်ခံ၌အသုံးပြုခြင်းကို ပိတ်ပြီး အက်ပ်ကို ရပ်တန့်လိုပါသလား။"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> က သင်၏စက်ပစ္စည်းကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။။\n\nဤပြဿနာကို ဖြေရှင်းရန် သင်သည် <xliff:g id="APP_1">%1$s</xliff:g> ကို ရပ်တန့်ပြီး နောက်ခံတွင် ပွင့်နေခြင်းမရှိအောင် တားဆီးနိုင်ပါသည်။"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> က သင်၏တက်ဘလက်ကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် သင်သည် <xliff:g id="APP_1">%1$s</xliff:g> ကို ရပ်တန့်ပြီး နောက်ခံတွင် ပွင့်နေခြင်းမရှိအောင် တားဆီးနိုင်ပါသည်။"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> က သင်၏စက်ပစ္စည်းကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် သင်သည် <xliff:g id="APP_1">%1$s</xliff:g> ကို ရပ်တန့်ပြီး နောက်ခံတွင် ပွင့်နေခြင်းမရှိအောင် တားဆီးနိုင်ပါသည်။"</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="7774807745601479888">"အက်ပ်ကို အသုံးပြုနေခြင်း မရှိသော်လည်း <xliff:g id="APP">%1$s</xliff:g> သည် သင်၏တည်နေရာကို အမြဲတောင်းဆိုနေသောကြောင့် သင်၏ဖုန်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ဤအက်ပ်အတွက် တည်နေရာဝန်ဆောင်မှုကို ပိတ်ထားနိုင်ပါသည်။"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"အက်ပ်ကို အသုံးပြုနေခြင်း မရှိသော်လည်း <xliff:g id="APP">%1$s</xliff:g> သည် သင်၏တည်နေရာကို အမြဲတောင်းဆိုနေသောကြောင့် သင်၏တက်ဘလက်သည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ဤအက်ပ်အတွက် တည်နေရာဝန်ဆောင်မှုကို ပိတ်ထားနိုင်ပါသည်။"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"အက်ပ်ကို အသုံးပြုနေခြင်း မရှိသော်လည်း <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_flashlight" msgid="7794409781003567614">"ဖလက်ရှ်မီး"</string>
     <string name="power_camera" msgid="4976286950934622605">"ကင်မရာ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ဘလူးတုသ်"</string>
@@ -1953,7 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"နောက်ဆုံးအကြိမ် အားဖြည့်ပြီးချိန်မှစ၍ ခွဲခြမ်းစိတ်ဖြာချက်"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"နောက်ဆုံးအကြိမ် အားအပြည့် သွင်းခဲ့ချိန်"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ကျန်ရှိနေသော ဘက်ထရီကြာချိန်သည် ခန့်မှန်းခြေသာဖြစ်ပြီး အသုံးပြုမှုအပေါ် အခြေခံ၍ ပြောင်းလဲနိုင်ပါသည်"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ဒေတာအသုံးပြုမှုအတွက် ဘက်ထရီအားသည် ခန့်မှန်းချက်သာဖြစ်ပြီး အသုံးပြုမှုအလိုက် ပြောင်းလဲနိုင်သည်"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"အသုံးပြုနေစဉ်"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"နောက်ခံတွင် ဖွင့်ထားစဉ်"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ဘက်ထရီ အသုံးပြုမှု"</string>
@@ -2191,7 +2272,7 @@
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"ဝိုင်ဖိုင်ကွန်ရက် <xliff:g id="NETWORK_NAME">%s</xliff:g> ကို ချိတ်ဆက်ထားသည်"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ကွန်ယက်အား ထပ်ထည့်ရန်"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ဆက်သွယ်မှု  မရှိပါ"</string>
-    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ကွန်ယက်ထပ်ထည့်ရန်"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ကွန်ရက်ထပ်ထည့်ရန်"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ပြန်လည်ဆန်းသစ်ရန် စာရင်း"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"ကျော်ရန်"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"ရှေ့သို့"</string>
@@ -2332,8 +2413,8 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"နောက်ခံဒေတာ ကန့်သတ်မည်လား?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"မိုဘိုင်းလ်ကွန်ရက်သာ ရှိနေသောအချိန်တွင် ဤအစီအစဥ်သည် နောက်ခံ အချက်အလက် အသုံးပြုခြင်းကို မှီခိုနေသော အပလီကေးရှင်းတစ်ခု အလုပ်လုပ်ခြင်းကို ရပ်စေနိုင်သည်။\n\nအပလီကေးရှင်းထဲမှ ဆက်တင်များထဲတွင် ပိုမိုသင့်လျော်သော ဒေတာအသုံးပြုခြင်းထိန်းချုပ်မှုများကို ရှာဖွေနိုင်သည်။"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"မိုဘိုင်းဒေတာကို ကန့်သတ်မှုပြုလုပ်ထားသည့် အခါတွင်သာ နောက်ခံ၌ ဒေတာအသုံးပြုမှုကို ကန့်သတ်နိုင်ပါသည်။"</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ဒေတာများကို အလိုလျောက်တူအောင်လုပ်ခြင်းကို ဖွင့်မည်လား?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"သင်က ဝဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်တက်ဘလက်ထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့  အကောင့်များသည် သင်က သင့်တက်ဘလက်သို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ဒေတာ အော်တို-စင့်ခ် ဖွင့်မလား။"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ဝဘ်ပေါ်တွင် သင်၏ အကောင့်အတွက်လုပ်သည့် အပြောင်းအလဲအားလုံးကို သင့်တက်ဘလက်သို့ အလိုအလျောက် ကူးပေးမည်။ \n\nအချို့အကောင့်များသည် သင့်တက်ဘလက်သို့ ပြုလုပ်သည့် အပြောင်းအလဲများကို ဝဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသည်။ Google အကောင့်၏ အလုပ်လုပ်ပုံ ဖြစ်ပါသည်။"</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"သင်က ဝဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်ဖုန်းထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့ အကောင့်များသည် သင်က ဖုန်းသို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ဒေတာ အော်တိုစင့်ခ် ပိတ်မလား။"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"၎င်းသည် ဒေတာနှင့် ဘက်ထရီအသုံးပြုမှုကို လျှော့ချပေးမည်၊ သို့သော် လတ်တလောအချက်အလက်များကို ရယူရန် သင်ကိုယ်တိုင် အကောင့်တစ်ခုချင်းကို စင့်ခ်လုပ်ရမည်။ အပ်ဒိတ်များထွက်သည့် အကြောင်းကြားချက်များကိုမူ သင်လက်ခံရရှိတော့မည်မဟုတ်ပါ။"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"သော့ဖွင့်ရန်ပွတ်ဆွဲပါ၊ စကားဝှက်၊ ပုံစံ၊ ပင်နံပါတ်"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"အလုပ်၏ စိန်ခေါ်မှု၊ အလုပ်၊ ပရိုဖိုင်"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"အလုပ်ပရိုဖိုင်၊ စီမံခန့်ခွဲထားသည့် ပရိုဖိုင်၊ စည်းလုံးစေခြင်း၊ စည်းလုံးအောင်ပြုလုပ်ခြင်း၊ အလုပ်၊ ပရိုဖိုင်"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"လှုပ်ရှားမှုဟန်"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ဟန်များ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ပေးချေမှု၊ တို့ခြင်း၊ ငွေပေးချေခြင်းများ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"မိတ္တူ၊ မိတ္တူကူးပါ"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ဟန်"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ကြိုးမဲ့ NFC တဲဂ်ကို စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="write_tag" msgid="8571858602896222537">"ရေးရန်"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ရေးရန် တဲဂ် တစ်ခုကို ပုပ်ပါ..."</string>
@@ -2781,7 +2866,7 @@
     <string name="notification_badging_title" msgid="5938709971403474078">"အကြောင်းကြားချက်အမှတ်အသားများကို ခွင့်ပြုရန်"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"မီး မှိတ်တုတ်မှိတ်တုတ်လုပ်ရန်"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"လော့ခ်ချထားသည့်မျက်နှာပြင်ပေါ်တွင်"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"အကြောင်းကြားချက်ပါ အကြောင်းအရာအားလုံးကို ပြမည်"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"အကြောင်းကြားချက်ပါ အကြောင်းအရာအားလုံးကို ပြပါ"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"အရေးကြီးသည့် အသိပေးအကြောင်းအရာကိုဝှက်ထားရန်"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"အကြောင်းကြားချက်များကို လုံးဝမပြပါနှင့်"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"သင်၏ကိရိယာကို လော့ခ်ချထားချိန် အကြောင်းကြားချက်များကို ဘယ်လိုပြစေလိုပါသလဲ။"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2867,7 +2955,7 @@
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ပိတ်ဆို့ထား"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ဦးစားပေးမှု"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"သိမ်မွေ့သော"</string>
-    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"လုပ်ပြီး"</string>
+    <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ပြီးပါပြီ"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"အရေးပါမှု"</string>
     <string name="notification_show_lights_title" msgid="7671781299688190532">"မီးကို မှိတ်တုတ်မှိတ်တုတ်လုပ်ရန်"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"တုန်ခါရန်"</string>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ကြယ်ပွင့်ပြ အဆက်အသွယ်များဆီမှသာ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"မရှိ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"နှိုးစက်များ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"နှိုးစက်များကို အမြဲတမ်း ဦးစားပေး၍ အသံမြည်ပေးရန်"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"သတိပေးချက်များ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"အစီအစဉ်များ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ခေါ်ဆိုသူ အားလုံး"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3117,13 +3210,13 @@
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"ငြင်းပယ်ပါ"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"ဤစက်ကို အားသွင်းပါ"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ဤဖုန်းကိုသာ အားသွင်းပါ"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"အားဖြည့်ပေးပါ"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"ချိတ်ဆက်ထားသော စက်ပစ္စည်းကို အားသွင်းခြင်း။ USB ဖြင့် အားသွင်းခြင်းကို ပံ့ပိုးသည့် စက်ပစ္စည်းများတွင်သာ အသုံးပြုနိုင်ပါသည်။"</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ဖိုင်များကို လွှဲပြောင်းပါ"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"အားဖြည့်ခြင်း"</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"ချိတ်ဆက်ထားသော စက်ပစ္စည်းကို အားသွင်းသည်။ USB ဖြင့် အားသွင်းခြင်းကို ပံ့ပိုးသည့် စက်ပစ္စည်းများတွင်သာ အသုံးပြုနိုင်ပါသည်။"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ဖိုင်များကို လွှဲပြောင်းခြင်း"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ဖိုင်များကို အခြားစက်ပစ္စည်းတစ်ခုသို့ လွှဲပြောင်းပါ"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ဓာတ်ပုံများ လွှဲပြောင်းရန် (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ဓာတ်ပုံများ လွှဲပြောင်းခြင်း (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP ကို မပံ့ပိုးလျှင် (PTP) ဓာတ်ပုံများ သို့မဟုတ် ဖိုင်များကို လွှဲပြောင်းရန်"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"စက်ပစ္စည်းကို MIDI အဖြစ်အသုံးပြုပါ"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"စက်ကို MIDI အဖြစ်အသုံးပြုခြင်း"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ဤစက်ပစ္စည်းကို MIDI အဖြစ်အသုံးပြုပါ"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB ကို အောက်ပါအတွက် အသုံးပြုပါ -"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ဟန်ကို အထောက်အကူပေးရန်"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"အထိအတွေ့ အာရုံခံနိုင်မှု"</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="gesture_setting_on" msgid="3455094265233870280">"ဖွင့်ထားသည်"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ပိတ်ထားသည်"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"စဖွင့်သည့်စနစ်ကို လော့ခ်ဖွင့်ပြီးပါပြီ"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"အလုပ်ဒေတာကို အလိုအလျောက် စင့်ခ်လုပ်ရန်"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"အက်ပ်အား ဒေတာကို အလိုအလျောက် ပြန်လည်စတင်ပါစေ"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"အကောင့်ကို စင့်ခ်လုပ်ရန်"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> အနက်မှ <xliff:g id="ID_1">%1$d</xliff:g> အတွက် စင့်ခ်ကို ဖွင့်ထားသည်"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"အရာအားလုံးအတွက် စင့်ခ်ကို ဖွင့်ထားသည်"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"အရာအားလုံးအတွက် စင့်ခ်ကို ပိတ်ထားသည်"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"စီမံခန့်ခွဲထားသည့် စက်ပစ္စည်း၏ အချက်အလက်များ"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"သင်၏ အဖွဲ့အစည်းက စီမံခန့်ခွဲထားသည့် အပြောင်းအလဲများနှင့် ဆက်တင်များ"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> က စီမံခန့်ခွဲထားသည့် အပြောင်းအလဲများနှင့် ဆက်တင်များ"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"စိတ်လှုပ်ရှားဖွယ်ရာ အသစ်အဆန်း ရှိပါသလား။"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ထိပ်တန်း ဝန်ဆောင်မှု ၅ မျိုးကို ကြည့်ရန်"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS မှတ်ပုံတင်ခြင်း အခြေအနေ"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"မှတ်ပုံတင်ထားသည်"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"မှတ်ပုံတင်မထားပါ"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 1dab99f2e3e0843b1f259a8415eaf9822b272e5e..b92038b2a96febc6a8cd65848efec8ad9879fe3a 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 4cb041aa77e941c52550d511ddf1289f477ae963..f92bdf7bbc15c63f23b4bb3e2e0802f1f87eaec3 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Gjør det senere"</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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Slå på Wi‑Fi automatisk"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi slås på igjen i nærheten av lagrede nettverk av høy kvalitet, for eksempel hjemmenettverket ditt"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Utilgjengelig fordi Wi‑Fi-skanning er slått av"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"For å bruke funksjonen, velg en leverandør av nettverksvurdering"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unngå dårlige tilkoblinger"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ikke bruk et Wi-Fi-nettverk med mindre det har en brukbar Internett-tilkobling"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Bare bruk nettverk som har en god nettilkobling"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Koble til åpne nettverk"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Koble automatisk til offentlige nettverk av høy kvalitet"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"For å bruke funksjonen, velg en leverandør av nettverksvurdering"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"For å bruke funksjonen, velg en kompatibel leverandør av nettverksvurdering"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer sertifikater"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"For å forbedre posisjonsnøyaktigheten kan systemapper og -tjenester fortsatt oppdage Wi-Fi-nettverk. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"For å forbedre posisjonsnøyaktigheten, slå på Wi-Fi-skanning 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>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1014,14 +1055,20 @@
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Aldri"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"For å kontrollere hva som skjer når telefonen er plassert i dokken og/eller i hvilemodus, slå på skjermspareren."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Når du skal begynne"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Starttidspunkt"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"Nåværende skjermsparer"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nå"</string>
     <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="7337555569694794132">"Alltid på / økt batteribruk"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Nye varsler"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Når den 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="6978257596231155345">"Vis klokkeslett, varselikoner og annen informasjon. Økt batteribruk."</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>
@@ -1201,7 +1248,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Utforsk <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Annet omfatter delte filer lagret av apper, filer lastet ned fra Internett eller Bluetooth, Android-filer og så videre. \n\nFor å se det synlige innholdet på <xliff:g id="NAME">^1</xliff:g>, trykk på Utforsk."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Delen System inneholder filer som brukes for å kjøre Android-versjon <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systemet inkluderer filer som brukes for å kjøre Android-versjon <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> kan ha lagret bilder, musikk, apper eller andre data, som bruker <xliff:g id="SIZE">^2</xliff:g> lagringsplass. \n\nFor å se mer informasjon, bytt til <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Bruk som bærbar lagring"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Det er andre brukere tilstede på denne enheten.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatører på e-SIM-kortet"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Dette kansellerer ikke mobilabonnementet ditt."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"USB-lageret"</b>" tømmes."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"For å slette musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" tømmes."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Slett USB-lagring"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Gjør mønsteret synlig"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Gjør profilmønsteret synlig"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrer ved trykk"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Av/på låser umiddelbart"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Av/på-knapp låser umiddelbart"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Unntatt når den holdes opplåst av <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Opplåsingsmønster"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Opplåsingsmønster"</string>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1673,7 +1725,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Innstillinger for fysisk tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Trykk mellomromstasten to ganger for å skrive punktum"</string>
     <string name="show_password" msgid="4837897357002495384">"Vis passord"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"Vis tegnene kjapt mens du skriver"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"Vis tegnene mens du skriver"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Denne stavekontrollen kan være i stand til å samle all tekst du skriver, herunder personlige opplysninger som passord og kredittkortnumre. Den kommer fra appen <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruke denne stavekontrollen?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Innstillinger"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Språk"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skjermlesere, skjerm, interaksjonskontroller"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Synsinnstillinger"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan tilpasse denne enheten etter egne behov. Tilgjengelighetsfunksjonene kan du endre senere i Innstillinger."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Øk skriftstørrelsen"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skjermlesere"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Lyd og tekst på skjermen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skjerm"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Telefonen kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder telefonen aktiv.\n\nFor å forsøke å løse problemet kan du stoppe appen.\n\nHvis problemet vedvarer, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Nettbrettet kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder nettbrettet aktivt.\n\nFor å forsøke å løse problemet kan du stoppe appen.\n\nHvis problemet vedvarer, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Enheten kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> holder enheten aktiv.\n\nFor å forsøke å løse problemet kan du stoppe appen.\n\nHvis problemet vedvarer, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefonen kan ikke styre batteriet som normal fordi <xliff:g id="APP_0">%1$s</xliff:g> stadig vekker telefonen.\n\nFor å forsøke å løse problemet kan du stoppe <xliff:g id="APP_1">%1$s</xliff:g>.\n\nHvis problemet vedvarer, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Nettbrettet kan ikke styre batteriet som normal fordi <xliff:g id="APP_0">%1$s</xliff:g> stadig vekker nettbrettet.\n\nFor å forsøke å løse problemet kan du stoppe <xliff:g id="APP_1">%1$s</xliff:g>.\n\nHvis problemet vedvarer, må du kanskje avinstallere appen for å få bedre batteriytelse."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Enheten kan ikke styre batteriet som normal fordi <xliff:g id="APP_0">%1$s</xliff:g> stadig vekker enheten.\n\nFor å forsøke å løse problemet kan du stoppe <xliff:g id="APP_1">%1$s</xliff:g>.\n\nHvis problemet vedvarer, 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="6936542136153283692">"Vil du slå av bakgrunnsbruk og stoppe appen?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefonen kan ikke styre batteriet som normalt fordi <xliff:g id="APP_0">%1$s</xliff:g> stadig vekker telefonen.\n\nFor å forsøke å løse problemet kan du stoppe <xliff:g id="APP_1">%1$s</xliff:g> og forhindre at den kjører i bakgrunnen."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Nettbrettet kan ikke styre batteriet som normalt fordi <xliff:g id="APP_0">%1$s</xliff:g> stadig vekker nettbrettet.\n\nFor å forsøke å løse problemet kan du stoppe <xliff:g id="APP_1">%1$s</xliff:g> og forhindre at den kjører i bakgrunnen."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Enheten kan ikke styre batteriet som normalt fordi <xliff:g id="APP_0">%1$s</xliff:g> stadig vekker enheten.\n\nFor å forsøke å løse problemet kan du stoppe <xliff:g id="APP_1">%1$s</xliff:g> og forhindre at den 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="7774807745601479888">"Telefonen din kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> stadig ber om posisjonen din når du ikke bruker appen.\n\nDu kan løse problemet ved å slå av posisjon for denne appen."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Nettbrettet kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> stadig ber om posisjonen din når du ikke bruker appen.\n\nDu kan løse problemet ved å slå av posisjon for denne appen."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Enheten kan ikke styre batteriet som normalt fordi <xliff:g id="APP">%1$s</xliff:g> stadig ber om posisjonen din også når du ikke bruker appen.\n\nDu kan løse problemet ved å slå av posisjon for 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Oversikt siden sist batteriet var fulladet"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Sist batteriet var fulladet"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Gjenværende batteritid er omtrentlig og kan endres basert på bruk"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Data om batteribruk er omtrentlig og kan endres avhengig av bruk"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktiv bruk"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"I bakgrunnen"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batteribruk"</string>
@@ -2486,7 +2567,7 @@
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ikke konfigurert – begrenset profil"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"Ikke konfigurert – arbeidsprofil"</string>
     <string name="user_admin" msgid="993402590002400782">"Administrator"</string>
-    <string name="user_you" msgid="1639158809315025986">"Deg (<xliff:g id="NAME">%s</xliff:g>)"</string>
+    <string name="user_you" msgid="1639158809315025986">"Du (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Kallenavn"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"Legg til"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"Du kan legge til opptil <xliff:g id="USER_COUNT">%1$d</xliff:g> brukere"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kan dele denne enheten med andre folk ved å opprette flere brukere. Hver bruker har sin egen plass de kan tilpasse med apper, bakgrunner og annet. Brukere kan også endre enhetsinnstillinger, for eksempel Wi-Fi, som påvirker alle.\n\nNår du legger til en ny bruker, må vedkommende angi innstillinger for plassen sin.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Når du legger til en ny bruker, må vedkommende konfigurere sitt eget område.\n\nAlle brukere kan oppdatere apper for alle andre brukere."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurere brukeren nå?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Sørg for at brukeren er tilgjengelig sånn at vedkommende kan konfigurere området sitt på enheten"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Sørg for at brukeren er tilgjengelig for å konfigurere området sitt på enheten"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vil du konfigurere profilen nå?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Konfigurer nå"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ikke nå"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"skyv for å låse opp, passord, mønster, PIN-kode"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"jobbutfordring, jobb, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"jobbprofil, administrert profil, forene, forening, jobb, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"bevegelse"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"bevegelser"</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_assist_gesture_launch" msgid="813968759791342591">"bevegelse"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Bare fra stjernemerkede kontakter"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmer"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmer er alltid prioritert og avgir lyd"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Hendelser"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle oppringere"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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øyt forbruk"</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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3305,8 +3406,8 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Angi datavarsel"</string>
-    <string name="data_warning" msgid="209133958008062117">"Advarsel for dataforbruk"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Angi varsel om databruk"</string>
+    <string name="data_warning" msgid="209133958008062117">"Varsel om databruk"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Angi en datagrense"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagrense"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt i tidsrommet <xliff:g id="ID_2">%2$s</xliff:g>"</string>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3452,26 +3552,33 @@
     <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_summary" msgid="242037150983277829">"Trykk på av/på-knappen to ganger for å åpne kameraet raskt. Dette fungerer på alle skjermer."</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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Varsler med fingeravtrykksensor"</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">"Sveip fingersensoren for varsler"</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"På"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Av"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Oppstartsinnlasteren er allerede låst opp"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Synkroniser jobbdata automatisk"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"La apper oppdatere data automatisk"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Kontosynkronisering"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Synkronisering er slått på for <xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$d</xliff:g> elementer"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Synkronisering er slått på for alle elementene"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Synkronisering er slått av for alle elementene"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informasjon om administrert enhet"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Endringer og innstillinger administreres av organisasjonen din"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Endringer og innstillinger administreres av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Hva er nytt og spennende?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Sjekk ut de 5 mest populære funksjonene"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Tilstand for IMS-registrering"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrert"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ikke registrert"</string>
 </resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index bc561706e66aa44c796fbb9e2148c9c769a8dc7a..a234d9f261b2cdcdbb1139ca1641aa8fa8f8e038 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 2f3a61741cb3503e1afc7a48722a4630c3b95384..c628df9dfaba9c45d616fbff89312889b7f59cb3 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"यसलाई पछि गर्नुहोस्‌"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिन्ट सेटअप छोड्न चाहनुहुन्छ?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तपाईँले आफ्नो फोन अनलक गर्ने एक तरिका रूपमा फिंगरप्रिन्ट छान्‍नुभएको छ। यदि तपाईँले अहिले छोड्नु भएमा पछि पुन: सेटअप गर्न पर्नेछ। सेटअप गर्न मात्र केहि मिनेट लाग्‍नेछ।"</string>
     <string name="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>
@@ -429,7 +440,7 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावनी: खुला गर्न <xliff:g id="COUNT">^1</xliff:g> भन्दा बढी असफल प्रयासहरू पछि तपाईँको उपकरण पुछिने छ!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"तपाईँको पासवर्ड टाइप गर्नुहोस्"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"इन्क्रिप्सन असफल"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"इन्क्रिप्सन अवरूद्ध भयो र पूरा हुन सक्दैन। परिणाम स्वरूप तपाईंको ट्याब्लेटको डेटा अब पहुँचयोग्य हुँदैन।\n \n तपाईंको ट्याब्लेटको प्रयोग सुरू गर्नका लागि तपाईंले कारखाना पुनःसेट गर्नु  पर्छ। जब पुनःसेट हुन्छ तब तपाईं ट्याब्लेट सेट गर्नुहुन्छ, तपाईंको Google खातामा जगेडा गरिएको कुनै पनि डेटा पुनर्स्थापना गर्ने अवसर तपाईंलाई हुने छ।"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"इन्क्रिप्सन अवरूद्ध भयो र पूरा हुन सक्दैन। परिणाम स्वरूप तपाईंको ट्याब्लेटको डेटा अब पहुँचयोग्य हुँदैन।\n \n तपाईंको ट्याब्लेटको प्रयोग सुरु गर्नका लागि तपाईंले कारखाना पुनःसेट गर्नु  पर्छ। जब पुनःसेट हुन्छ तब तपाईं ट्याब्लेट सेट गर्नुहुन्छ, तपाईंको Google खातामा जगेडा गरिएको कुनै पनि डेटा पुनर्स्थापना गर्ने अवसर तपाईंलाई हुने छ।"</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"एन्क्रिप्सन रोकिएको थियो र पूरा हुन सकेन। नतिजाको रूपमा तपाईंको फोनमा डेटा पहुँच यग्य छैन। \n\nतपाईंको फोनको उपयोग फरि सुरु गर्नको लागि तपाईंले एउटा फ्याक्ट्रि पुनःसेट गर्न जरूरी छ। जब तपाईं पुनःसेटपछि तपाईंको फोन सेटअप गर्नु हुन्छ भने  कुनै पनि डेटा जुन तपाईंको Google खातामा ब्याकअप गरिएको थियो तपाईंलाई पुनःप्राप्त गर्ने अवसर हुने छ।"</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"गुप्तिकरण उल्टाउन असफल"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"तपाईँले प्रविष्ट गर्नुभएको पासवर्ड ठीक छ, तर दुर्भाग्यबश तपाईँको डेटा बिग्रिएको छ।\n\n तपाईँको ट्याब्लेट पुन: प्रयोग गर्न फ्याक्ट्री रिसेट गर्न पर्छ। रिसेट गरे पश्चात जब तपाई आफ्नो ट्याब्लेट सेटअप गर्नुहुन्छ तपाईँले Google खातामा ब्याकअप भए सम्मका डेटा पुनर्स्थापना गर्ने अवसर प्राप्त गर्नु हुनेछ।"</string>
@@ -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="1688030823464420974">"तपाईंले अर्को प्रयासमा गलत ढाँचा प्रविष्ट गर्नुभयो भने यो यन्त्रको डेटा मेटाइनेछ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"तपाईंले अर्को प्रयासमा गलत PIN प्रविष्ट गर्नुभयो भने यो यन्त्रको डेटा मेटाइनेछ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"तपाईंले अर्को प्रयासमा गलत पासवर्ड प्रविष्ट गर्नुभयो भने यो यन्त्रको डेटा मेटाइनेछ।"</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="5047439819181833824">"अनलक गर्ने अत्यधिक गलत प्रयासहरू भए। यो यन्त्रको डेटा मेटाइनेछ।"</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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi स्वत: सक्रिय गर्नुहोस्"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"तपाईंको घरको नेटवर्क जस्ता सुरक्षित गरिएका उच्च गुणस्तरका नेटवर्कहरू नजिक हुँदा Wi‑Fi पुन: सक्रिय हुनेछ"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi स्क्यान गर्ने सेवालाई निष्क्रिय पारिएको हुनाले Wi-Fi वेकअप विकल्प उपलब्ध छैन"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"प्रयोग गर्न कुनै नेटवर्क मूल्याङ्कनसम्बन्धी प्रदायक चयन गर्नुहोस्"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"कमजोर जडान त्याग्नुहोस्"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Wi-Fi नेटवर्क राम्रो इन्टरनेट जडान नभएसम्म प्रयोग नगर्नुहोस्।"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"केवल राम्रो इन्टरनेट जडान हुने सञ्जालको उपयोग गर्नुहोस्"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"खुला नेटवर्कहरूमा जडान गर्नुहोस्"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"उच्च गुणस्तरको सार्वजनिक नेटवर्कहरूमा स्वतः जडान गर्नुहोस्"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"प्रयोग गर्न कुनै नेटवर्क मूल्याङ्कनसम्बन्धी प्रदायक चयन गर्नुहोस्"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"प्रयेाग गर्न कुनै उपयुक्त नेटवर्क मूल्याङ्कनसम्बन्धी प्रदायक चयन गर्नुहोस्"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्रहरू स्थापना गर्नुहोस्"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"स्थान पहिचान सामर्थ्यतामा सुधार गर्न, प्रणाली अनुप्रयोगहरू र सेवाहरूले अझै पनि 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"स्थान सम्बन्धी सटीकतामा सुधार गर्न <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>स्क्यानिङ सम्बन्धी सेटिङहरू<xliff:g id="LINK_END_1">LINK_END</xliff:g> मा गई Wi-Fi स्क्यान गर्ने सेवालाई सक्रिय गर्नुहोस्।"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1014,14 +1055,20 @@
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"कहिल्यै पनि होइन"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"बन्द"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"फोन डकमा र/वा शयन अवस्थामा हुँदा हुने कुरालाई नियन्त्रण गर्न स्क्रिन सेभरलार्इ सक्रिय गर्नुहोस्।"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"सुरू हुने समय"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"सुरु हुने समय"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"हालको स्क्रिन सेभर"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"अब सुरु गर्नुहोस्"</string>
     <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="7337555569694794132">"सधैँ सक्रिय / ब्याट्रीको बढेको उपयोग"</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="6978257596231155345">"समय, सूचनाका आइकनहरू र अन्य जानकारी देखाउनुहोस्। ब्याट्रीको बढेको उपयोग।"</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 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n" \nतपाईँले अहिले निम्न खाताहरूमा साइन इन गर्नुभयो:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n" यस यन्त्रमा हाल अन्य प्रयोगकर्ताहरु छन्। \n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"तस्बिरहरू"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM मा रहेका सेवा प्रदायकहरू"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"यस कार्यले तपाईंको मोबाइल सेवाको योजना रद्द गर्नेछैन।"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n" \n संगीत, चित्र र अन्य उपयोगकर्ता डेटा हटाउन "<b>"USB संग्रह"</b>" मेटाउन जरुरी छ।"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n" \n संगीत, तस्वीरहरू, र अन्य प्रयोगकर्ता डेटा मेटाउनका लागि, "<b>" SD कार्ड "</b>" मेटाउनु पर्छ।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB भण्डारण मेटाउनुहोस्"</string>
     <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 +1377,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>
@@ -1376,7 +1418,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>
@@ -1407,7 +1449,7 @@
     <string name="safety_and_regulatory_info" msgid="5103161279848427185">"सुरक्षा र नियामक सम्बन्धी मार्गदर्शन"</string>
     <string name="copyright_title" msgid="865906688917260647">"प्रतिलिपि अधिकार"</string>
     <string name="license_title" msgid="1990487604356037871">"इजाजतपत्र"</string>
-    <string name="terms_title" msgid="7697580845616764642">"सेवा सर्तहरू"</string>
+    <string name="terms_title" msgid="7697580845616764642">"सेवाका सर्तहरू"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"प्रणाली वेबभ्यु लाइसेन्स"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"वालपेपरहरु"</string>
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"स्याटलाइट कल्पना प्रदायकहरू:\n©२०१४ CNES / Astrium, DigitalGlobe, Bluesky"</string>
@@ -1421,8 +1463,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 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"स्क्रिन रिडरहरू, प्रदर्शन, अन्तर्क्रिया नियन्त्रणहरू"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"दृश्यका सेटिङहरू"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"तपाईंले आफ्नो आवश्यकताहरूसँग मेल खाने बनाउन यस यन्त्रलाई आफू अनुकूल गर्न सक्नुहुन्छ। यी पहुँच सुविधाहरू सेटिङमा पछि परिवर्तन गर्न सकिनेछ।"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"फन्टको आकार बढाउनुहोस्"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"स्क्रिन रिडरहरू"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"अडियो तथा स्क्रिनमा देखिने पाठ सन्देश"</string>
     <string name="display_category_title" msgid="685461049938269166">"प्रदर्शन"</string>
@@ -1780,7 +1833,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"उपलब्धता सर्टकट"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"सर्टकट सेवा"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"लक स्क्रिनबाट अनुमति दिनुहोस्"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"सर्टकट सक्रिय भएको बेलामा, पहुँच सुविधा सुरू गर्न तपाईं दुवै भोल्युम बटनलाई ३ सेकेण्डसम्म थिच्न सक्नुहुन्छ।"</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"सर्टकट सक्रिय भएको बेलामा, पहुँच सुविधा सुरु गर्न तपाईं दुवै भोल्युम बटनलाई ३ सेकेण्डसम्म थिच्न सक्नुहुन्छ।"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"उच्च विपरीत पाठ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"स्क्रिन आवर्धन स्वतः अपडेट गर्नुहोस्"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"अनुप्रयोग ट्रान्जिसनहरूमा स्क्रिन आवर्धन अपडेट गर्नुहोस्"</string>
@@ -1873,6 +1926,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>
@@ -1887,7 +1944,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"सेवा असक्षम गरियो"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"छपाइ कार्यहरू"</string>
     <string name="print_print_job" msgid="7563741676053287211">"छपाइ कार्य गर्नुहोस्"</string>
-    <string name="print_restart" msgid="8373999687329384202">"पुनःस्टार्ट गर्नुहोस्"</string>
+    <string name="print_restart" msgid="8373999687329384202">"पुनः सुरु गर्नुहोस्"</string>
     <string name="print_cancel" msgid="3621199386568672235">"रद्द गर्नुहोस्"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"प्रिन्ट गरिँदै <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g>ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको फोनले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं <xliff:g id="APP_1">%1$s</xliff:g>लाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g>ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको ट्याब्लेटले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं <xliff:g id="APP_1">%1$s</xliff:g>लाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g>ले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं <xliff:g id="APP_1">%1$s</xliff:g>लाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"अनुप्रयोगलाई रोक्नुहोस्"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"पृष्ठभूमिको प्रयोग निष्क्रिय पार्ने र अनुप्रयोगलाई रोक्ने हो?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको फोनले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयासस्वरूप तपाईं <xliff:g id="APP_1">%1$s</xliff:g> लाई रोक्न र यसलाई पृष्ठभूमिमा चल्नबाट रोक्न सक्नुहुन्छ।"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको ट्याब्लेटले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयासस्वरूप, तपाईं <xliff:g id="APP_1">%1$s</xliff:g> लाई रोक्न र यसलाई पृष्ठभूमिमा चल्नबाट रोक्न सक्नुहुन्छ।"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> ले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयासस्वरूप तपाईं <xliff:g id="APP_1">%1$s</xliff:g> लाई रोक्न र यसलाई पृष्ठभूमिमा चल्नबाट रोक्न सक्नुहुन्छ।"</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="7774807745601479888">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईं उक्त अनुप्रयोग प्रयोग नगरिरहनुभएको बेलामा पनि स्थानसम्बन्धी जानकारी प्राप्त गर्न अनुरोध गरिरहने भएकोले तपाईंको फोनले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्न तपाईं यस फोनको स्थानसम्बन्धी जानकारी नामक विकल्पलाई निष्क्रिय पार्न सक्नुहुन्छ।"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईं उक्त अनुप्रयोग प्रयोग नगरिरहनुभएको बेलामा पनि स्थानसम्बन्धी जानकारी प्राप्त गर्न अनुरोध गरिरहने भएकोले तपाईंको ट्याब्लेटले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्न तपाईं यस ट्याब्लेटको स्थानसम्बन्धी जानकारी नामक विकल्पलाई निष्क्रिय पार्नसक्नुहुन्छ।"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"<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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"पछिल्लो पटक पूर्ण चार्ज भएदेखिको विश्लेषण"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"पछिल्लो पटकको पूर्ण चार्ज"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"बाँकी रहेको ब्याट्रीको अवधि अनुमानित हो र प्रयोग अनुसार यो मान बदलिन सक्छ"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ब्याट्री प्रयोगसम्बन्धी डेटा अनुमानित हो र प्रयोगको अनुसार यो मान बदलिन सक्छ"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"सक्रिय प्रयोगमा रहँदा"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"पृष्ठभूमिमा हुँदा"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ब्याट्रीको प्रयोग"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"अनलक गर्न स्लाइड गर्नुहोस्, पासवर्ड, ढाँचा, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"कार्य चुनौती, कार्य, प्रोफाइल"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"कार्यको प्रोफाइल, व्यवस्थापन गरिएको प्रोफाइल, एकरूपता ल्याउनु, एकरूपता, कार्य, प्रोफाइल"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"इसारा"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"इसाराहरू"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"भुक्तानी गर्नुहोस्, ट्याप गर्नुहोस्, भुक्तानी"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ब्याकअप, ब्याकअप गर्नुहोस्"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"इसारा"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ताराङ्कित सम्पर्कहरूबाट मात्र"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"कुनै पनि होइन"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"अलार्महरू"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"अलार्महरू सधैँ प्राथमिक हुन्छन् र तिनीहरूले ध्वनि बजाउँछन्"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"रिमान्डरहरू"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"घटनाहरू"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"सबै कल गर्ने व्यक्तिहरू"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3326,8 +3427,8 @@
     <string name="home_app" msgid="4066188520886810030">"घरेलु अनुप्रयोग"</string>
     <string name="no_default_home" msgid="7184117487704520238">"पूर्वनिर्धारित गृहपृष्ठ छैन"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"स्टार्ट-अप सुरक्षित गर्नुहोस्"</string>
-    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"तपाईंको यन्त्रलाई सुरूवात गर्न ढाँचा आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
-    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"तपाईंको यन्त्र सुरूवात गर्न PIN आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
+    <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"तपाईंको यन्त्रलाई सुरुवात गर्न ढाँचा आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
+    <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"तपाईंको यन्त्र सुरुवात गर्न PIN आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"तपाईंको यन्त्र स्टार्ट अप गर्न पासवर्ड आवश्यक छ। यन्त्र बन्द हुँदा, यसले कल, सन्देश, सूचना, वा अलार्महरू प्राप्त गर्न सक्दैन।"</string>
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"अर्को फिंगरप्रिन्ट थप्नुहोस्"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"अर्को औँलाको प्रयोग गरी अनलक गर्नुहोस्"</string>
@@ -3383,8 +3484,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>
@@ -3453,27 +3553,34 @@
     <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_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="assist_gesture_title" msgid="7746563137898655539">"सहायतामूलक इसारा"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"संवेदनशीलता"</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="gesture_setting_on" msgid="3455094265233870280">"सक्रिय"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"निष्क्रिय"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"बुटलोडर पहिले नै अनलक गरिएको छ"</string>
@@ -3494,6 +3601,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"कार्य सम्बन्धी डेटा स्वत: सिंक गर्नुहोस्"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"अनुप्रयोगहरूलाई स्वत: डेटालाई ताजा पार्न दिनुहोस्"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"खाताको सिंक"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> मध्ये <xliff:g id="ID_1">%1$d</xliff:g> वस्तुहरूका लागि सिंक गर्ने सेवा सक्रिय छ"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"सबै वस्तुहरूका लागि सिंक गर्ने सेवा सक्रिय छ"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"सबै वस्तुहरूका लागि सिंक गर्ने सेवा निष्क्रिय छ"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"व्यवस्थित गरिएको यन्त्रको जानकारी"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"तपाईंको संगठनले व्यवस्थापन गरेका परिवर्तन र सेटिङहरू"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ले व्यवस्थापन गरेका परिवर्तन र सेटिङहरू  "</string>
@@ -3574,6 +3684,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 +3698,11 @@
     <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="698847081680980774">"सेटिङहरूको गृहपृष्ठमा नयाँ र रोमाञ्चक के छ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"शीर्ष ५ सुविधाहरू हेर्नुहोस्"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS दर्ताको स्थिति"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"दर्ता गरिएको"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"दर्ता नगरिएको"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 133809b560884a4cf3b079ff29c665f0d9656d0e..f71a6ad1d78b8d5b3b3351bf717495381b77141d 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 7fa6fd42089a27c24be55b637a3adbac5d410f56..263dddd005b7fbbe576032d94e800332e1f45991 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) -->
@@ -281,8 +293,8 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"Datagebruik via mobiel netwerk toestaan"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Geg.gebr. bij roaming toestaan"</string>
     <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met gegevensservices tijdens roaming"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met gegevensservices tijdens roaming"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met dataservices tijdens roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met dataservices tijdens roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"De gegevensverbinding is verbroken, omdat je je thuisnetwerk hebt verlaten terwijl gegevensroaming was uitgeschakeld."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Inschakelen"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Er kunnen hoge kosten in rekening worden gebracht."</string>
@@ -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,39 @@
     <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">"Raak de sensor aan"</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">"Raak de sensor aan"</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">"Til op en raak opnieuw aan"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Later doen"</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 +460,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>
@@ -486,19 +499,19 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"De apparaatbeveiliging werkt niet zonder je patroon."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"De apparaatbeveiliging werkt niet zonder je patroon.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"De apparaatbeveiliging werkt niet zonder je pincode."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"De apparaatbeveiliging werkt niet zonder je pincode.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"De apparaatbeveiliging werkt niet zonder je wachtwoord."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"De apparaatbeveiliging werkt niet zonder je wachtwoord.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"De apparaatbeveiliging werkt niet zonder je schermvergendeling."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"De apparaatbeveiliging werkt niet zonder je schermvergendeling.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
+</xliff:g>Je opgeslagen vingerafdrukken worden ook verwijderd van dit apparaat en het is niet mogelijk je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps zonder deze vingerafdrukken."</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Functies voor profielbeveiliging werken niet zonder je patroon."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Functies voor profielbeveiliging werken niet zonder je patroon.<xliff:g id="EMPTY_LINE">
 
@@ -519,13 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wifi automatisch inschakelen"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wifi wordt opnieuw ingeschakeld in de buurt van opgeslagen netwerken van hoge kwaliteit, zoals je thuisnetwerk"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Niet beschikbaar omdat scannen naar wifi is uitgeschakeld"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Selecteer een provider van netwerkbeoordelingen om deze optie te gebruiken"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Slechte verbindingen vermijden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Alleen netwerken gebruiken met een goede internetverbinding"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Verbinding maken met open netwerken"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatisch verbinding maken met openbare netwerken van hoge kwaliteit"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Selecteer een provider van netwerkbeoordelingen om deze optie te gebruiken"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Selecteer een geschikte provider van netwerkbeoordelingen om deze optie te gebruiken"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Certificaten installeren"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Systeem-apps en services kunnen nog steeds zoeken naar wifi-netwerken 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Schakel scannen via wifi in via de <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scaninstellingen<xliff:g id="LINK_END_1">LINK_END</xliff:g> om de locatienauwkeurigheid te verbeteren."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Altijd aan (hoger batterijverbruik)"</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="6978257596231155345">"Geef tijd, meldingspictogrammen en andere informatie weer. Hoger batterijverbruik."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je bent momenteel aangemeld bij de volgende accounts:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Er zijn andere gebruikers aanwezig op dit apparaat.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Providers op e-simkaart"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Hierdoor wordt je mobiele abonnement niet opgezegd."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB-opslag wissen"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Schermlezers, display, interactieopties"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Optische instellingen"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Je kunt dit apparaat aanpassen aan je behoeften. Deze toegankelijkheidsfuncties kunnen later worden gewijzigd in Instellingen."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Lettergrootte vergroten"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Schermlezers"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio en tekst op het scherm"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"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 stoppen.\n\nAls dit blijft gebeuren, moet je de app mogelijk verwijderen om de prestaties van de batterij te verbeteren."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"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 stoppen.\n\nAls dit blijft gebeuren, moet je de app mogelijk verwijderen om de prestaties van de batterij te verbeteren."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"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 stoppen.\n\nAls dit blijft gebeuren, moet je de app mogelijk verwijderen om de prestaties van de batterij te verbeteren."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Je telefoon kan de batterij niet normaal beheren omdat <xliff:g id="APP_0">%1$s</xliff:g> je telefoon ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je <xliff:g id="APP_1">%1$s</xliff:g> stoppen.\n\nAls dit blijft gebeuren, moet je de app mogelijk verwijderen om de prestaties van de batterij te verbeteren."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Je tablet kan de batterij niet normaal beheren omdat <xliff:g id="APP_0">%1$s</xliff:g> je tablet ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je <xliff:g id="APP_1">%1$s</xliff:g> stoppen.\n\nAls dit blijft gebeuren, moet je de app mogelijk verwijderen om de prestaties van de batterij te verbeteren."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Je apparaat kan de batterij niet normaal beheren omdat <xliff:g id="APP_0">%1$s</xliff:g> je apparaat ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je <xliff:g id="APP_1">%1$s</xliff:g> stoppen.\n\nAls dit blijft gebeuren, moet je de app mogelijk verwijderen om de prestaties van de batterij te verbeteren."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"App stoppen"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Achtergrondgebruik uitschakelen en app stoppen?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Je telefoon kan de batterij niet normaal beheren omdat <xliff:g id="APP_0">%1$s</xliff:g> je telefoon ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je <xliff:g id="APP_1">%1$s</xliff:g> stoppen en voorkomen dat deze app op de achtergrond wordt uitgevoerd."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Je tablet kan de batterij niet normaal beheren omdat <xliff:g id="APP_0">%1$s</xliff:g> je tablet ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je <xliff:g id="APP_1">%1$s</xliff:g> stoppen en voorkomen dat deze app op de achtergrond wordt uitgevoerd."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Je apparaat kan de batterij niet normaal beheren omdat <xliff:g id="APP_0">%1$s</xliff:g> je apparaat ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je <xliff:g id="APP_1">%1$s</xliff:g> stoppen en 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uitsplitsing sinds laatste volledige lading"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Laatste volledige lading"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Resterende batterijtijd is een schatting en hangt af van het gebruik"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"De batterijgebruiksgegevens zijn bij benadering en kunnen veranderen op basis van het gebruik"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Tijdens actief gebruik"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Wanneer op de achtergrond"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batterijgebruik"</string>
@@ -2336,8 +2417,8 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Wijzigingen die je op internet aanbrengt in je accounts, worden automatisch naar je telefoon gekopieerd.\n\nBij sommige accounts worden mogelijk ook de wijzigingen die je op de tablet aanbrengt, naar internet gekopieerd. Dit geldt bijvoorbeeld voor Google-accounts."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Wijzigingen die je op internet aanbrengt in je accounts, worden automatisch naar je telefoon gekopieerd.\n\nBij sommige accounts worden mogelijk ook de wijzigingen die je op de telefoon aanbrengt, naar internet gekopieerd. Dit geldt bijvoorbeeld voor Google-accounts."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Auto-synchr. uitschakelen?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hiermee beperk je gegevens- en batterijgebruik. Je moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. Je ontvangt geen meldingen wanneer er updates zijn."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Herzieningsdatum voor gebruikscyclus"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hiermee beperk je data- en batterijgebruik. Je moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. Je ontvangt geen meldingen wanneer er updates zijn."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum voor resetten gebruikscyclus"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum van elke maand:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ingesteld"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Waarschuwing voor gegevensverbruik instellen"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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">"Machtigingen, standaard-apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Gebruikers en accounts"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"schuiven om te ontgrendelen, wachtwoord, patroon, pincode"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"werkuitdaging, werk, profiel"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"werkprofiel, beheerd profiel, gelijkschakelen, unificatie, werk, profiel"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gebaar"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gebaren"</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_assist_gesture_launch" msgid="813968759791342591">"gebaar"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Scherm-in-scherm"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Scherm-in-scherm toestaan"</string>
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Geef deze app toestemming om een scherm-in-scherm-venster 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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Alleen van contacten met ster"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Geen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmen"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmen hebben altijd prioriteit en maken geluid"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Herinneringen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Evenementen"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle bellers"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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 data"</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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Aan"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Uit"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader is al ontgrendeld"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Werkgegevens automatisch synchroniseren"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Apps gegevens automatisch laten vernieuwen"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Accountsynchronisatie"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Synchronisatie is ingeschakeld voor <xliff:g id="ID_1">%1$d</xliff:g> van de <xliff:g id="ID_2">%2$d</xliff:g> items"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Synchronisatie is ingeschakeld voor alle items"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Synchronisatie is uitgeschakeld voor alle items"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informatie over beheerd apparaat"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Wijzigingen en instellingen beheerd door je organisatie"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Wijzigingen en instellingen beheerd door <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Wat is er nieuw en interessant?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"De vijf belangrijkste functies controleren"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-registratiestatus"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Geregistreerd"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Niet geregistreerd"</string>
 </resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 9764754d381ce380296563a1de8900a9d2583df2..3fb9662d2ea89a88e2b66d64512e762815549ca2 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -84,7 +84,7 @@
     <item msgid="8878186979715711006">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</item>
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
     <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਪ੍ਰਮਾਣਿਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
-    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ IP ਪਤਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ IP ਪਤਾ ਪ੍ਰਾਪਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</item>
     <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</item>
     <item msgid="1330262655415760617">"ਮੁਅੱਤਲ ਕੀਤਾ"</item>
     <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
@@ -122,8 +122,8 @@
     <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ਪੁਸ਼ ਬਟਨ"</item>
-    <item msgid="1624323946324499595">"ਪੀਅਰ ਡੀਵਾਈਸ ਦਾ PIN"</item>
-    <item msgid="5366790421523328066">"ਇਸ ਡੀਵਾਈਸ ਤੋਂ PIN"</item>
+    <item msgid="1624323946324499595">"ਪੀਅਰ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ"</item>
+    <item msgid="5366790421523328066">"ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"ਕਨੈਕਟ ਕੀਤਾ"</item>
@@ -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>
@@ -244,7 +234,7 @@
     <item msgid="255608127647030286">"ਨਿੱਜੀ"</item>
     <item msgid="4588829735729884491">"ਮੈਸੇਂਜ਼ਿੰਗ"</item>
     <item msgid="886742181977884584">"ਮੀਡੀਆ"</item>
-    <item msgid="7924928667052300589">"ਡੀਵਾਈਸ:"</item>
+    <item msgid="7924928667052300589">"ਡੀਵਾਈਸ"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"ਕੋਰਸ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</item>
@@ -257,14 +247,14 @@
     <item msgid="6546959730920410907">"ਕਾਲ ਲੌਗ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</item>
     <item msgid="446877710771379667">"ਕੈਲੰਡਰ ਪੜ੍ਹੋ"</item>
     <item msgid="7674458294386319722">"ਕੈਲੰਡਰ ਸੰਸ਼ੋਧਿਤ ਕਰੋੇ"</item>
-    <item msgid="8281201165558093009">"wi-fi ਸਕੈਨ"</item>
+    <item msgid="8281201165558093009">"ਵਾਈ-ਫਾਈ ਸਕੈਨ"</item>
     <item msgid="8694611243479480497">"ਸੂਚਨਾ"</item>
     <item msgid="7776439107987345446">"ਸੈਲ ਸਕੈਨ"</item>
-    <item msgid="514615766544675057">"ਫੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
+    <item msgid="514615766544675057">"ਫ਼ੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
     <item msgid="8181415497109310680">"SMS ਪੜ੍ਹੋ"</item>
     <item msgid="6816551144382117307">"SMS ਲਿਖੋ"</item>
     <item msgid="4600463921908905030">"SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
-    <item msgid="5958926493289432745">"ਐਮਰਜੈਂਸੀ SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
+    <item msgid="5958926493289432745">"ਸੰਕਟਕਾਲੀਨ SMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="4945269495221089540">"MMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="5570472453573929087">"WAP ਪੁਸ਼ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="7125408150230860501">"SMS ਭੇਜੋ"</item>
@@ -274,17 +264,17 @@
     <item msgid="1545733463471924009">"ਟੌਪ ਤੇ ਡ੍ਰਾ ਕਰੋ"</item>
     <item msgid="3609046903962454582">"ਪਹੁੰਚ ਸੂਚਨਾਵਾਂ"</item>
     <item msgid="4671646036128214513">"ਕੈਮਰਾ"</item>
-    <item msgid="1097324338692486211">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</item>
-    <item msgid="5031552983987798163">"ਔਡੀਓ ਪਲੇ ਕਰੋ"</item>
+    <item msgid="1097324338692486211">" ਆਡੀਓ  ਰਿਕਾਰਡ ਕਰੋ"</item>
+    <item msgid="5031552983987798163">" ਆਡੀਓ  ਪਲੇ ਕਰੋ"</item>
     <item msgid="8374996688066472414">"ਕਲਿਪਬੋਰਡ ਪੜ੍ਹੋ"</item>
     <item msgid="3045529469061083747">"ਕਲਿਪਬੋਰਡ ਬਦਲੋ"</item>
     <item msgid="5124443975763747838">"ਮੀਡੀਆ ਬਟਨ"</item>
-    <item msgid="4547883971364273343">"ਔਡੀਓ ਫੋਕਸ"</item>
+    <item msgid="4547883971364273343">" ਆਡੀਓ  ਫੋਕਸ"</item>
     <item msgid="2603878814882344450">"ਮਾਸਟਰ ਵੌਲਿਊਮ"</item>
     <item msgid="7136963238377062018">"ਅਵਾਜ਼ ਵੋਲਯੂਮ"</item>
-    <item msgid="4270236897655923007">"ਰਿੰਗ ਵੌਲਿਊਮ"</item>
-    <item msgid="6325739889222559394">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</item>
-    <item msgid="5762123934816216821">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</item>
+    <item msgid="4270236897655923007">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="6325739889222559394">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="5762123934816216821">"ਅਲਾਰਮ ਦੀ ਅਵਾਜ਼"</item>
     <item msgid="785049718065337473">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</item>
     <item msgid="6700305533746877052">"bluetooth ਵੌਲਿਊਮ"</item>
     <item msgid="2029227495214047094">"ਸਕਿਰਿਆ ਰੱਖੋ"</item>
@@ -292,13 +282,13 @@
     <item msgid="5753382310468855812">"ਉੱਚ ਪਾਵਰ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਨਿਰੀਖਣ ਕਰੋ"</item>
     <item msgid="3356591542543137332">"ਵਰਤੋਂ ਸਟੈਟਸ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="3073734345226842233">"ਮਾਈਕ੍ਰੋਫੋਨ ਨੂੰ ਮਿਊਟ/ਅਨਮਿਊਟ ਕਰੋ"</item>
-    <item msgid="2111767435887685265">"ਟੋਸਟ ਵਿਖਾਓ"</item>
+    <item msgid="2111767435887685265">"ਟੋਸਟ  ਦਿਖਾਓ"</item>
     <item msgid="1091168669714823370">"ਪ੍ਰੋਜੈਕਟ ਮੀਡੀਆ"</item>
     <item msgid="485564189219029300">"VPN ਨੂੰ ਸਰਗਰਮ ਕਰੋ"</item>
     <item msgid="7155384795265164395">"ਵਾਲਪੇਪਰ ਲਿਖੋ"</item>
     <item msgid="1835836196806147034">"ਸਹਾਇਕ ਬਣਤਰ"</item>
     <item msgid="5989890403088155055">"ਸਹਾਇਕ ਸਕਰੀਨਸ਼ਾਟ"</item>
-    <item msgid="8582699692765917557">"ਫੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
+    <item msgid="8582699692765917557">"ਫ਼ੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
     <item msgid="1474039653814954902">"ਵੌਇਸਮੇਲ ਸ਼ਾਮਲ ਕਰੋ"</item>
     <item msgid="7222837656938871633">"SIP ਵਰਤੋ"</item>
     <item msgid="6108267038969274380">"ਆਊਟਗੋਇੰਗ ਕਾਲ \'ਤੇ ਪ੍ਰਕਿਰਿਆ ਕਰੋ"</item>
@@ -311,7 +301,7 @@
     <item msgid="6628873315024166197">"ਸਕਰੀਨ ਚਾਲੂ ਕਰੋ"</item>
     <item msgid="3253368931113490863">"ਖਾਤੇ ਲਓ"</item>
     <item msgid="780392378084812901">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ"</item>
-    <item msgid="2629748510881309577">"ਪਹੁੰਚਯੋਗਤਾ ਵੌਲਿਊਮ"</item>
+    <item msgid="2629748510881309577">"ਪਹੁੰਚਯੋਗਤਾ ਅਵਾਜ਼"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ਟਿਕਾਣਾ"</item>
@@ -327,7 +317,7 @@
     <item msgid="1638204101698708656">"ਟਿਕਾਣਾ"</item>
     <item msgid="2154671955760380322">"ਸੂਚਨਾ ਪੋਸਟ ਕਰੋ"</item>
     <item msgid="4282477730595931828">"ਟਿਕਾਣਾ"</item>
-    <item msgid="4891423912898525905">"ਫੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
+    <item msgid="4891423912898525905">"ਫ਼ੋਨ ਤੇ ਕਾਲ ਕਰੋ"</item>
     <item msgid="2623604824935968113">"SMS/MMS ਪੜ੍ਹੋ"</item>
     <item msgid="4420177125221176306">"SMS/MMS ਲਿਖੋ"</item>
     <item msgid="3986142739951490025">"SMS/MMS ਪ੍ਰਾਪਤ ਕਰੋ"</item>
@@ -341,17 +331,17 @@
     <item msgid="736541391767350377">"ਟੌਪ ਤੇ ਡ੍ਰਾ ਕਰੋ"</item>
     <item msgid="5530815681721654194">"ਪਹੁੰਚ ਸੂਚਨਾਵਾਂ"</item>
     <item msgid="781213371706962767">"ਕੈਮਰਾ"</item>
-    <item msgid="1720492593061838172">"ਔਡੀਓ ਰਿਕਾਰਡ ਕਰੋ"</item>
-    <item msgid="3493046322001257041">"ਔਡੀਓ ਪਲੇ ਕਰੋ"</item>
+    <item msgid="1720492593061838172">" ਆਡੀਓ  ਰਿਕਾਰਡ ਕਰੋ"</item>
+    <item msgid="3493046322001257041">" ਆਡੀਓ  ਪਲੇ ਕਰੋ"</item>
     <item msgid="136815868796597058">"ਕਲਿਪਬੋਰਡ ਪੜ੍ਹੋ"</item>
     <item msgid="5238692940326972503">"ਕਲਿਪਬੋਰਡ ਬਦਲੋ"</item>
     <item msgid="5753789168376302997">"ਮੀਡੀਆ ਬਟਨ"</item>
-    <item msgid="3265262911688671938">"ਔਡੀਓ ਫੋਕਸ"</item>
+    <item msgid="3265262911688671938">" ਆਡੀਓ  ਫੋਕਸ"</item>
     <item msgid="2098976479485046797">"ਮਾਸਟਰ ਵੌਲਿਊਮ"</item>
     <item msgid="5660213838861789350">"ਵੌਇਸ ਵੌਲਿਊਮ"</item>
-    <item msgid="7983336752371254444">"ਰਿੰਗ ਵੌਲਿਊਮ"</item>
-    <item msgid="7878027809189330917">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</item>
-    <item msgid="7260546305036218513">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</item>
+    <item msgid="7983336752371254444">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="7878027809189330917">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</item>
+    <item msgid="7260546305036218513">"ਅਲਾਰਮ ਦੀ ਅਵਾਜ਼"</item>
     <item msgid="9103719301075748925">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</item>
     <item msgid="7025966722295861512">"Bluetooth ਵੌਲਿਊਮ"</item>
     <item msgid="4665183401128289653">"ਸਕਿਰਿਆ ਰੱਖੋ"</item>
@@ -359,13 +349,13 @@
     <item msgid="7669257279311110599">"ਟਿਕਾਣਾ"</item>
     <item msgid="3459320345690097795">"ਵਰਤੋਂ ਸਟੈਟਸ ਪ੍ਰਾਪਤ ਕਰੋ"</item>
     <item msgid="1312534577834048535">"ਮਾਈਕ੍ਰੋਫੋਨ ਨੂੰ ਮਿਊਟ/ਅਨਮਿਊਟ ਕਰੋ"</item>
-    <item msgid="427580389823724225">"ਟੋਸਟ ਵਿਖਾਓ"</item>
+    <item msgid="427580389823724225">"ਟੋਸਟ  ਦਿਖਾਓ"</item>
     <item msgid="4992007785575926253">"ਪ੍ਰੋਜੈਕਟ ਮੀਡੀਆ"</item>
     <item msgid="2482631530338029480">"VPN ਨੂੰ ਸਰਗਰਮ ਕਰੋ"</item>
     <item msgid="1662979573471871926">"ਵਾਲਪੇਪਰ ਲਿਖੋ"</item>
     <item msgid="5964768335278263478">"ਸਹਾਇਕ ਬਣਤਰ"</item>
     <item msgid="2657138701132782702">"ਸਹਾਇਕ ਸਕਰੀਨਸ਼ਾਟ"</item>
-    <item msgid="8571369610363539266">"ਫੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
+    <item msgid="8571369610363539266">"ਫ਼ੋਨ ਸਥਿਤੀ ਪੜ੍ਹੋ"</item>
     <item msgid="4542463358215230845">"ਵੌਇਸਮੇਲ ਸ਼ਾਮਲ ਕਰੋ"</item>
     <item msgid="864565065016166003">"SIP ਵਰਤੋ"</item>
     <item msgid="1958009349883195116">"ਆਊਟਗੋਇੰਗ ਕਾਲ \'ਤੇ ਪ੍ਰਕਿਰਿਆ ਕਰੋ"</item>
@@ -378,7 +368,7 @@
     <item msgid="5832543806893763620">"ਸਕਰੀਨ ਚਾਲੂ ਕਰੋ"</item>
     <item msgid="5258373962467495905">"ਖਾਤੇ ਲਓ"</item>
     <item msgid="334625385979270703">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ"</item>
-    <item msgid="9039213578110332702">"ਪਹੁੰਚਯੋਗਤਾ ਵੌਲਿਊਮ"</item>
+    <item msgid="9039213578110332702">"ਪਹੁੰਚਯੋਗਤਾ ਅਵਾਜ਼"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ਘੱਟ"</item>
@@ -423,7 +413,7 @@
     <item msgid="758587126802411846">"ਸਫ਼ੈਦ \'ਤੇ ਕਾਲਾ"</item>
     <item msgid="1495307195241623402">"ਕਾਲੇ \'ਤੇ ਪੀਲਾ"</item>
     <item msgid="6039700130994371612">"ਨੀਲੇ \'ਤੇ ਪੀਲਾ"</item>
-    <item msgid="7169235156349580064">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ"</item>
+    <item msgid="7169235156349580064">"ਵਿਉਂਂਤੀ"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP VPN"</item>
@@ -464,7 +454,7 @@
     <item msgid="5779398140277006695">"ਟੌਪ ਗਤੀਵਿਧੀ"</item>
     <item msgid="1439598363694578255">"ਮਹੱਤਵਪੂਰਣ (ਫੋਰਗ੍ਰਾਉਂਡ)"</item>
     <item msgid="3396458970745718652">"ਮਹੱਤਵਪੂਰਣ (ਪਿਛੋਕੜ)"</item>
-    <item msgid="5214825238247511992">"ਬੈਕਅਪ ਕਰੋ"</item>
+    <item msgid="5214825238247511992">"ਬੈਕਅੱਪ"</item>
     <item msgid="311372689168254967">"ਹੈਵੀ ਵੇਟ"</item>
     <item msgid="7438189122367820362">"ਸੇਵਾ (ਚੱਲ ਰਹੀ ਹੈ)"</item>
     <item msgid="918687422516982498">"ਸੇਵਾ (ਰੀਸਟਾਰਟ ਕਰ ਰਿਹਾ ਹੈ)"</item>
@@ -472,7 +462,7 @@
     <item msgid="6782857406100845127">"ਹੋਮ"</item>
     <item msgid="2860945127596974299">"ਪਿਛਲੀ ਗਤੀਵਿਧੀ"</item>
     <item msgid="8610560843693675830">"ਕੈਚ ਕੀਤੀ (ਗਤੀਵਿਧੀ)"</item>
-    <item msgid="4338089220026248848">"ਕੈਚ ਕੀਤੀ (ਗਤੀਵਿਧੀ ਕਲਾਈਂਟ)"</item>
+    <item msgid="4338089220026248848">"ਕੈਸ਼ ਕੀਤੀ (ਗਤੀਵਿਧੀ ਕਲਾਇੰਟ)"</item>
     <item msgid="6652164677254579050">"ਕੈਚ ਕੀਤੀ (ਖਾਲੀ)"</item>
   </string-array>
   <string-array name="color_picker">
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 522621e09c3033ca99150754e02807e44d7231fc..8112c2d2db6302eba1628f564242f65bc744a66d 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -22,7 +22,7 @@
     <string name="allow" msgid="3349662621170855910">"ਆਗਿਆ ਦਿਓ"</string>
     <string name="deny" msgid="6947806159746484865">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ਬੰਦ ਕਰੋ"</string>
-    <string name="dlg_switch" msgid="6243971420240639064">"ਸਵਿਚ ਕਰੋ"</string>
+    <string name="dlg_switch" msgid="6243971420240639064">"ਸਵਿੱਚ ਕਰੋ"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ਅਗਿਆਤ"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
       <item quantity="one">ਤੁਸੀਂ ਹੁਣ ਇੱਕ ਵਿਕਾਸਕਾਰ ਬਣਨ ਤੋਂ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ਕਦਮ ਦੂਰ ਹੋ।</item>
@@ -30,19 +30,21 @@
     </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>
+    <string name="header_category_device" msgid="4544026001618307754">"ਡੀਵਾਈਸ"</string>
     <string name="header_category_personal" msgid="3310195187905720823">"ਨਿੱਜੀ"</string>
     <string name="header_category_access" msgid="7580499097416970962">"ਪਹੁੰਚ"</string>
     <string name="header_category_system" msgid="2816866961183068977">"ਸਿਸਟਮ"</string>
-    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ਡੈੈਟਾ ਕਨੈਕਸ਼ਨ ਯੋਗ ਬਣਾਓ"</string>
-    <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਅਯੋਗ ਬਣਾਓ"</string>
+    <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਬੰਦ ਕਰੋ"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ਪ੍ਰੋਵਿਨਜਨਡ"</string>
-    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"ਵੀਡੀਓ ਕਾਲਿੰਗ ਦੀ ਪ੍ਰੋਵੀਜ਼ਨ ਕੀਤੀ ਗਈ"</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_viewADN" msgid="7069468158519465139">"ਸਿਮ ਪਤਾ ਬੁੱਕ ਦੇਖੋ"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"ਫਿਕਸਡ ਡਾਇਲਿੰਗ ਨੰਬਰ ਦੇਖੋ"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"ਸੇਵਾ ਡਾਇਲਿੰਗ ਨੰਬਰ ਦੇਖੋ"</string>
     <string name="radioInfo_menu_getIMS" msgid="185171476413967831">"IMS ਸੇਵਾ ਅਵਸਥਾ"</string>
@@ -76,40 +78,47 @@
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB ਸਟੋਰੇਜ ਮਿਟਾਓ"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
-    <string name="preview_pager_content_description" msgid="8926235999291761243">"ਝਲਕ"</string>
-    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"ਝਲਕ, <xliff:g id="NUM_PAGES">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ਪੰਨਾ"</string>
+    <string name="preview_pager_content_description" msgid="8926235999291761243">"ਪੂਰਵ-ਝਲਕ"</string>
+    <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"ਪੂਰਵ-ਝਲਕ, <xliff:g id="NUM_PAGES">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ਪੰਨਾ"</string>
     <string name="font_size_summary" msgid="1690992332887488183">"ਸਕ੍ਰੀਨ \'ਤੇ ਪਈ ਲਿਖਤ ਨੂੰ ਛੋਟਾ ਜਾਂ ਵੱਡਾ ਕਰੋ।"</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"ਛੋਟਾ ਕਰੋ"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"ਵੱਡਾ ਕਰੋ"</string>
     <!-- no translation found for font_size_preview_text (4818424565068376732) -->
     <skip />
     <string name="font_size_preview_text_headline" msgid="7955317408475392247">"ਨਮੂਨਾ ਲਿਖਤ"</string>
-    <string name="font_size_preview_text_title" msgid="1310536233106975546">"ਔਜ਼ ਦਾ ਨਿਰਾਲਾ ਜਾਦੂਗਰ"</string>
+    <string name="font_size_preview_text_title" msgid="1310536233106975546">"ਔਜ਼ ਦਾ ਨਿਰਾਲਾ ਵਿਜ਼ਾਰਡ"</string>
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"ਪਾਠ 11: ਔਜ਼ ਦਾ ਹੀਰਿਆਂ-ਪੰਨਿਆਂ ਵਾਲਾ ਨਿਰਾਲਾ ਸ਼ਹਿਰ"</string>
-    <string name="font_size_preview_text_body" msgid="2846183528684496723">"ਹਰੇ ਰੰਗ ਦੀਆਂ ਐਨਕਾਂ ਲਗਾ ਕੇ ਵੀ ਡੋਰਥੀ ਅਤੇ ਉਸ ਦੇ ਦੋਸਤ ਨਿਰਾਲੇ ਸ਼ਹਿਰ ਦੀ ਚਮਕ-ਦਮਕ ਵੇਖ ਕੇ ਹੈਰਾਨ ਸਨ। ਹਰੇ ਰੰਗ ਦੇ ਮਾਰਬਲ ਨਾਲ ਬਣੇ ਹੋਏ ਸੁੰਦਰ ਘਰ, ਗਲੀਆਂ ਵਿੱਚ ਕਤਾਰਬੱਧ ਸਨ ਅਤੇ ਉਹਨਾਂ ਵਿੱਚ ਚਮਕਦੇ ਪੰਨੇ ਜੜੇ ਹੋਏ ਸਨ। ਉਹ ਉਸੇ ਹਰੇ ਮਾਰਬਲ ਦੇ ਫੁੱਟਪਾਥ \'ਤੇ ਪੈਦਲ ਤੁਰ ਪਏ, ਅਤੇ ਜਿੱਥੇ ਆਲੇ-ਦੁਆਲੇ ਰੱਖੇ ਹੋਏ ਮਾਰਬਲ ਪੱਥਰ ਆਪਸ ਵਿੱਚ ਜੁੜਦੇ ਸਨ ਉੱਥੇ ਨੇੜੇ-ਨੇੜੇ ਲਗਾਏ ਗਏ ਪੰਨਿਆਂ ਦੀਆਂ ਕਤਾਰਾਂ ਸਨ ਅਤੇ ਧੁੱਪ ਵਿੱਚ ਚਮਕ ਰਹੀਆਂ ਸਨ। ਖਿੜਕੀਆਂ ਦੇ ਸ਼ੀਸ਼ੇ ਹਰੇ ਰੰਗ ਦੇ ਸਨ; ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਹਿਰ ਦੇ ਉੱਤੇ ਅਸਮਾਨ ਵਿੱਚ ਵੀ ਹਰੇ ਰੰਗ ਦੀ ਭਾਅ ਸੀ, ਅਤੇ ਸੂਰਜ ਦੀਆਂ ਕਿਰਨਾਂ ਵੀ ਹਰੇ ਰੰਗ ਦੀਆਂ ਸਨ। \n\nਉੱਥੇ ਬਹੁਤ ਸਾਰੇ ਲੋਕ, ਆਦਮੀ, ਔਰਤਾਂ, ਅਤੇ ਬੱਚੇ ਘੁੰਮ ਰਹੇ ਸਨ, ਅਤੇ ਉਹਨਾਂ ਨੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ ਪਾਏ ਹੋਏ ਸਨ ਅਤੇ ਉਹਨਾਂ ਦੀ ਚਮੜੀ ਦਾ ਰੰਗ ਵੀ ਹਰਾ ਹੀ ਸੀ। ਉੁਹਨਾਂ ਨੇ ਡੋਰਥੀ ਅਤੇ ਉਸਦੇ ਅਜੀਬੋ-ਗਰੀਬ ਦੋਸਤਾਂ ਵੱਲ ਹੈਰਾਨੀ ਭਰੀਆਂ ਨਜ਼ਰਾਂ ਨਾਲ ਵੇਖਿਆ, ਅਤੇ ਜਦੋਂ ਬੱਚਿਆਂ ਨੇ ਸ਼ੇਰ ਨੂੰ ਵੇਖਿਆ ਤਾਂ ਸਾਰੇ ਬੱਚੇ ਭੱਜ ਗਏ ਅਤੇ ਆਪਣੀਆਂ ਮਾਵਾਂ ਦੇ ਪਿੱਛੇ ਜਾ ਕੇ ਲੁਕ ਗਏ; ਪਰ ਕਿਸੇ ਨੇ ਵੀ ਉਹਨਾਂ ਨਾਲ ਗੱਲ ਨਹੀਂ ਕੀਤੀ। ਗਲੀ ਵਿੱਚ ਬਹੁਤ ਸਾਰੀਆਂ ਦੁਕਾਨਾਂ ਸਨ, ਅਤੇ ਡੋਰਥੀ ਨੇ ਵੇਖਿਆ ਕਿ ਉੱਥੇ ਸਭ ਕੁਝ ਹਰੇ ਰੰਗ ਦਾ ਹੀ ਸੀ। ਹਰੇ ਰੰਗ ਦੀਆਂ ਟੌਫੀਆਂ, ਅਤੇ ਹਰੇ ਰੰਗੇ ਦੇ ਮੱਕੀ ਦੇ ਫੁੱਲੇ ਵੇਚੇ ਜਾ ਰਹੇ ਸਨ, ਹਰੇ ਰੰਗ ਦੇ ਬੂਟ ਵੀ, ਹਰੀਆਂ ਟੋਪੀਆਂ, ਅਤੇ ਸਾਰੀਆਂ ਕਿਸਮਾਂ ਦੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ। ਇੱਕ ਥਾਂ \'ਤੇ ਇੱਕ ਵਿਅਕਤੀ ਹਰੇ ਰੰਗ ਦੀ ਸ਼ਕੰਜਵੀ ਵੇਚ ਰਿਹਾ ਸੀ, ਅਤੇ ਜਦੋਂ ਬੱਚੇ ਸ਼ਕੰਜਵੀ ਨੂੰ ਖ਼ਰੀਦ ਰਹੇ ਸਨ ਤਾਂ ਡੋਰਥੀ ਵੇਖ ਸਕਦੀ ਸੀ ਕਿ ਉਹ ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਹਰੇ ਰੰਗ ਦੀਆਂ ਪੈਨੀਆਂ (ਪੈਸੇ) ਦੇ ਰਹੇ ਸਨ। \n\nਇੰਝ ਪ੍ਰਤੀਤ ਹੁੰਦਾ ਸੀ ਕਿ ਉੱਥੇ ਕੋਈ ਘੋੜੇ ਜਾਂ ਕਿਸੇ ਵੀ ਕਿਸਮ ਦੇ ਜਾਨਵਰ ਨਹੀਂ ਸਨ: ਬੰਦੇ ਹਰੇ ਰੰਗ ਦੇ ਛੋਟੇ-ਛੋਟੇ ਗੱਡਿਆਂ ਉੱਤੇ ਚੀਜ਼ਾਂ ਨੂੰ ਇੱਧਰ-ਉੱਧਰ ਲੈ ਕੇ ਜਾ ਰਹੇ ਸਨ, ਜਿੰਨ੍ਹਾਂ ਨੂੰ ਉਹ ਆਪਣੇ ਅੱਗੇ ਧਕੇਲ ਕੇ ਲੈ ਜਾ ਰਹੇ ਸਨ। ਹਰ ਕੋਈ ਖੁਸ਼ ਅਤੇ ਸੰਤੁਸ਼ਟ ਅਤੇ ਖ਼ੁਸ਼ਹਾਲ ਪ੍ਰਤੀਤ ਹੋ ਰਿਹਾ ਸੀ।"</string>
+    <string name="font_size_preview_text_body" msgid="2846183528684496723">"ਹਰੇ ਰੰਗ ਦੀਆਂ ਐਨਕਾਂ ਲਗਾ ਕੇ ਵੀ ਡੋਰਥੀ ਅਤੇ ਉਸ ਦੇ ਦੋਸਤ ਨਿਰਾਲੇ ਸ਼ਹਿਰ ਦੀ ਚਮਕ-ਦਮਕ ਦੇਖ ਕੇ ਹੈਰਾਨ ਸਨ। ਹਰੇ ਰੰਗ ਦੇ ਮਾਰਬਲ ਨਾਲ ਬਣੇ ਹੋਏ ਸੁੰਦਰ ਘਰ, ਗਲੀਆਂ ਵਿੱਚ ਕਤਾਰਬੱਧ ਸਨ ਅਤੇ ਉਹਨਾਂ ਵਿੱਚ ਚਮਕਦੇ ਪੰਨੇ ਜੜੇ ਹੋਏ ਸਨ। ਉਹ ਉਸੇ ਹਰੇ ਮਾਰਬਲ ਦੇ ਫੁੱਟਪਾਥ \'ਤੇ ਪੈਦਲ ਤੁਰ ਪਏ, ਅਤੇ ਜਿੱਥੇ ਆਲੇ-ਦੁਆਲੇ ਰੱਖੇ ਹੋਏ ਮਾਰਬਲ ਪੱਥਰ ਆਪਸ ਵਿੱਚ ਜੁੜਦੇ ਸਨ ਉੱਥੇ ਨੇੜੇ-ਨੇੜੇ ਲਗਾਏ ਗਏ ਪੰਨਿਆਂ ਦੀਆਂ ਕਤਾਰਾਂ ਸਨ ਅਤੇ ਧੁੱਪ ਵਿੱਚ ਚਮਕ ਰਹੀਆਂ ਸਨ। ਖਿੜਕੀਆਂ ਦੇ ਸ਼ੀਸ਼ੇ ਹਰੇ ਰੰਗ ਦੇ ਸਨ; ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਹਿਰ ਦੇ ਉੱਤੇ ਅਸਮਾਨ ਵਿੱਚ ਵੀ ਹਰੇ ਰੰਗ ਦੀ ਭਾਅ ਸੀ, ਅਤੇ ਸੂਰਜ ਦੀਆਂ ਕਿਰਨਾਂ ਵੀ ਹਰੇ ਰੰਗ ਦੀਆਂ ਸਨ। \n\nਉੱਥੇ ਬਹੁਤ ਸਾਰੇ ਲੋਕ, ਆਦਮੀ, ਔਰਤਾਂ, ਅਤੇ ਬੱਚੇ ਘੁੰਮ ਰਹੇ ਸਨ, ਅਤੇ ਉਹਨਾਂ ਨੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ ਪਾਏ ਹੋਏ ਸਨ ਅਤੇ ਉਹਨਾਂ ਦੀ ਚਮੜੀ ਦਾ ਰੰਗ ਵੀ ਹਰਾ ਹੀ ਸੀ। ਉੁਹਨਾਂ ਨੇ ਡੋਰਥੀ ਅਤੇ ਉਸਦੇ ਅਜੀਬੋ-ਗਰੀਬ ਦੋਸਤਾਂ ਵੱਲ ਹੈਰਾਨੀ ਭਰੀਆਂ ਨਜ਼ਰਾਂ ਨਾਲ ਦੇਖਿਆ, ਅਤੇ ਜਦੋਂ ਬੱਚਿਆਂ ਨੇ ਸ਼ੇਰ ਨੂੰ ਦੇਖਿਆ ਤਾਂ ਸਾਰੇ ਬੱਚੇ ਭੱਜ ਗਏ ਅਤੇ ਆਪਣੀਆਂ ਮਾਵਾਂ ਦੇ ਪਿੱਛੇ ਜਾ ਕੇ ਲੁਕ ਗਏ; ਪਰ ਕਿਸੇ ਨੇ ਵੀ ਉਹਨਾਂ ਨਾਲ ਗੱਲ ਨਹੀਂ ਕੀਤੀ। ਗਲੀ ਵਿੱਚ ਬਹੁਤ ਸਾਰੀਆਂ ਦੁਕਾਨਾਂ ਸਨ, ਅਤੇ ਡੋਰਥੀ ਨੇ ਦੇਖਿਆ ਕਿ ਉੱਥੇ ਸਭ ਕੁਝ ਹਰੇ ਰੰਗ ਦਾ ਹੀ ਸੀ। ਹਰੇ ਰੰਗ ਦੀਆਂ ਟੌਫੀਆਂ, ਅਤੇ ਹਰੇ ਰੰਗੇ ਦੇ ਮੱਕੀ ਦੇ ਫੁੱਲੇ ਵੇਚੇ ਜਾ ਰਹੇ ਸਨ, ਹਰੇ ਰੰਗ ਦੇ ਬੂਟ ਵੀ, ਹਰੀਆਂ ਟੋਪੀਆਂ, ਅਤੇ ਸਾਰੀਆਂ ਕਿਸਮਾਂ ਦੇ ਹਰੇ ਰੰਗ ਦੇ ਕੱਪੜੇ। ਇੱਕ ਥਾਂ \'ਤੇ ਇੱਕ ਵਿਅਕਤੀ ਹਰੇ ਰੰਗ ਦੀ ਸ਼ਕੰਜਵੀ ਵੇਚ ਰਿਹਾ ਸੀ, ਅਤੇ ਜਦੋਂ ਬੱਚੇ ਸ਼ਕੰਜਵੀ ਨੂੰ ਖਰੀਦ ਰਹੇ ਸਨ ਤਾਂ ਡੋਰਥੀ ਦੇਖ ਸਕਦੀ ਸੀ ਕਿ ਉਹ ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਹਰੇ ਰੰਗ ਦੀਆਂ ਪੈਨੀਆਂ (ਪੈਸੇ) ਦੇ ਰਹੇ ਸਨ। \n\nਇੰਝ ਪ੍ਰਤੀਤ ਹੁੰਦਾ ਸੀ ਕਿ ਉੱਥੇ ਕੋਈ ਘੋੜੇ ਜਾਂ ਕਿਸੇ ਵੀ ਕਿਸਮ ਦੇ ਜਾਨਵਰ ਨਹੀਂ ਸਨ: ਬੰਦੇ ਹਰੇ ਰੰਗ ਦੇ ਛੋਟੇ-ਛੋਟੇ ਗੱਡਿਆਂ ਉੱਤੇ ਚੀਜ਼ਾਂ ਨੂੰ ਇੱਧਰ-ਉੱਧਰ ਲੈ ਕੇ ਜਾ ਰਹੇ ਸਨ, ਜਿੰਨ੍ਹਾਂ ਨੂੰ ਉਹ ਆਪਣੇ ਅੱਗੇ ਧਕੇਲ ਕੇ ਲੈ ਜਾ ਰਹੇ ਸਨ। ਹਰ ਕੋਈ ਖੁਸ਼ ਅਤੇ ਸੰਤੁਸ਼ਟ ਅਤੇ ਖ਼ੁਸ਼ਹਾਲ ਪ੍ਰਤੀਤ ਹੋ ਰਿਹਾ ਸੀ।"</string>
     <string name="font_size_save" msgid="3450855718056759095">"ਠੀਕ"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB ਸਟੋਰੇਜ"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD ਕਾਰਡ"</string>
-    <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
+    <string name="bluetooth" msgid="5549625000628014477">"ਬਲੂਟੁੱਥ"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"ਸਾਰੀਆਂ ਨੇੜਲੀਆਂ Bluetooth ਡਿਵਾਈਸਾਂ (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>) ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"ਸਾਰੀਆਂ ਨੇੜਲੀਆਂ Bluetooth ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"ਹੋਰਾਂ Bluetooth ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ ਨਹੀਂ"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"ਕੇਵਲ ਪੇਅਰ ਕੀਤੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ ਨਹੀਂ"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"ਦ੍ਰਿਸ਼ਟਤਾ ਦਾ ਸਮਾਂ ਸਮਾਪਤ"</string>
-    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"ਲੌਕ ਵੌਇਸ ਡਾਇਲਿੰਗ"</string>
-    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਲੌਕ ਕੀਤੀ ਹੋਵੇ ਤਾਂ bluetooth ਡਾਇਲਰ ਦੀ ਵਰਤੋਂ ਰੋਕੋ"</string>
-    <string name="bluetooth_devices" msgid="1886018064039454227">"Bluetooth ਡਿਵਾਈਸਾਂ"</string>
+    <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">" ਲਾਕ  ਵੌਇਸ ਡਾਇਲਿੰਗ"</string>
+    <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"ਜਦੋਂ ਸਕ੍ਰੀਨ  ਲਾਕ  ਕੀਤੀ ਹੋਵੇ ਤਾਂ bluetooth ਡਾਇਲਰ ਦੀ ਵਰਤੋਂ ਰੋਕੋ"</string>
+    <string name="bluetooth_devices" msgid="1886018064039454227">"ਬਲੂਟੁੱਥ ਡਿਵਾਈਸਾਂ"</string>
     <string name="bluetooth_device_name" msgid="8415828355207423800">"ਡੀਵਾਈਸ ਦਾ ਨਾਮ"</string>
     <string name="bluetooth_device_details" msgid="4594773497930028085">"ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"ਖਾਤਾ ਨਾਮ ਵਰਤਦੇ ਹੋਏ, ਕੋਈ ਨਾਮ ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ"</string>
     <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_empty_list_user_restricted" msgid="603521233563983689">"ਤੁਹਾਨੂੰ Bluetooth ਸੈਟਿੰਗਾਂ ਬਦਲਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੈ।"</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦਿਖਣਯੋਗ ਹੁੰਦਾ ਹੈ ਜਦੋਂ Bluetooth ਸੈਟਿੰਗਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"</string>
+    <string name="bluetooth_rename_device" msgid="4352483834491958740">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਬਦਲੋ"</string>
+    <string name="bluetooth_rename_button" msgid="1648028693822994566">"ਨਾਮ ਬਦਲੋ"</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>
@@ -118,10 +127,10 @@
     <string name="bluetooth_device" msgid="5291950341750186887">"ਬਿਨਾਂ ਨਾਮ ਦਾ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ"</string>
     <string name="progress_scanning" msgid="192587958424295789">"ਖੋਜ ਰਿਹਾ ਹੈ"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ਕੋਈ ਨੇੜਲੀਆਂ Bluetooth ਡਿਵਾਈਸਾਂ ਨਹੀਂ ਮਿਲੀਆਂ।"</string>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth ਪੇਅਰਿੰਗ ਬੇਨਤੀ"</string>
-    <string name="bluetooth_notif_title" msgid="2485175521845371514">"ਪੇਅਰਿੰਗ ਬੇਨਤੀ"</string>
+    <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>
@@ -137,26 +146,29 @@
     <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"ਇੱਕ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਹੋਰ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ <xliff:g id="TIMEOUT">%2$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ <xliff:g id="TIMEOUT">%2$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ <xliff:g id="TIMEOUT">%1$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ <xliff:g id="TIMEOUT">%1$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
     <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ <xliff:g id="TIMEOUT">%1$d</xliff:g> ਸਕਿੰਟਾਂ ਲਈ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ।"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
-    <string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="bluetooth_turning_on" msgid="4850574877288036646">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਹੋ ਰਿਹਾ ਹੈ…"</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"ਬਲੂਟੁੱਥ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"ਆਟੋ-ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth ਕਨੈਕਸ਼ਨ ਬੇਨਤੀ"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"  ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ਕੀ ਤੁਸੀਂ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ਨਾਲ ਕਨੈਕਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
-    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ਫੋਨ ਬੁੱਕ ਪਹੁੰਚ ਬੇਨਤੀ"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ਫ਼ੋਨ ਬੁੱਕ ਪਹੁੰਚ ਬੇਨਤੀ"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਇਤਿਹਾਸ \'ਤੇ ਪਹੁੰਚ ਕਰਨਾ ਚਾਹੁੁੰਦਾ ਹੈ। ਕੀ <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> ਨੂੰ ਪਹੁੰਚ ਦੇਣੀ ਹੈ?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"ਦੁਬਾਰਾ ਨਾ ਪੁੱਛਣਾ"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"ਦੁਬਾਰਾ ਨਾ ਪੁੱਛਣਾ"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"ਸੁਨੇਹਾ ਪਹੁੰਚ ਬੇਨਤੀ"</string>
     <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_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) -->
@@ -179,25 +191,25 @@
     <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤੀ ਰੂਪ ਸੂਚੀ ਸਹੀ ਢੰਗ ਨਾਲ ਫੌਰਮੈਟ ਨਹੀਂ ਕੀਤੀ ਹੋਈ ਹੈ। ਰੂਪ ਵਾਲੇ ਡੋਮੇਨਾਂ ਦੀ ਇੱਕ ਕਾਮਾ-ਵੱਖ ਕੀਤੀ ਸੂਚੀ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="proxy_error_empty_port" msgid="5539106187558215246">"ਤੁਹਾਨੂੰ ਪੋਰਟ ਖੇਤਰ ਪੂਰਾ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ਜੇਕਰ ਹੋਸਟ ਖੇਤਰ ਖਾਲੀ ਹੈ ਤਾਂ ਪੋਰਟ ਖੇਤਰ ਖਾਲੀ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"</string>
-    <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤਾ ਪੋਰਟ ਪ੍ਰਮਾਣਿਕ ਨਹੀਂ ਹੈ।"</string>
+    <string name="proxy_error_invalid_port" msgid="5988270202074492710">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤਾ ਪੋਰਟ ਵੈਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP ਪ੍ਰੌਕਸੀ ਬ੍ਰਾਊਜ਼ਰ ਵੱਲੋਂ ਵਰਤੀ ਜਾਂਦੀ ਹੈ ਪਰ ਹੋ ਸਕਦਾ ਹੈ ਹੋਰ ਐਪਾਂ ਵੱਲੋਂ ਇਸ ਦੀ ਵਰਤੋਂ ਨਾ ਕੀਤੀ ਜਾ ਸਕੇ।"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"ਸੈੱਲ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ (ਹਟਾਈ ਗਈ):"</string>
     <string name="radio_info_neighboring_location_label" msgid="5766020323342985397">"ਆਂਢ-ਗੁਆਂਢ ਸੈੱਲ ਜਾਣਕਾਰੀ (ਹਟਾਈ ਗਈ):"</string>
     <string name="radio_info_cell_info_refresh_rate" msgid="7062777594049622128">"ਸੈੱਲ ਜਾਣਕਾਰੀ ਮੁੜ-ਤਾਜ਼ਾ ਕਰਨ ਦੀ ਦਰ:"</string>
     <string name="radio_info_cellinfo_label" msgid="6213223844927623098">"ਸਾਰੀ ਸੈੱਲ ਮਾਪ ਜਾਣਕਾਰੀ:"</string>
-    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਰੀਅਲ-ਟਾਈਮ ਜਾਣਕਾਰੀ:"</string>
-    <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"ਡੈਟਾ ਸੇਵਾ:"</string>
+    <string name="radio_info_dcrtinfo_label" msgid="4062076024399431876">"ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਰੀਅਲ-ਟਾਈਮ ਜਾਣਕਾਰੀ:"</string>
+    <string name="radio_info_gprs_service_label" msgid="4209624131644060517">" ਡਾਟਾ  ਸੇਵਾ:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"ਰੋਮਿੰਗ:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
     <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"ਇਸ \'ਤੇ ਕਾਲ ਰੀਡਾਇਰੈਕਟ ਕਰੋ:"</string>
     <string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"ਬੂਟ ਤੋਂ ਬਾਅਦ PPP ਰੀਸੈੱਟ ਦੀ ਗਿਣਤੀ:"</string>
     <string name="radio_info_current_network_label" msgid="9151285540639134945">"ਵਰਤਮਾਨ ਨੈੱਟਵਰਕ:"</string>
-    <string name="radio_info_ppp_received_label" msgid="363579470428151850">"ਡੈਟਾ ਪ੍ਰਾਪਤ ਹੋਇਆ:"</string>
+    <string name="radio_info_ppp_received_label" msgid="363579470428151850">" ਡਾਟਾ  ਪ੍ਰਾਪਤ ਹੋਇਆ:"</string>
     <string name="radio_info_gsm_service_label" msgid="1370863866816125489">"ਵੌਇਸ ਸੇਵਾ:"</string>
     <string name="radio_info_signal_strength_label" msgid="5155734002519307416">"ਸਿਗਨਲ ਸਟ੍ਰੈਂਥ:"</string>
     <string name="radio_info_call_status_label" msgid="2611065018172747413">"ਵੌਇਸ ਕਾਲ ਸਥਿਤੀ:"</string>
-    <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"ਡੈਟਾ ਭੇਜਿਆ ਗਿਆ:"</string>
+    <string name="radio_info_ppp_sent_label" msgid="7748668735880404586">" ਡਾਟਾ  ਭੇਜਿਆ ਗਿਆ:"</string>
     <string name="radio_info_message_waiting_label" msgid="1037302619943328273">"ਸੁਨੇਹਾ ਉਡੀਕ:"</string>
     <string name="radio_info_phone_number_label" msgid="7942153178953255231">"ਫ਼ੋਨ ਨੰਬਰ:"</string>
     <string name="radio_info_band_mode_label" msgid="8730871744887454509">"ਰੇਡੀਓ ਬੈਂਡ ਚੁਣੋ"</string>
@@ -209,7 +221,7 @@
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"HTTP ਕਲਾਇੰਟ ਜਾਂਚ:"</string>
     <string name="ping_test_label" msgid="579228584343892613">"ਪਿੰਗ ਟੈਸਟ ਚਲਾਓ"</string>
     <string name="radio_info_smsc_label" msgid="6399460520126501354">"SMSC:"</string>
-    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"ਅਪਡੇਟ"</string>
+    <string name="radio_info_smsc_update_label" msgid="7258686760358791539">"ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="radio_info_smsc_refresh_label" msgid="6902302130315125102">"ਤਾਜ਼ਾ"</string>
     <string name="radio_info_toggle_dns_check_label" msgid="6625185764803245075">"DNS ਜਾਂਚ ਟੌਗਲ ਕਰੋ"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"OEM-ਵਿਸ਼ੇਸ ਜਾਣਕਾਰੀ/ਸੈਟਿੰਗਾਂ"</string>
@@ -228,12 +240,12 @@
     <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD ਕਾਰਡ ਨੂੰ ਇੱਕ ਮਾਸ ਸਟੋਰੇਜ ਡੀਵਾਈਸ ਦੇ ਤੌਰ ਤੇ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ।"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="5128923500235719226">"ਹੁਣ USB ਸਟੋਰੇਜ ਨੂੰ ਹਟਾਉਣਾ ਸੁਰੱਖਿਅਤ ਹੈ।"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="666233604712540408">"ਹੁਣ SD ਕਾਰਡ ਨੂੰ ਹਟਾਉਣਾ ਸੁਰੱਖਿਅਤ ਹੈ।"</string>
-    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB ਸਟੋਰੇਜ ਵਰਤਣ ਵਿੱਚ ਹੋਣ ਵੇਲੇ ਹੀ ਹਟਾ ਦਿੱਤੀ ਗਈ ਸੀ!"</string>
+    <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB ਸਟੋਰੇਜ ਵਰਤੋਂ ਵਿੱਚ ਹੁੰਦੇ ਹੋਏ ਹੀ ਹਟਾ ਦਿੱਤੀ ਗਈ ਸੀ!"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD ਕਾਰਡ ਵਰਤੋਂ ਵਿੱਚ ਹੋਣ ਵੇਲੇ ਹੀ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਸੀ!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"ਵਰਤੀ ਗਈ ਬਾਈਟਸ:"</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB ਸਟੋਰੇਜ ਲਈ ਮੀਡੀਆ ਕਾਰਡ ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"ਮੀਡੀਆ ਲਈ USB ਸਟੋਰੇਜ ਸਕੈਨ ਹੋ ਰਹੀ ਹੈ…"</string>
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"ਮੀਡੀਆ ਲਈ SD ਕਾਰਡ ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB ਸਟੋਰੇਜ ਰੀਡ-ਓਨਲੀ ਮਾਉਂਟ ਕੀਤੀ।"</string>
+    <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB ਸਟੋਰੇਜ ਸਿਰਫ਼-ਪੜ੍ਹਨ ਲਈ ਮਾਉਂਟ ਕੀਤੀ।"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD ਕਾਰਡ ਰੀਡ-ਓਨਰੀ ਮਾਉਂਟ ਕੀਤਾ ਗਿਆ।"</string>
     <string name="skip_label" msgid="47510779345218297">"ਛੱਡੋ"</string>
     <string name="next_label" msgid="4693520878012668114">"ਅੱਗੇ"</string>
@@ -257,8 +269,8 @@
     <string name="activity_picker_label" msgid="6295660302548177109">"ਗਤੀਵਿਧੀ ਚੁਣੋ"</string>
     <string name="device_info_label" msgid="6551553813651711205">"ਡੀਵਾਈਸ ਜਾਣਕਾਰੀ"</string>
     <string name="display_label" msgid="8074070940506840792">"ਸਕ੍ਰੀਨ"</string>
-    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"ਟੈਬਲੇਟ ਜਾਣਕਾਰੀ"</string>
-    <string name="phone_info_label" product="default" msgid="2127552523124277664">"ਫੋਨ ਜਾਣਕਾਰੀ"</string>
+    <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"ਟੈਬਲੈੱਟ ਜਾਣਕਾਰੀ"</string>
+    <string name="phone_info_label" product="default" msgid="2127552523124277664">"ਫ਼ੋਨ ਜਾਣਕਾਰੀ"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB ਸਟੋਰੇਜ"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD ਕਾਰਡ"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"ਪ੍ਰੌਕਸੀ ਸੈਟਿੰਗਾਂ"</string>
@@ -274,20 +286,20 @@
     <string name="airplane_mode" msgid="8837269988154128601">"ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"ਹੋਰ"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ਵਾਇਰਲੈੱਸ ਅਤੇ ਨੈੱਟਵਰਕ"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, ਏਅਰਪਲੇਨ ਮੋਡ, ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ &amp; VPN ਵਿਵਸਥਿਤ ਕਰੋ"</string>
-    <string name="cellular_data_title" msgid="6835451574385496662">"ਮੋਬਾਈਲ ਡੈਟਾ"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"ਵਾਈ‑ਫਾਈ, ਬਲੂਟੁੱਥ, ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ, ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ &amp; VPN ਪ੍ਰਬੰਧਿਤ ਕਰੋ"</string>
+    <string name="cellular_data_title" msgid="6835451574385496662">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
     <string name="calls_title" msgid="3544471959217176768">"ਕਾਲਾਂ"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS ਸੁਨੇਹੇ"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਡਾਟਾ ਵਰਤੋਂ ਚਾਲੂ ਕਰੋ"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ਰੋਮਿੰਗ ਵੇਲੇ ਡਾਟਾ ਵਰਤੋਂ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="roaming" msgid="3596055926335478572">"ਡਾਟਾ ਰੋਮਿੰਗ"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"ਰੋਮਿੰਗ ਵੇਲੇ ਡੈਟਾ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"ਰੋਮਿੰਗ ਵੇਲੇ ਡੈਟਾ ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"ਰੋਮਿੰਗ ਵੇਲੇ  ਡਾਟਾ  ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"ਰੋਮਿੰਗ ਵੇਲੇ  ਡਾਟਾ  ਸੇਵਾਵਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"ਤੁਹਾਡੀ ਡਾਟਾ ਕਨੈਕਟੀਵਿਟੀ ਨਸ਼ਟ ਹੋ ਗਈ ਹੈ ਕਿਉਂਕਿ ਤੁਸੀਂ ਡਾਟਾ ਰੋਮਿੰਗ ਬੰਦ ਨਾਲ ਆਪਣਾ ਹੋਮ ਨੈੱਟਵਰਕ ਛੱਡ ਦਿੱਤਾ ਸੀ।"</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"ਇਸਤੇ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"ਤੁਹਾਨੂੰ ਵਾਧੂ ਚਾਰਜ ਦੇਣਾ ਪੈ ਸਕਦਾ ਹੈ"</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"ਜਦੋਂ ਤੁਸੀਂ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਖਾਸ ਰੋਮਿੰਗ ਖਰਚੇ ਪੈ ਸਕਦੇ ਹਨ!\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੇਟ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"ਜਦੋਂ ਤੁਸੀਂ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਖਾਸ ਰੋਮਿੰਗ ਖਰਚੇ ਪੈ ਸਕਦੇ ਹਨ!\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਫੋਨ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"ਤੁਹਾਨੂੰ ਵਾਧੂ ਖਰਚਾ ਦੇਣਾ ਪੈ ਸਕਦਾ ਹੈ"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"ਜਦੋਂ ਤੁਸੀਂ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਖਾਸ ਰੋਮਿੰਗ ਖਰਚੇ ਪੈ ਸਕਦੇ ਹਨ!\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"ਜਦੋਂ ਤੁਸੀਂ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦਿੰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਖਾਸ ਰੋਮਿੰਗ ਖਰਚੇ ਪੈ ਸਕਦੇ ਹਨ!\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਫ਼ੋਨ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"ਕੀ ਡਾਟਾ ਰੋਮਿੰਗ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
     <string name="networks" msgid="6333316876545927039">"ਓਪਰੇਟਰ ਚੋਣ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"ਇੱਕ ਨੈੱਟਵਰਕ ਓਪਰੇਟਰ ਚੁਣੋ"</string>
@@ -308,154 +320,155 @@
     <string name="date_time_set_timezone" msgid="5045627174274377814">"ਸਮਾਂ ਜ਼ੋਨ ਚੁਣੋ"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"ਤਾਰੀਖ"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"ਤਾਰੀਖ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ਅਲਫਾਬੈਟਿਕਲੀ ਛਾਂਟੋ"</string>
+    <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"ਵਰਨਮਾਲਾ ਅਨੁਸਾਰ ਛਾਂਟੋ"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"ਸਮਾਂ ਜ਼ੋਨ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"ਤਾਰੀਖ"</string>
     <string name="time_picker_title" msgid="483460752287255019">"ਸਮਾਂ"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"ਸਵੈਚਲਿਤ ਤਰੀਕੇ ਨਾਲ ਲੌਕ ਕਰੋ"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"ਸਵੈਚਲਿਤ ਤਰੀਕੇ ਨਾਲ ਲਾਕ ਕਰੋ"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"ਸਲੀਪ ਤੋਂ ਬਾਅਦ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"ਸਲੀਪ ਦੇ ਤੁਰੰਤ ਬਾਅਦ, ਇਸਦੇ ਸਿਵਾਏ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਨਲੌਕ ਨਾ ਰੱਖਿਆ ਗਿਆ ਹੋਵੇ"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"ਸਲੀਪ ਤੋਂ ਬਾਅਦ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>, ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> ਵੱਲੋਂ ਅਨਲੌਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੇ ਮਾਲਕ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੁਨੇਹਾ"</string>
-    <string name="security_enable_widgets_title" msgid="2754833397070967846">"ਵਿਜੇਟ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"ਸਲੀਪ ਦੇ ਤੁਰੰਤ ਬਾਅਦ, ਇਸਦੇ ਸਿਵਾਏ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਣਲਾਕ ਨਾ ਰੱਖਿਆ ਗਿਆ ਹੋਵੇ"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"ਸਲੀਪ ਤੋਂ ਬਾਅਦ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>, ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> ਵੱਲੋਂ ਅਣਲਾਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤੇ ਮਾਲਕ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">" ਲਾਕ  ਸਕ੍ਰੀਨ ਸੁਨੇਹਾ"</string>
+    <string name="security_enable_widgets_title" msgid="2754833397070967846">"ਵਿਜੇਟ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"ਉਦਾ., ਜੋਏ ਦਾ Android."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"ਉਦਾਹਰਨ ਵਜੋਂ, ਜੋਏ ਦਾ Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ਉਪਭੋਗਤਾ ਜਾਣਕਾਰੀ"</string>
-    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ"</string>
     <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>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"ਲੌਕ ਸਕ੍ਰੀਨ ਤਰਜੀਹਾਂ"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"ਮੇਰਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, SIM ਕਾਰਡ ਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤਰਜੀਹਾਂ"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਣਲਾਕ, ਸਿਮ ਕਾਰਡ ਲਾਕ, ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਣਲਾਕ, ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਾਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"ਪਰਦੇਦਾਰੀ"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ਸੁਰੱਖਿਆ ਅਵਸਥਾ"</string>
-    <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ ਲੌਕ, ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
-    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ  ਲਾਕ , ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ਸਕ੍ਰੀਨ  ਲਾਕ"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ਇਸ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
-    <string name="fingerprint_add_title" msgid="1926752654454033904">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਜੋੜੋ"</string>
-    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+    <string name="fingerprint_add_title" msgid="1926752654454033904">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ਸਕ੍ਰੀਨ  ਲਾਕ"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਥਾਪਤ ਕੀਤੇ ਗਏ</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਨਲੌਕ ਕਰੋ"</string>
+    <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" msgid="3508870672887336095">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਸਿਰਫ਼ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਨੂੰ ਸਪਰਸ਼ ਕਰੋ। ਇਸ ਬਾਰੇ ਸਾਵਧਾਨ ਰਹੋ ਕਿ ਤੁਸੀਂ ਕਿਸ ਵਿਅਕਤੀ ਦੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰ ਰਹੇ ਹੋ। ਇੱਥੋਂ ਤੱਕ ਕਿ ਸ਼ਾਮਲ ਕੀਤੇ ਗਏ ਇੱਕ ਪ੍ਰਿੰਟ ਨਾਲ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਚੀਜ਼ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ।\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_content_description" msgid="2058830032070449160">"ਡੀਵਾਈਸ ਵਾਲੀ ਤਸਵੀਰ ਅਤੇ ਫ਼ਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ ਟਿਕਾਣਾ"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਕਰੋ"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ਕੀ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟਅਪ ਛੱਡਣਾ ਹੈ?"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦਾ ਇੱਕ ਤਰੀਕਾ ਆਪਣੇ ਉਂਗਲਾਂ ਦੇ ਨਿਸ਼ਾਨ ਦਾ ਉਪਯੋਗ ਕਰਨਾ ਚੁਣਿਆ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਹੁਣੇ ਇਸਨੂੰ ਛੱਡਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਨੂੰ ਇਹ ਬਾਅਦ ਵਿੱਚ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਸੈੱਟਅੱਪ ਸਿਰਫ਼ ਇੱਕ ਮਿੰਟ ਲੈਂਦਾ ਹੈ।"</string>
-    <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟਅੱਪ ਕਰੋ"</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>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"ਇੱਕ ਹੋਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ਅੱਗੇ"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਖਰੀਦਾਰੀਆਂ ਅਤੇ ਐਪ ਐਕਸੈਸ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦਾ ਉਪਯੋਗ ਵੀ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" ਸਕ੍ਰੀਨ ਲੌਕ ਵਿਕਲਪ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ। "<annotation id="admin_details">"ਹੋਰ ਵੇਰਵੇ"</annotation>\n\n"ਤੁਸੀਂ ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਅਤੇ ਐਪ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਲਈ ਹਾਲੇ ਵੀ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਖਰੀਦਾਰੀਆਂ ਅਤੇ ਐਪ ਪਹੁੰਚ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਵੀ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ। "<annotation id="admin_details">"ਹੋਰ ਵੇਰਵੇ"</annotation>\n\n"ਤੁਸੀਂ ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਅਤੇ ਐਪ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਲਈ ਹਾਲੇ ਵੀ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"ਉਂਗਲ ਚੁੱਕੋ, ਫਿਰ ਦੁਬਾਰਾ ਸੰਵੇਦਕ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ"</string>
-    <string name="fingerprint_add_max" msgid="1020927549936895822">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਜੋੜ ਸਕਦੇ ਹੋ"</string>
+    <string name="fingerprint_add_max" msgid="1020927549936895822">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"ਤੁਸੀਂ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਅਧਿਕਤਮ ਸੰਖਿਆ ਨੂੰ ਸ਼ਾਮਲ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"ਹੋਰ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"ਕੀ ਸਾਰੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਹਟਾਉਣੇ ਹਨ?"</string>
-    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਉਹਨਾਂ ਨਾਲ ਐਪਾਂ \'ਤੇ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
-    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"ਤੁਸੀਂ ਆਪਣੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਕਾਰਜ ਐਪਾਂ \'ਤੇ ਸਾਈਨ ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਉਹਨਾਂ ਨਾਲ ਐਪਾਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
+    <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"ਤੁਸੀਂ ਆਪਣੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਕਾਰਜ ਐਪਾਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕੋਂਗੇ"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"ਹਾਂ, ਹਟਾਓ"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ।"</string>
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ਇਨਕ੍ਰਿਪਸ਼ਨ"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ਟੈਬਲੇਟ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
-    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ਫੋਨ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
+    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ, ਸੈਟਿੰਗਾਂ, ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪ ਅਤੇ ਉਹਨਾਂ ਦਾ ਡਾਟਾ, ਮੀਡੀਆ ਅਤੇ ਹੋਰ ਫਾਈਲਾਂ ਇਨਕ੍ਰਿਪਟ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੀ ਟੈਬਲੇਟ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ ਮੰਨਦੇ ਹੋਏ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕੀਤਾ ਹੈ (ਮਤਲਬ, ਇੱਕ ਪੈਟਰਨ ਜਾਂ ਸੰਖਿਆਤਮਿਕ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ), ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਟੈਬਲੇਟ ਨੂੰ ਚਾਲੂ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਦਾ ਹੋਰ ਤਰੀਕਾ ਕੇਵਲ ਆਪਣਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਂਦੇ ਹੋਏ, ਇੱਕ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ।\n\nਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇੱਕ ਚਾਰਜ ਕੀਤੀ ਬੈਟਰੀ ਨਾਲ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਪੂਰੀ ਪ੍ਰਕਿਰਿਆ ਦੇ ਦੌਰਾਨ ਆਪਣੇ ਟੈਬਲੇਟ ਨੂੰ ਪਲਗ ਇਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕੁਝ ਜਾਂ ਸਾਰਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ, ਸੈਟਿੰਗਾਂ, ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪ ਅਤੇ ਉਹਨਾਂ ਦਾ ਡਾਟਾ, ਮੀਡੀਆ ਅਤੇ ਹੋਰ ਫਾਈਲਾਂ ਇਨਕ੍ਰਿਪਟ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ ਮੰਨਦੇ ਹੋਏ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕੀਤਾ ਹੈ (ਮਤਲਬ, ਇੱਕ ਪੈਟਰਨ ਜਾਂ ਸੰਖਿਆਤਮਿਕ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ), ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਫ਼ੋਨ ਨੂੰ ਚਾਲੂ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਦਾ ਹੋਰ ਤਰੀਕਾ ਕੇਵਲ ਆਪਣਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਂਦੇ ਹੋਏ, ਇੱਕ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ।\n\nਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇੱਕ ਚਾਰਜ ਕੀਤੀ ਬੈਟਰੀ ਨਾਲ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਪੂਰੀ ਪ੍ਰਕਿਰਿਆ ਦੇ ਦੌਰਾਨ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਪਲਗ ਇਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕੁਝ ਜਾਂ ਸਾਰਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"ਟੈਬਲੇਟ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ਫੋਨ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ, ਸੈਟਿੰਗਾਂ, ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪ ਅਤੇ ਉਹਨਾਂ ਦਾ ਡਾਟਾ, ਮੀਡੀਆ ਅਤੇ ਹੋਰ ਫਾਈਲਾਂ ਇਨਕ੍ਰਿਪਟ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੀ ਟੈਬਲੈੱਟ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ ਮੰਨਦੇ ਹੋਏ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਅੱਪ ਕੀਤਾ ਹੈ (ਮਤਲਬ, ਇੱਕ ਪੈਟਰਨ ਜਾਂ ਸੰਖਿਆਤਮਿਕ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ), ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਟੈਬਲੈੱਟ ਨੂੰ ਚਾਲੂ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਦਾ ਹੋਰ ਤਰੀਕਾ ਕੇਵਲ ਆਪਣਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਂਦੇ ਹੋਏ, ਇੱਕ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ।\n\nਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇੱਕ ਚਾਰਜ ਕੀਤੀ ਬੈਟਰੀ ਨਾਲ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਪੂਰੀ ਪ੍ਰਕਿਰਿਆ ਦੇ ਦੌਰਾਨ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਪਲੱਗ-ਇਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕੁਝ ਜਾਂ ਸਾਰਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ, ਸੈਟਿੰਗਾਂ, ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪ ਅਤੇ ਉਹਨਾਂ ਦਾ ਡਾਟਾ, ਮੀਡੀਆ ਅਤੇ ਹੋਰ ਫਾਈਲਾਂ ਇਨਕ੍ਰਿਪਟ ਕਰ ਸਕਦੇ ਹੋ। ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਇਨਕ੍ਰਿਪਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ ਮੰਨਦੇ ਹੋਏ ਕਿ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਅੱਪ ਕੀਤਾ ਹੈ (ਮਤਲਬ, ਇੱਕ ਪੈਟਰਨ ਜਾਂ ਸੰਖਿਆਤਮਿਕ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ), ਤੁਹਾਨੂੰ ਹਰ ਵਾਰ ਫ਼ੋਨ ਨੂੰ ਚਾਲੂ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਡੀਕ੍ਰਿਪਟ ਕਰਨ ਦਾ ਹੋਰ ਤਰੀਕਾ ਕੇਵਲ ਆਪਣਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਂਦੇ ਹੋਏ, ਇੱਕ ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ।\n\nਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। ਤੁਹਾਨੂੰ ਇੱਕ ਚਾਰਜ ਕੀਤੀ ਬੈਟਰੀ ਨਾਲ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ ਅਤੇ ਪੂਰੀ ਪ੍ਰਕਿਰਿਆ ਦੇ ਦੌਰਾਨ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਪਲੱਗ-ਇਨ ਰੱਖਣਾ ਚਾਹੀਦਾ ਹੈ। ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਕੁਝ ਜਾਂ ਸਾਰਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕਰੋ"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"ਆਪਣੀ ਬੈਟਰੀ ਚਾਰਜ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"ਆਪਣਾ ਚਾਰਜਰ ਪਲਗ ਇਨ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ਕੋਈ ਲੌਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਨਹੀਂ"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ਤੁਹਾਨੂੰ ਇਨਕ੍ਰਿਪਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲੌਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"ਆਪਣਾ ਚਾਰਜਰ ਪਲੱਗ-ਇਨ ਕਰੋ ਅਤੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ਕੋਈ ਲਾਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਨਹੀਂ"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ਤੁਹਾਨੂੰ ਇਨਕ੍ਰਿਪਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲਾਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ਕੀ ਇਨਕ੍ਰਿਪਟ ਕਰਨਾ ਹੈ?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੈਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਟੈਬਲੇਟ ਕਈ ਵਾਰ ਰੀਸਟਾਰਟ ਹੋਵੇਗੀ।"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੈਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਫੋਨ ਕਈ ਵਾਰ ਰੀਸਟਾਰਟ ਹੋਵੇਗਾ।"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਵੇਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਟੈਬਲੈੱਟ ਕਈ ਵਾਰ ਮੁੜ-ਚਾਲੂ ਹੋਵੇਗਾ।"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਓਪਰੇਸ਼ਨ ਅਬਦਲ ਹੈ ਅਤੇ ਜੇਕਰ ਤੁਸੀਂ ਇਸਨੂੰ ਰੋਕਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਇੱਕ ਘੰਟਾ ਜਾਂ ਇਸਤੋਂ ਵੱਧ ਸਮਾਂ ਲੱਗਦਾ ਹੈ, ਜਿਸਦੇ ਦੌਰਾਨ ਫ਼ੋਨ ਕਈ ਵਾਰ ਰੀਸਟਾਰਟ ਹੋਵੇਗਾ।"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"ਇਨਕ੍ਰਿਪਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"ਜਦੋਂ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਇਨਕ੍ਰਿਪਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। <xliff:g id="PERCENT">^1</xliff:g>% ਪੂਰਾ।"</string>
-    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"ਜਦੋਂ ਤੁਹਾਡਾ ਫੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। <xliff:g id="PERCENT">^1</xliff:g>% ਪੂਰਾ।"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ਜਦੋਂ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਇਨਕ੍ਰਿਪਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ਜਦੋਂ ਤੁਹਾਡਾ ਫੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਂ ਠਹਿਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ਆਪਣੀ ਟੈਬਲੇਟ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਕਰੋ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ਆਪਣਾ ਫੋਨ ਅਨਲੌਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"ਚਿਤਾਵਨੀ: ਅਨਲੌਕ ਕੀਤੇ ਜਾਣ ਲਈ <xliff:g id="COUNT">^1</xliff:g> ਤੋਂ ਵੱਧ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ!"</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਹੋਣ ਤਕ ਇੰਤਜ਼ਾਰ ਕਰੋ। <xliff:g id="PERCENT">^1</xliff:g> ਪੂਰਾ।"</string>
+    <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"ਜਦੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਾਂ ਠਹਿਰੋ। <xliff:g id="PERCENT">^1</xliff:g>% ਪੂਰਾ।"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਇਨਕ੍ਰਿਪਟ ਹੋਣ ਤਕ ਇੰਤਜ਼ਾਰ ਕਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ਜਦੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੋਵੇ ਤਂ ਠਹਿਰੋ। ਬਾਕੀ ਸਮਾਂ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਕਰੋ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਬੰਦ ਅਤੇ ਫਿਰ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"ਚਿਤਾਵਨੀ: ਅਣਲਾਕ ਕੀਤੇ ਜਾਣ ਲਈ <xliff:g id="COUNT">^1</xliff:g> ਤੋਂ ਵੱਧ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਤੋਂ ਬਾਅਦ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"ਆਪਣਾ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਸਫਲ"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਤੇ ਡੈਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\n ਆਪਣੀ ਟੈਬਲੇਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੇਟ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਡੈਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\nਆਪਣਾ ਫੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣਾ ਫੋਨ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਡਾਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\n ਆਪਣਾ ਟੈਬਲੈੱਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣਾ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈੱਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਰੋਕਿਆ ਗਿਆ ਸੀ ਅਤੇ ਪੂਰਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਸਿੱਟੇ ਵਜੋਂ, ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਡਾਟਾ ਹੁਣ ਪਹੁੰਚਯੋਗ ਨਹੀਂ ਹੈ। \n\nਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣਾ ਫ਼ੋਨ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"ਡੀਕ੍ਰਿਪਸ਼ਨ ਅਸਫਲ"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡੈਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣੀ ਟੈਬਲੈਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੇਟ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡੈਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣਾ ਫੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੇਟ ਸੈਟ ਅਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"ਇਨਪੁੱਟ ਵਿਧੀ ਬਦਲੋ"</string>
-    <string name="suggested_lock_settings_title" msgid="8971630898700461034">"ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡਾਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣੀ ਟੈਬਲੈੱਟ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਦਰਜ ਕੀਤਾ ਪਾਸਵਰਡ ਸਹੀ ਹੈ, ਪਰੰਤੂ ਅਫ਼ਸੋਸ ਨਾਲ ਡਾਟਾ ਕਰਪਟ ਹੈ। \n\nਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣਾ ਦੁਬਾਰਾ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਇੱਕ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਰੀਸੈੱਟ ਤੋਂ ਬਾਅਦ ਆਪਣੀ ਟੈਬਲੈੱਟ ਸੈੱਟ ਅੱਪ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਕੋਲ ਉਹ ਕੋਈ ਵੀ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰਨ ਦਾ ਮੌਕਾ ਹੁੰਦਾ ਹੈ, ਜੋ ਤੁਹਾਡੇ Google ਖਾਤੇ ਨਾਲ ਬੈਕ ਅੱਪ ਕੀਤਾ ਗਿਆ ਸੀ।"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"ਇਨਪੁੱਟ ਵਿਧੀ ਸਵਿੱਚ ਕਰੋ"</string>
+    <string name="suggested_lock_settings_title" msgid="8971630898700461034">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟ ਕਰੋ"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ਆਪਣੇ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
-    <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਨਲੌਕ ਕਰੋ"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"ਸਕ੍ਰੀਨ ਲੌਕ ਚੁਣੋ"</string>
-    <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ਕੰਮ ਲੌਕ ਚੁਣੋ"</string>
-    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
+    <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਚੁਣੋ"</string>
+    <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ਕੰਮ  ਲਾਕ  ਚੁਣੋ"</string>
+    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ਟੈਬਲੈੱਟ ਦੀ ਸੁਰੱਖਿਆ ਕਰੋ"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ਆਪਣੇ ਡੀਵਾਈਸ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
-    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ਆਪਣੇ ਫੋਨ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਸਥਾਪਤ ਕਰੋ।"</string>
-    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲੌਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
-    <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="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ਆਪਣੇ ਫ਼ੋਨ ਦੀ ਰੱਖਿਆ ਕਰੋ"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"ਵਾਧੂ ਸੁਰੱਖਿਆ ਲਈ, ਕੋਈ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸਥਾਪਤ ਕਰੋ।"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
+    <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>
-    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲੌਕ"</string>
-    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ਲੌਕ ਸਕ੍ਰੀਨ ਬਦਲੋ"</string>
-    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੁਰੱਖਿਆ ਬਦਲੋ ਜਾਂ ਅਸਮਰੱਥ ਬਣਾਓ"</string>
-    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ਸਕ੍ਰੀਨ ਨੂੰ ਲੌਕ ਕਰਨ ਲਈ ਇੱਕ ਵਿਧੀ ਚੁਣੋ"</string>
+    <string name="unlock_set_unlock_launch_picker_title_profile" msgid="124176557311393483">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ  ਲਾਕ"</string>
+    <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">" ਲਾਕ  ਸਕ੍ਰੀਨ ਬਦਲੋ"</string>
+    <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ਪੈਟਰਨ, ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੁਰੱਖਿਆ ਬਦਲੋ ਜਾਂ ਬੰਦ ਕਰੋ"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ਸਕ੍ਰੀਨ ਨੂੰ  ਲਾਕ  ਕਰਨ ਲਈ ਇੱਕ ਵਿਧੀ ਚੁਣੋ"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"ਸਵਾਈਪ ਕਰੋ"</string>
@@ -467,65 +480,73 @@
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"ਪਾਸਵਰਡ"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ਉੱਚ ਸੁਰੱਖਿਆ"</string>
     <string name="unlock_set_do_later_title" msgid="4894767558414979243">"ਅਜੇ ਨਹੀਂ"</string>
-    <string name="current_screen_lock" msgid="4104091715420072219">"ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ ਲੌਕ"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"ਮੌਜੂਦਾ ਸਕ੍ਰੀਨ  ਲਾਕ"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪੈਟਰਨ"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪਿੰਨ"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"ਫਿੰਗਰਪ੍ਰਿੰਟ + ਪਾਸਵਰਡ"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"ਤੁਸੀਂ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲੌਕ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"ਤੁਸੀਂ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"ਪ੍ਰਸ਼ਾਸਕ, ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੀਤੀ ਜਾਂ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"ਪੈਟਰਨ"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"ਪਿੰਨ"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"ਪਾਸਵਰਡ"</string>
-    <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕਰ ਲਓ, ਤਾਂ ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਸੁਰੱਖਿਆ ਵਿੱਚ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਟ ਅਪ ਕਰ ਸਕਦੇ ਹੋ।"</string>
-    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ਸਕ੍ਰੀਨ ਲੌਕ ਬੰਦ ਕਰੋ"</string>
+    <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਅੱਪ ਕਰ ਲਓ, ਤਾਂ ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਸੁਰੱਖਿਆ ਵਿੱਚ ਆਪਣਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਸੈੱਟ ਅੱਪ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="unlock_disable_lock_title" msgid="1427036227416979120">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਬੰਦ ਕਰੋ"</string>
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"ਕੀ ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਹਟਾਉਣੀ ਹੈ?"</string>
-    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"ਤੁਹਾਡੇ ਪੈਟਰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"ਤੁਹਾਡੇ ਪੈਟਰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
+</xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"ਤੁਹਾਡੇ ਪਿੰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
-    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
+</xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
+    <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।"</string>
-    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲੌਕ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲੌਕ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+</xliff:g>ਤੁਹਾਡੇ ਸੁਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।"</string>
+    <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲਾਕ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲਾਕ ਤੋਂ ਬਗੈਰ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਰੀਆਂ ਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰਨ, ਜਾਂ ਉਹਨਾਂ ਦੇ ਨਾਲ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ।\""</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪੈਟਰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Profile protection features will not work without your pattern.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੀ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorize purchases, or sign in to apps with them.\""</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
-    <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
+    <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਾਸਵਰਡ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
+    <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਪਿੰਨ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੀ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।\""</string>
-    <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲੌਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
-    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਲੌਕ ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।<xliff:g id="EMPTY_LINE">
+</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟਾਂ ਨੂੰ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾਇਆ ਜਾਵੇਗਾ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੇ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।"</string>
+    <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"ਪ੍ਰੋਫਾਈਲ ਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ  ਲਾਕ  ਦੇ ਬਿਨਾਂ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
+    <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Profile protection features will not work without your screen lock.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>ਤੁਹਾਡੇ ਰੱਖਿਅਤ ਕੀਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵੀ ਇਸ ਪ੍ਰੋਫਾਈਲ ਤੋਂ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ ਅਤੇ ਤੁਸੀਂ ਉਹਨਾਂ ਨਾਲ ਆਪਣੀ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਅਨਲੌਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ, ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ ਇਨ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਰਹੋਗੇ।\""</string>
+</xliff:g>Your saved fingerprints will also be removed from this profile and you wont be able to unlock your profile, authorize purchases, or sign in to apps with them.\""</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"ਹਾਂ, ਹਟਾਓ"</string>
-    <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="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_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="1688030823464420974">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪੈਟਰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗਲਤ ਪਿੰਨ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"ਜੇਕਰ ਤੁਸੀਂ ਅਗਲੀ ਕੋਸ਼ਿਸ਼ \'ਤੇ ਕੋਈ ਗ਼ਲਤ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਇਸ ਡੀਵਾਈਸ ਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ"</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="5047439819181833824">"ਬਹੁਤ ਸਾਰੀਆਂ ਗ਼ਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। ਇਸ ਡੀਵਾਈਸ ਦਾ ਡਾਟਾ ਮਿਟਾਇਆ ਜਾਵੇਗਾ।"</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>
@@ -575,45 +596,45 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਐਪਾਂ</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"ਭਰੋਸੇਯੋਗ ਏਜੰਟ"</string>
-    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ਵਰਤਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"ਵਰਤਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟ ਕਰੋ"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"ਕੋਈ ਨਹੀਂ"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਭਰੋਸੇਯੋਗ ਏਜੰਟ</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਭਰੋਸੇਯੋਗ ਏਜੰਟ</item>
     </plurals>
-    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
-    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth ਚਾਲੂ ਕਰੋ"</string>
-    <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
-    <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
+    <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ਬਲੂਟੁੱਥ"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="bluetooth_settings" msgid="1810521656168174329">"ਬਲੂਟੁੱਥ"</string>
+    <string name="bluetooth_settings_title" msgid="1908745291161353016">"ਬਲੂਟੁੱਥ"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ਕਨੈਕਸ਼ਨ ਵਿਵਸਥਿਤ ਕਰੋ, ਡੀਵਾਈਸ ਨਾਮ ਅਤੇ ਖੋਜਯੋਗਤਾ ਸੈੱਟ ਕਰੋ"</string>
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"ਕੀ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਦੇ ਨਾਲ ਜੋੜੀ ਬਣਾਉਣੀ ਹੈ?"</string>
-    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"ਬਲੂਟੁੱਥ ਜੋੜੀ ਕੋਡ"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"ਪੇਅਰਿੰਗ ਕੋਡ ਟਾਈਪ ਕਰੋ ਫਿਰ ਵਾਪਸ ਜਾਓ ਜਾਂ ਦਾਖਲ ਕਰੋ ਨੂੰ ਦਬਾਓ"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"ਬਲੂਟੁੱਥ ਜੋੜਾਬੱਧਕਰਨ ਕੋਡ"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"ਜੋੜਾਬੱਧ ਕਰਨ ਦਾ ਕੋਡ ਟਾਈਪ ਕਰੋ ਫਿਰ ਵਾਪਸ ਜਾਓ ਜਾਂ ਦਾਖਲ ਕਰੋ ਨੂੰ ਦਬਾਓ"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"ਪਿੰਨ ਵਿੱਚ ਅੱਖਰ ਜਾਂ ਚਿੰਨ੍ਹ ਹਨ"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"ਆਮ ਤੌਰ ਤੇ 0000 ਜਾਂ 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"16 ਅੰਕਾਂ ਦਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਇਹ ਪਿੰਨ ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"ਤੁਹਾਨੂੰ ਹੋਰ ਡੀਵਾਈਸ ਤੇ ਵੀ ਇਹ ਪਾਸਕੁੰਜੀ ਟਾਈਪ ਕਰਨ ਦੀ ਲੋੜ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"ਇਸ ਨਾਲ ਪੇਅਰ ਕਰਨ ਲਈ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਇਹ ਇਸ ਪਾਸਕੁੰਜੀ ਨੂੰ ਦਿਖਾ ਰਿਹਾ ਹੈ:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ਇਸਤੋਂ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਹੈ?"</string>
-    <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"ਇਸ ਨਾਲ ਪੇਅਰ ਕਰਨ ਲਈ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ਇਸਤੇ ਟਾਈਪ ਕਰੋ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ਫਿਰ ਵਾਪਸ ਜਾਓ ਜਾਂ ਦਾਖਲ ਕਰੋ ਕੁੰਜੀ ਨੂੰ ਦਬਾਓ।"</string>
-    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਨੂੰ ਐਕਸੈਸ ਕਰਨ ਦੀ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਅਨੁਮਤੀ ਦਿਓ"</string>
+    <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"ਇਸਤੋਂ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨਾ ਹੈ?"</string>
+    <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"ਇਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨ ਲਈ:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>ਇਸਤੇ ਟਾਈਪ ਕਰੋ:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ਫਿਰ \'ਵਾਪਸ ਜਾਓ\' ਜਾਂ \'ਦਾਖਲ ਕਰੋ\' ਕੁੰਜੀ ਨੂੰ ਦਬਾਓ।"</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਨੂੰ ਪਹੁੰਚ ਕਰਨ ਦੀ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"ਡਿਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰੋ"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"ਤਾਜ਼ਾ"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"ਖੋਜ ਰਿਹਾ ਹੈ..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"ਪੇਅਰ ਕੀਤਾ ਡੀਵਾਈਸ"</string>
+    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"ਜੋੜਾਬੱਧ ਕੀਤਾ ਡੀਵਾਈਸ"</string>
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"ਨਾਮ"</string>
-    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ"</string>
+    <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"ਕੀ-ਬੋਰਡ"</string>
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"ਸੰਪਰਕ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ"</string>
-    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਹੈ?"</string>
-    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ਕੀ ਫੋਨ ਬੁਕ ਸ਼ੇਅਰ ਕਰਨੀ ਹੈ?"</string>
+    <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ਕੀ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨਾ ਹੈ?"</string>
+    <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ਕੀ ਫ਼ੋਨ ਬੁੱਕ ਸਾਂਝਾ ਕਰਨੀ ਹੈ?"</string>
     <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ।"</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> Bluetooth ਨਾਲ ਪੇਅਰ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ। ਕਨੈਕਟ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਇਸਦੀ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਤੱਕ ਪਹੁੰਚ ਹੋਵੇਗੀ।"</string>
-    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ਪੇਅਰ ਕੀਤੀਆਂ ਡਿਵਾਈਸਾਂ"</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਬਲੂਟੁੱਥ ਨਾਲ ਜੋੜਾਬੱਧ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ। ਕਨੈਕਟ ਹੋਣ ਤੋਂ ਬਾਅਦ, ਇਸਦੀ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਤੱਕ ਪਹੁੰਚ ਹੋਵੇਗੀ।"</string>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"ਜੋੜਾਬੱਧ ਕੀਤੇ ਡੀਵਾਈਸ"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"ਉਪਲਬਧ ਡੀਵਾਈਸਾਂ"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"ਕੋਈ ਡਿਵਾਈਸਾਂ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"ਕਨੈਕਟ ਕਰੋ"</string>
@@ -622,18 +643,26 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"ਅਨਪੇਅਰ ਕਰੋ"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"ਡਿਸਕਨੈਕਟ &amp; ਅਨਪੇਅਰ ਕਰੋ"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"ਚੋਣਾਂ…"</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ਉੱਨਤ"</string>
-    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ਉੱਨਤ Bluetooth"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ਵਿਕਸਿਤ"</string>
+    <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="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>
+    <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>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਨਪੁੱਟ ਡੀਵਾਈਸ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਰਾਹੀਂ ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਡਿਸਕਨੈਕਟ ਕੀਤੀ ਜਾਏਗੀ।"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਟੈਬਲੇਟ ਦਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਕਰਨ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਫੋਨ ਦਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਕਰਨ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"ਪੇਅਰ ਕੀਤਾ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ"</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਡਿਸਕਨੈਕਟ ਕੀਤੀ ਜਾਏਗੀ।"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਟੈਬਲੈੱਟ ਦਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰਨ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
+    <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਫ਼ੋਨ ਦਾ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਕਰਨ ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
+    <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"ਜੋੜਾਬੱਧ ਕੀਤਾ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ"</string>
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"ਇਸ ਲਈ ਵਰਤੋ"</string>
@@ -642,29 +671,29 @@
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਲਈ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ਡੀਵਾਈਸ ਨਾਲ ਸਥਾਨਕ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ਡੌਕ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ਔਡੀਓ ਲਈ ਡੌਕ ਵਰਤੋ"</string>
-    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ਸਪੀਕਰ ਫੋਨ ਦੇ ਤੌਰ ਤੇ"</string>
+    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">" ਆਡੀਓ  ਲਈ ਡੌਕ ਵਰਤੋ"</string>
+    <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ਸਪੀਕਰ ਫ਼ੋਨ ਦੇ ਤੌਰ ਤੇ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ਸੰਗੀਤ ਅਤੇ ਮੀਡੀਆ ਲਈ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ਸੈਟਿੰਗਾਂ ਯਾਦ ਰੱਖੋ"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"ਕਾਸਟ"</string>
-    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"ਕੋਈ ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਨਹੀਂ ਮਿਲੀਆਂ।"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"ਕਨੈਕਟ ਕੀਤਾ"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"ਵਰਤੋਂ ਵਿੱਚ"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"ਅਣਉਪਲਬਧ"</string>
-    <string name="wifi_display_details" msgid="7791118209992162698">"ਡਿਸਪਲੇ ਸੈਟਿੰਗਜ਼"</string>
-    <string name="wifi_display_options_title" msgid="5740656401635054838">"ਵਾਇਰਲੈਸ ਡਿਸਪਲੇ ਚੋਣਾਂ"</string>
+    <string name="wifi_display_details" msgid="7791118209992162698">"ਡਿਸਪਲੇ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"ਵਾਇਰਲੈੱਸ ਡਿਸਪਲੇ ਚੋਣਾਂ"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"ਭੁੱਲਣਾ"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"ਹੋ ਗਿਆ"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ਨਾਮ"</string>
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2.4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
-    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
-    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
+    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ਵਾਈ-ਫਾਈ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
+    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ਵਾਈ-ਫਾਈ ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ਜਦੋਂ ਟੈਬਲੇਟ ਦੂਜੇ ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦੀ ਹੈ ਤਾਂ ਡਾਟਾ ਵਟਾਂਦਰੇ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"ਜਦੋਂ ਟੈਬਲੈੱਟ ਦੂਜੇ ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦਾ ਹੈ ਤਾਂ ਡਾਟਾ ਵਟਾਂਦਰੇ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ਜਦੋਂ ਫ਼ੋਨ ਦੂਜੇ ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦਾ ਹੈ ਤਾਂ ਡਾਟਾ ਵਟਾਂਦਰੇ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC ਚਾਲੂ ਕਰੋ"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC ਇਸ ਡੀਵਾਈਸ ਅਤੇ ਹੋਰ ਨੇੜਲੇ ਡੀਵਾਈਸਾਂ ਜਾਂ ਟੀਚਿਆਂ ਵਿਚਕਾਰ ਡਾਟੇ ਦਾ ਵਟਾਂਦਰਾ ਕਰਦਾ ਹੈ, ਜਿਵੇਂ ਕਿ ਭੁਗਤਾਨ ਟਰਮੀਨਲ, ਪਹੁੰਚ ਰੀਡਰ, ਅਤੇ ਅੰਤਰ-ਕਿਰਿਆਤਮਕ ਵਿਗਿਆਪਨ ਜਾਂ ਟੈਗ।"</string>
@@ -673,81 +702,84 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ਬੰਦ"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"ਅਣਉਪਲਬਧ ਕਿਉਂਕਿ NFC ਬੰਦ ਹੈ"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android ਬੀਮ"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"ਜਦੋਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਚਾਲੂ ਕੀਤੀ ਹੋਵੇ, ਤਾਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੱਕ-ਦੂਜੇ ਦੇ ਨੇੜੇ ਰੱਖਣ ਦੁਆਰਾ ਤੁਸੀਂ ਐਪ ਸਮੱਗਰੀ ਨੂੰ ਕਿਸੇ ਹੋਰ NFC-ਸਮਰੱਥਾ ਵਾਲੇ ਡੀਵਾਈਸ \'ਤੇ ਬੀਮ ਕਰ ਸਕਦੇ ਹੋ। ਉਦਾਹਰਨ ਲਈ, ਤੁਸੀਂ ਵੈੱਬ ਪੰਨਿਆਂ, YouTube ਵੀਡੀਓ, ਸੰਪਰਕਾਂ, ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ ਨੂੰ ਬੀਮ ਕਰ ਸਕਦੇ ਹੋ।\n\nਬੱਸ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੱਕ-ਦੂਜੇ ਦੇ ਨੇੜੇ ਲਿਆਓ (ਰਵਾਇਤੀ ਤੌਰ \'ਤੇ ਪਿਛਲੇ ਪਾਸੇ ਨੂੰ ਪਿਛਲੇ ਪਾਸੇ ਨਾਲ ਜੋੜੋ) ਅਤੇ ਫਿਰ ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਟੈਪ ਕਰੋ। ਐਪ ਇਹ ਤੈੈਅ ਕਰਦੀ ਹੈ ਕਿ ਕਿਹੜੀ ਚੀਜ਼ ਬੀਮ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।"</string>
-    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi ਚਾਲੂ ਕਰੋ"</string>
-    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
-    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi ਸੈਟਿੰਗਾਂ"</string>
-    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
-    <string name="wifi_settings_summary" msgid="668767638556052820">"ਵਾਇਰਲੈਸ ਪਹੁੰਚ ਬਿੰਦੂ ਸੈਟ ਅਪ &amp; ਵਿਵਸਥਿਤ ਕਰੋ"</string>
-    <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fi ਚੁਣੋ"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"ਜਦੋਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਚਾਲੂ ਕੀਤੀ ਹੋਵੇ, ਤਾਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੱਕ-ਦੂਜੇ ਦੇ ਨੇੜੇ ਰੱਖ ਕੇ ਤੁਸੀਂ ਐਪ ਸਮੱਗਰੀ ਨੂੰ ਕਿਸੇ ਹੋਰ NFC-ਸਮਰੱਥਾ ਵਾਲੇ ਡੀਵਾਈਸ \'ਤੇ ਬੀਮ ਕਰ ਸਕਦੇ ਹੋ। ਉਦਾਹਰਨ ਲਈ, ਤੁਸੀਂ ਵੈੱਬ ਪੰਨਿਆਂ, YouTube ਵੀਡੀਓ, ਸੰਪਰਕਾਂ, ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ ਨੂੰ ਬੀਮ ਕਰ ਸਕਦੇ ਹੋ।\n\nਬੱਸ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੱਕ-ਦੂਜੇ ਦੇ ਨੇੜੇ ਲਿਆਓ (ਮਿਸਾਲ ਦੇ ਤੌਰ \'ਤੇ ਪਿਛਲੇ ਪਾਸੇ ਨੂੰ ਪਿਛਲੇ ਪਾਸੇ ਨਾਲ ਜੋੜੋ) ਅਤੇ ਫਿਰ ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਟੈਪ ਕਰੋ। ਐਪ ਇਹ ਤੈੈਅ ਕਰਦੀ ਹੈ ਕਿ ਕਿਹੜੀ ਚੀਜ਼ ਬੀਮ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"ਵਾਇਰਲੈਸ ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਸੈੱਟ ਅੱਪ &amp; ਵਿਵਸਥਿਤ ਕਰੋ"</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"ਵਾਈ‑ਫਾਈ ਚੁਣੋ"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਹੋ ਰਿਹਾ ਹੈ…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"ਵਾਈ‑ਫਾਈ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"ਅਸ਼ੁੱਧੀ"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"5 GHz ਬੈਂਡ ਇਸ ਦੇਸ਼ ਵਿੱਚ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ਏਅਰਪਲੇਨ ਮੋਡ ਵਿੱਚ"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"ਖੁੱਲ੍ਹੇ ਨੈੱਟਵਰਕ ਦੀ ਸੂਚਨਾ"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"ਉੱਚ ਗੁਣਵੱਤਾ ਵਾਲਾ ਕੋਈ ਜਨਤਕ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਹੋਣ \'ਤੇ ਸੂਚਿਤ ਕਰੋ"</string>
-    <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ਤੁਹਾਡੇ ਘਰੇਲੂ ਨੈੱਟਵਰਕ ਵਰਗੇ ਉੱਚ-ਗੁਣਵੱਤਾ ਵਾਲੇ ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕਾਂ ਦੇ ਨੇੜੇ ਹੋਣ \'ਤੇ Wi-Fi ਦੁਬਾਰਾ ਚਾਲੂ ਹੋ ਜਾਵੇਗਾ"</string>
-    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ਅਣਉਪਲਬਧ ਕਿਉਂਕਿ Wi‑Fi ਸਕੈਨਿੰਗ ਬੰਦ ਹੈ"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"ਵਾਈ‑ਫਾਈ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ਤੁਹਾਡੇ ਘਰੇਲੂ ਨੈੱਟਵਰਕ ਵਰਗੇ ਉੱਚ-ਗੁਣਵੱਤਾ ਵਾਲੇ ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕਾਂ ਦੇ ਨੇੜੇ ਹੋਣ \'ਤੇ ਵਾਈ-ਫਾਈ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋ ਜਾਵੇਗਾ"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ਅਣਉਪਲਬਧ, ਕਿਉਂਕਿ ਵਾਈ‑ਫਾਈ ਸਕੈਨਿੰਗ ਬੰਦ ਹੈ"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ਵਰਤਣ ਲਈ, ਕੋਈ ਨੈੱਟਵਰਕ ਰੇਟਿੰਗ ਪ੍ਰਦਾਨਕ ਚੁਣੋ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ਖ਼ਰਾਬ ਕਨੈਕਸ਼ਨਾਂ ਤੋਂ ਬਚੋ"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ਜੇਕਰ ਤੱਕ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਚੰਗਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਨਾ ਹੋਵੇ ਤਾਂ Wi‑Fi ਨੈੱਟਵਰਕ ਨਾ ਵਰਤੋ"</string>
-    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ਕੇਵਲ ਉਹ ਨੈੱਟਵਰਕ ਵਰਤੋ ਜਿਹਨਾਂ ਦਾ ਇੱਕ ਚੰਗਾ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਹੈ"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ਜੇਕਰ ਤੱਕ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਚੰਗਾ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨਾ ਹੋਵੇ ਤਾਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾ ਵਰਤੋ"</string>
+    <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ਕੇਵਲ ਉਹ ਨੈੱਟਵਰਕ ਵਰਤੋ ਜਿਹਨਾਂ ਦਾ ਇੱਕ ਚੰਗਾ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਹੈ"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ਖੁੱਲ੍ਹੇ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ਆਪਣੇ ਆਪ ਉੱਚ-ਗੁਣਵੱਤਾ ਵਾਲੇ ਜਨਤਕ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"ਸਰਟੀਫਿਕੇਟ ਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਸਿਸਟਮ ਐਪਸ ਅਤੇ ਸੇਵਾਵਾਂ 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ਟਿਕਾਣੇ ਦੀ ਸਟੀਕਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ Wi-Fi ਸਕੈਨ ਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ਵਰਤਣ ਲਈ, ਕੋਈ ਨੈੱਟਵਰਕ ਰੇਟਿੰਗ ਪ੍ਰਦਾਨਕ ਚੁਣੋ"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ਵਰਤਣ ਲਈ, ਕੋਈ ਅਨੁਰੂਪ ਨੈੱਟਵਰਕ ਰੇਟਿੰਗ ਪ੍ਰਦਾਨਕ ਚੁਣੋ"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਤਦ ਵੀ ਸਕੈਨ ਕਰ ਸਕਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਇਸਨੂੰ <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ਟਿਕਾਣੇ ਦੀ ਸਟੀਕਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ਸਕੈਨਿੰਗ ਸੈਟਿੰਗਾਂ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ਵਿੱਚ ਵਾਈ-ਫਾਈ ਸਕੈਨ ਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ਦੁਬਾਰਾ ਨਾ ਦਿਖਾਓ"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਦੇ ਦੌਰਾਨ Wi‑Fi ਚਾਲੂ ਰੱਖੋ"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਦੇ ਦੌਰਾਨ Wi‑Fi ਚਾਲੂ"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਦੇ ਦੌਰਾਨ ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਰੱਖੋ"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਦੇ ਦੌਰਾਨ ਵਾਈ‑ਫਾਈ ਚਾਲੂ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"ਸੈਟਿੰਗ ਬਦਲਣ ਵਿੱਚ ਇੱਕ ਸਮੱਸਿਆ ਹੋਈ ਸੀ"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"ਸਮਰੱਥਾ ਬਿਹਤਰ ਬਣਾਓ"</string>
-    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi ਅਨੁਕੂਲਨ"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ਜਦੋਂ Wi‑Fi ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਬੈਟਰੀ ਵਰਤੋਂ ਘੱਟ ਕਰੋ"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਸੀਮਿਤ ਬੈਟਰੀ"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi‑Fi ਦੀ ਇੰਟਰਨੈੱਟ \'ਤੇ ਪਹੁੰਚ ਚਲੀ ਜਾਣ \'ਤੇ ਬਦਲਕੇ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਜਾਓ।"</string>
-    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬਦਲੀ ਕਰਕੇ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਜਾਓ"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"ਵਾਈ‑ਫਾਈ ਅਨੁਕੂਲਨ"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ਜਦੋਂ ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਬੈਟਰੀ ਵਰਤੋਂ ਘੱਟ ਕਰੋ"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"ਵਾਈ‑ਫਾਈ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਸੀਮਿਤ ਬੈਟਰੀ"</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"ਵਾਈ-ਫਾਈ ਦੀ ਇੰਟਰਨੈੱਟ \'ਤੇ ਪਹੁੰਚ ਚਲੀ ਜਾਣ \'ਤੇ ਸਵਿੱਚ ਕਰਕੇ ਮੋਬਾਈਲ ਡਾਟੇ \'ਤੇ ਜਾਓ।"</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਵਿੱਚ ਕਰਕੇ ਮੋਬਾਈਲ ਡਾਟੇ \'ਤੇ ਜਾਓ"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"ਵਾਈ‑ਫਾਈ ਦੀ ਇੰਟਰਨੈੱਟ \'ਤੇ ਪਹੁੰਚ ਨਾ ਹੋਣ \'ਤੇ ਮੋਬਾਈਲ ਡਾਟਾ ਵਰਤੋ। ਡਾਟਾ ਵਰਤੋਂ ਵਾਸਤੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
-    <string name="wifi_add_network" msgid="6234851776910938957">"ਨੈੱਟਵਰਕ ਜੋੜੋ"</string>
-    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi ਤਰਜੀਹਾਂ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੁੰਦਾ ਹੈ"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ ਹੈ"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi ਨੈੱਟਵਰਕ"</string>
+    <string name="wifi_add_network" msgid="6234851776910938957">"ਨੈੱਟਵਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"ਵਾਈ‑ਫਾਈ ਤਰਜੀਹਾਂ"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"ਵਾਈ‑ਫਾਈ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੁੰਦਾ ਹੈ"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"ਵਾਈ‑ਫਾਈ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦੁਬਾਰਾ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ ਹੈ"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS ਪੁਸ਼ ਬਟਨ"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"ਹੋਰ ਚੋਣਾਂ"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS ਪਿੰਨ ਐਂਟਰੀ"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ਡਾਇਰੈਕਟ"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"ਵਾਈ‑ਫਾਈ ਡਾਇਰੈਕਟ"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ਸਕੈਨ ਕਰੋ"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"ਉੱਨਤ"</string>
-    <string name="wifi_menu_configure" msgid="6150926852602171938">"ਸੰਰੂਪਣ ਕਰੋ"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"ਵਿਕਸਿਤ"</string>
+    <string name="wifi_menu_configure" msgid="6150926852602171938">"ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"ਨੈੱਟਵਰਕ ਯਾਦ ਰੱਖੋ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ਨੈੱਟਵਰਕ ਛੱਡ ਦਿਓ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ਨੈੱਟਵਰਕ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC ਟੈਗ ਵਿੱਚ ਲਿਖੋ"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ਉਪਲਬਧ ਨੈੱਟਵਰਕ ਦੇਖਣ ਲਈ, Wi‑Fi ਚਾਲੂ ਕਰੋ।"</string>
-    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi‑Fi ਨੈਟਵਰਕਾਂ ਦੀ ਖੋਜ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"ਤੁਹਾਡੇ ਕੋਲ Wi‑Fi ਨੈੱਟਵਰਕ ਨੂੰ ਬਦਲਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੈ।"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ਉਪਲਬਧ ਨੈੱਟਵਰਕ ਦੇਖਣ ਲਈ, ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਦੀ ਖੋਜ ਹੋ ਰਹੀ ਹੈ…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"ਤੁਹਾਡੇ ਕੋਲ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ ਨੂੰ ਬਦਲਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ।"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ਹੋਰ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"ਆਟੋਮੈਟਿਕ ਸੈਟਅਪ (WPS)"</string>
-    <string name="wifi_show_advanced" msgid="3409422789616520979">"ਉੱਨਤ ਚੋਣਾਂ"</string>
-    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ਡ੍ਰੌਪ ਡਾਊਨ ਸੂਚੀ ਉੱਨਤ ਵਿਕਲਪ। ਸੁੰਗੇੜਨ ਲਈ ਡਬਲ-ਟੈਪ ਕਰੋ।"</string>
-    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ਡ੍ਰੌਪ ਡਾਊਨ ਸੂਚੀ ਉੱਨਤ ਵਿਕਲਪ। ਵਿਸਤਾਰ ਕਰਨ ਲਈ ਡਬਲ-ਟੈਪ ਕਰੋ।"</string>
-    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi ਸੁਰੱਖਿਅਤ ਸੈਟਅਪ"</string>
+    <string name="wifi_show_advanced" msgid="3409422789616520979">"ਵਿਕਸਿਤ ਵਿਕਲਪ"</string>
+    <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"ਡ੍ਰੌਪ-ਡਾਊਨ ਸੂਚੀ ਉੱਨਤ ਵਿਕਲਪ। ਸੰਖਿਪਤ ਲਈ ਡਬਲ ਟੈਪ ਕਰੋ।"</string>
+    <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"ਡ੍ਰੌਪ-ਡਾਊਨ ਸੂਚੀ ਉੱਨਤ ਵਿਕਲਪ। ਵਿਸਤਾਰ ਕਰਨ ਲਈ ਡਬਲ ਟੈਪ ਕਰੋ।"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"ਵਾਈ‑ਫਾਈ ਸੁਰੱਖਿਅਤ ਸੈੱਟਅੱਪ"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS ਨੂੰ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"ਆਪਣੇ ਰੂਟਰ ਤੇ Wi‑Fi ਸੁਰੱਖਿਅਤ ਸੈਟਅਪ ਬਟਨ ਦਬਾਓ। ਇਸਨੂੰ \"WPS\" ਕਿਹਾ ਜਾ ਸਕਦਾ ਹੈ ਜਾਂ ਇਸ ਚਿੰਨ੍ਹ ਨਾਲ ਚਿੰਨ੍ਹਿਤ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ:"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"ਆਪਣੇ ਰੂਟਰ ਤੇ ਵਾਈ‑ਫਾਈ ਸੁਰੱਖਿਅਤ ਸੈੱਟਅੱਪ ਬਟਨ ਦਬਾਓ। ਇਸਨੂੰ \"WPS\" ਕਿਹਾ ਜਾ ਸਕਦਾ ਹੈ ਜਾਂ ਇਸ ਚਿੰਨ੍ਹ ਨਾਲ ਚਿੰਨ੍ਹਿਤ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ:"</string>
     <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"ਆਪਣੇ ਵਾਈ‑ਫਾਈ ਰੂਟਰ \'ਤੇ ਪਿੰਨ <xliff:g id="NUMBER">%1$s</xliff:g> ਦਾਖਲ ਕਰੋ। ਸੈੱਟਅੱਪ ਨੂੰ ਪੂਰਾ ਹੋਣ ਵਿੱਚ ਦੋ ਮਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ।"</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ਸਫਲ। ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi‑Fi ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS ਪਹਿਲਾਂ ਹੀ ਚਾਲੂ ਹੈ ਅਤੇ ਪੂਰਾ ਕਰਨ ਵਿੱਚ ਦੋ ਮਿੰਟ ਲੱਗ ਸਕਦੇ ਹਨ"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"ਵਾਇਰਲੈਸ ਰੂਟਰ ਸੁਰੱਖਿਆ ਸੈਟਿੰਗ (WEP) ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"ਵਾਇਰਲੈਸ ਰੂਟਰ ਸੁਰੱਖਿਆ ਸੈਟਿੰਗ (TKIP) ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"ਪ੍ਰਮਾਣੀਕਰਨ ਅਸਫਲ। ਕਿਰਪਾ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"ਦੂਜਾ WPS ਸੈਸ਼ਨ ਖੋਜਿਆ ਗਿਆ ਸੀ। ਕਿਰਪਾ ਕਰਕੇ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Wi‑Fi ਡਿਸਕਨੈਕਟ ਹੋਇਆ। WPS ਸਥਾਪਨਾ ਰੱਦ ਕੀਤੀ ਗਈ।"</string>
+    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"ਵਾਈ‑ਫਾਈ ਡਿਸਕਨੈਕਟ ਹੋਇਆ। WPS ਸਥਾਪਨਾ ਰੱਦ ਕੀਤੀ ਗਈ।"</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"ਨੈੱਟਵਰਕ ਦਾ ਨਾਮ"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID ਦਾਖਲ ਕਰੋ"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ਸੁਰੱਖਿਆ"</string>
@@ -762,7 +794,7 @@
     <string name="please_select_phase2" msgid="5231074529772044898">"ਫੇਜ਼ 2 ਪ੍ਰਮਾਣੀਕਰਨ"</string>
     <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="wifi_eap_domain" msgid="8471124344218082064">"ਡੋਮੇਨ"</string>
-    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ਉਪਭੋਗਤਾ ਸਰਟੀਫਿਕੇਟ"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"ਵਰਤੋਂਕਾਰ ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"ਪਛਾਣ"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"ਅਨਾਮ ਪਛਾਣ"</string>
     <string name="wifi_password" msgid="5948219759936151048">"ਪਾਸਵਰਡ"</string>
@@ -779,49 +811,49 @@
     <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>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ਆਪਣਾ ਨੈੱਟਵਰਕ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਅਤੇ ਹੋਰਾਂ ਮੰਤਵਾਂ ਲਈ, <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ, ਭਾਵੇਂ Wi-Fi ਬੰਦ ਹੋਵੇ। \n\nਕੀ ਇਸਨੂੰ ਸਾਰੇ ਐਪਸ ਲਈ ਆਗਿਆ ਦੇਣੀ ਹੈ ਜਿਹਨਾਂ ਨੂੰ ਸਕੈਨ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ?"</string>
-    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ਇਸਨੂੰ ਬੰਦ ਕਰਨ ਲਈ, ਓਵਰਫਲੋ ਮੀਨੂ ਵਿੱਚ ਉੱਨਤ ਤੇ ਜਾਓ।"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਅਤੇ ਹੋਰਾਂ ਮੰਤਵਾਂ ਲਈ, <xliff:g id="APP_NAME">%1$s</xliff:g> ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ, ਭਾਵੇਂ ਵਾਈ-ਫਾਈ ਬੰਦ ਹੋਵੇ। \n\nਕੀ ਇਸਨੂੰ ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਆਗਿਆ ਦੇਣੀ ਹੈ ਜਿਹਨਾਂ ਨੂੰ ਸਕੈਨ ਕਰਨਾ ਚਾਹੁੰਦਾ ਹੈ?"</string>
+    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"ਇਸਨੂੰ ਬੰਦ ਕਰਨ ਲਈ, ਓਵਰਫ਼ਲੋ ਮੀਨੂ ਵਿੱਚ ਵਿਕਸਿਤ ਤੇ ਜਾਓ।"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ਆਗਿਆ ਦਿਓ"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
-    <string name="wifi_hotspot_title" msgid="7726205804813286950">"ਕੀ ਕਨੈਕਟ ਕਰਨ ਲਈ ਸਾਈਨ ਇਨ ਕਰਨਾ ਹੈ?"</string>
-    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਔਨਲਾਈਨ ਸਾਈਨ ਇਨ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="wifi_hotspot_title" msgid="7726205804813286950">"ਕੀ ਕਨੈਕਟ ਕਰਨ ਲਈ ਸਾਈਨ-ਇਨ ਕਰਨਾ ਹੈ?"</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਨਲਾਈਨ ਸਾਈਨ-ਇਨ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="no_internet_access_text" msgid="7133561752896706392">"ਇਸ ਨੈੱਟਵਰਕ ਦੀ ਕੋਈ ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ। ਕੀ ਕਨੈਕਟ ਰਹਿਣਾ ਹੈ?"</string>
+    <string name="no_internet_access_text" msgid="7133561752896706392">"ਇਸ ਨੈੱਟਵਰਕ ਦੀ ਕੋਈ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ। ਕੀ ਕਨੈਕਟ ਰਹਿਣਾ ਹੈ?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"ਇਸ ਨੈੱਟਵਰਕ ਲਈ ਦੁਬਾਰਾ ਨਾ ਆਖੋ"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi‑Fi ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੈ"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"ਜਦੋਂ ਵੀ ਵਾਈ-ਫਾਈ ਕਨੈਕਸ਼ਨ ਖਰਾਬ ਹੋਵੇ ਤਾਂ ਤੁਸੀਂ ਬਦਲੀ ਕਰਕੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਜਾ ਸਕਦੇ ਹੋ। ਡਾਟਾ ਵਰਤੋਂ ਦੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
-    <string name="lost_internet_access_switch" msgid="2262459569601190039">"ਬਦਲਕੇ ਮੋਬਾਈਲ ਕਰੋ"</string>
-    <string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi‑Fi \'ਤੇ ਬਣੇ ਰਹੋ"</string>
-    <string name="lost_internet_access_persist" msgid="7634876061262676255">"ਕਦੇ ਦੁਬਾਰਾ ਨਾ ਵਿਖਾਓ"</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"ਵਾਈ-ਫਾਈ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੈ"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"ਜਦੋਂ ਵੀ ਵਾਈ-ਫਾਈ ਕਨੈਕਸ਼ਨ ਖਰਾਬ ਹੋਵੇ ਤਾਂ ਤੁਸੀਂ ਬਦਲਕੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ \'ਤੇ ਜਾ ਸਕਦੇ ਹੋ। ਡਾਟਾ ਵਰਤੋਂ ਦੇ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
+    <string name="lost_internet_access_switch" msgid="2262459569601190039">"ਮੋਬਾਈਲ \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string>
+    <string name="lost_internet_access_cancel" msgid="338273139419871110">"ਵਾਈ‑ਫਾਈ \'ਤੇ ਬਣੇ ਰਹੋ"</string>
+    <string name="lost_internet_access_persist" msgid="7634876061262676255">"ਕਦੇ ਦੁਬਾਰਾ ਨਾ  ਦਿਖਾਓ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ਨੈੱਟਵਰਕ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ਭੁੱਲਣਾ"</string>
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"ਨੈੱਟਵਰਕ ਛੱਡਣ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_save" msgid="3331121567988522826">"ਰੱਖਿਅਤ ਕਰੋ"</string>
-    <string name="wifi_failed_save_message" msgid="6650004874143815692">"ਨੈੱਟਵਰਕ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
+    <string name="wifi_failed_save_message" msgid="6650004874143815692">"ਨੈੱਟਵਰਕ ਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"ਰੱਦ ਕਰੋ"</string>
-    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ਸੁਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
+    <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
       <item quantity="one">%d ਨੈੱਟਵਰਕ</item>
       <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_titlebar" msgid="4485841401774142908">"ਵਿਕਸਿਤ ਵਾਈ‑ਫਾਈ"</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>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ਪਤੇ"</string>
-    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"ਸੁਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
+    <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ਸੈਟਿੰਗਾਂ"</string>
-    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi ਉੱਨਤ ਸੈਟਿੰਗਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"ਵਾਈ-ਫਾਈ ਉੱਨਤ ਸੈਟਿੰਗਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"ਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"ਰੱਦ ਕਰੋ"</string>
-    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ IP ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
+    <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"ਇੱਕ ਵੈਧ IP ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_gateway" msgid="8164264988361096450">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ ਗੇਟਵੇ ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="8744583948328391047">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ DNS ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="40470058023181052">"0 ਅਤੇ 32 ਦੇ ਵਿਚਕਾਰ ਇੱਕ ਨੈੱਟਵਰਕ ਅਗੇਤਰ ਲੰਮਾਈ ਟਾਈਪ ਕਰੋ।"</string>
@@ -829,10 +861,10 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"ਗੇਟਵੇ"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ਨੈੱਟਵਰਕ ਅਗੇਤਰ ਲੰਮਾਈ"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi ਡਾਇਰੈਕਟ"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"ਵਾਈ‑ਫਾਈ ਡਾਇਰੈਕਟ"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ਡੀਵਾਈਸ ਜਾਣਕਾਰੀ"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"ਇਹ ਕਨੈਕਸ਼ਨ ਯਾਦ ਰੱਖੋ"</string>
-    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ਡਿਵਾਈਸਾਂ ਖੋਜੋ"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ਡੀਵਾਈਸਾਂ ਖੋਜੋ"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"ਖੋਜ ਰਿਹਾ ਹੈ..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਨਾਮ ਦਿਓ"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"ਪੀਅਰ ਡਿਵਾਈਸਾਂ"</string>
@@ -845,23 +877,31 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ਕੀ ਸੱਦਾ ਰੱਦ ਕਰਨਾ ਹੈ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ਕੀ ਤੁਸੀਂ <xliff:g id="PEER_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਸੱਦਾ ਰੱਦ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <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_tether_checkbox_text" msgid="1847167643625779136">"ਪੋਰਟੇਬਲ ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ"</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>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"ਪੋਰਟੇਬਲ Wi‑Fi ਹੌਟਸਪੌਟ ਅਸ਼ੁੱਧੀ"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi ਹੌਟਸਪੌਟ ਸਥਾਪਤ ਕਰੋ"</string>
-    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi ਹੌਟਸਪੌਟ ਸੈਟਅਪ"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"ਪੋਰਟੇਬਲ ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ ਗੜਬੜ"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ਵਾਈ‑ਫਾਈ ਹੌਟਸਪੌਟ ਸੈੱਟਅੱਪ"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK ਹੌਟਸਪੌਟ"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ਹੌਟਸਪੌਟ"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਥਾਂ Wi-Fi ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਥਾਂ ਵਾਈ-ਫਾਈ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"ਕਾਲਿੰਗ ਤਰਜੀਹ"</string>
     <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਮੋਡ"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"ਰੋਮਿੰਗ ਤਰਜੀਹ"</string>
@@ -869,14 +909,14 @@
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ਰੋਮਿੰਗ ਤਰਜੀਹ"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"ਤਰਜੀਹੀ Wi-Fi"</item>
+    <item msgid="2124257075906188844">"ਤਰਜੀਹੀ ਵਾਈ-ਫਾਈ"</item>
     <item msgid="1335127656328817518">"ਮੋਬਾਈਲ ਨੂੰ ਤਰਜੀਹ ਹੈ"</item>
-    <item msgid="3132912693346866895">"ਕੇਵਲ Wi-Fi"</item>
+    <item msgid="3132912693346866895">"ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="742988808283756263">"Wi-Fi"</item>
+    <item msgid="742988808283756263">"ਵਾਈ-ਫਾਈ"</item>
     <item msgid="7715869266611010880">"ਮੋਬਾਈਲ"</item>
-    <item msgid="2838022395783120596">"ਸਿਰਫ਼ Wi-Fi"</item>
+    <item msgid="2838022395783120596">"ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
@@ -884,39 +924,40 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"Wi-Fi ਤਰਜੀਹੀ"</item>
+    <item msgid="5782108782860004851">"ਵਾਈ-ਫਾਈ ਤਰਜੀਹੀ"</item>
     <item msgid="5074515506087318555">"ਮੋਬਾਈਲ ਨੂੰ ਤਰਜੀਹ ਹੈ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="6132150507201243768">"Wi-Fi"</item>
+    <item msgid="6132150507201243768">"ਵਾਈ-ਫਾਈ"</item>
     <item msgid="1118703915148755405">"ਮੋਬਾਈਲ"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values_without_wifi_only">
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ਜਦੋਂ ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਚਾਲੂ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਤੁਹਾਡਾ ਫੋਨ ਤੁਹਾਡੀ ਤਰਜੀਹ ਅਤੇ ਕਿਹੜਾ ਸਿਗਨਲ ਵੱਧ ਮਜ਼ਬੂਤ ਹੈ, ਦੇ ਆਧਾਰ ਤੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਜਾਂ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦੇ ਨੈੱਟਵਰਕ ਰਾਹੀ ਕਾਲਾਂ ਰੂਟ ਕਰ ਸਕਦਾ ਹੈ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਫੀਸ ਅਤੇ ਹੋਰ ਵੇਰਵਿਆਂ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <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 ਦੀ ਵਰਤੋਂ ਨਾਲ 911 ਨੂੰ ਕਾਲ ਕਰਨ \'ਤੇ ਐਮਰਜੈਂਸੀ ਸੇਵਾਵਾਂ ਦੁਆਰਾ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਵਜੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਪਤਾ"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਾਈ-ਫਾਈ ਦੀ ਵਰਤੋਂ ਨਾਲ 911 ਨੂੰ ਕਾਲ ਕਰਨ \'ਤੇ ਸੰਕਟਕਾਲੀਨ ਸੇਵਾਵਾਂ ਦੁਆਰਾ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਵਜੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਪਤਾ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ਡਿਸਪਲੇ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ਧੁਨੀ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ਵੋਲਯੂਮ"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"ਸੰਗੀਤ ਇਫੈਕਟਸ"</string>
-    <string name="ring_volume_title" msgid="5592466070832128777">"ਰਿੰਗ ਵੌਲਯੂਮ"</string>
-    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ਸਾਈਲੈਂਟ ਹੋਣ ਵੇਲੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</string>
+    <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ਸ਼ਾਂਤ ਹੋਣ ਵੇਲੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ਰਿੰਗਟੋਨ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ਸੂਚਨਾ"</string>
-    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ਸੂਚਨਾਵਾਂ ਲਈ ਇਨਕਮਿੰਗ ਕਾਲ ਵੌਲਿਊਮ ਵਰਤੋ"</string>
-    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"ਕੰਮ ਪ੍ਰੋਫਾਈਲਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ"</string>
+    <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"ਸੂਚਨਾਵਾਂ ਲਈ ਇਨਕਮਿੰਗ ਕਾਲ ਅਵਾਜ਼ ਵਰਤੋ"</string>
+    <string name="home_work_profile_not_supported" msgid="1357721012342357037">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"ਮੀਡੀਆ"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"ਸੰਗੀਤ ਅਤੇ ਵੀਡੀਓ ਲਈ ਵੌਲਿਊਮ ਸੈੱਟ ਕਰੋ"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"ਅਲਾਰਮ"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"ਅਟੈਚ ਕੀਤੇ ਡੌਕ ਲਈ ਔਡੀਓ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"ਅਟੈਚ ਕੀਤੇ ਡੌਕ ਲਈ ਆਡੀਓ ਸੈਟਿੰਗਾਂ"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ਡਾਇਲ ਪੈਡ ਟਚ ਟੋਨਾਂ"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"ਧੁਨੀਆਂ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
-    <string name="lock_sounds_enable_title" msgid="450098505659399520">"ਸਕ੍ਰੀਨ ਲੌਕ ਅਵਾਜ਼"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"ਸਕ੍ਰੀਨ  ਲਾਕ  ਅਵਾਜ਼"</string>
     <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"ਟੈਪ \'ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ਸ਼ੋਰ ਰੱਦ ਕਰਨਾ"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"ਸੰਗੀਤ, ਵੀਡੀਓ, ਗੇਮਸ, &amp; ਹੋਰ ਮੀਡੀਆ"</string>
@@ -929,22 +970,22 @@
     <string name="volume_alarm_mute" msgid="4452239420351035936">"ਅਲਾਰਮਾਂ ਨੂੰ ਮਿਊਟ ਕਰੋ"</string>
     <string name="dock_settings" msgid="1820107306693002541">"ਡੌਕ"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"ਡੌਕ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="dock_audio_settings_title" msgid="3324750259959570305">"ਔਡੀਓ"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"ਅਟੈਚ ਕੀਤੇ ਡੈਸਕਟੌਪ ਡੌਕ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="dock_audio_settings_title" msgid="3324750259959570305">" ਆਡੀਓ"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"ਅਟੈਚ ਕੀਤੇ ਡੈਸਕਟਾਪ ਡੌਕ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"ਅਟੈਚ ਕੀਤੇ ਕਾਰ ਡੌਕ ਲਈ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"ਟੈਬਲੇਟ ਡੌਕ ਨਹੀਂ ਕੀਤੀ"</string>
-    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"ਫੋਨ ਡੌਕ ਨਹੀਂ ਕੀਤਾ"</string>
+    <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"ਟੈਬਲੈੱਟ ਡੌਕ ਨਹੀਂ ਕੀਤੀ"</string>
+    <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"ਫ਼ੋਨ ਡੌਕ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"ਅਟੈਚ ਕੀਤੇ ਡੌਕ ਲਈ ਸੈਟਿੰਗਾਂ"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"ਡੌਕ ਨਹੀਂ ਮਿਲਿਆ"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ਤੁਹਾਨੂੰ ਡੌਕ ਔਡੀਓ ਸੈਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਟੈਬਲੇਟ ਡੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ਤੁਹਾਨੂੰ ਡੌਕ ਔਡੀਓ ਸੈਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਫੋਨ ਡੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ਤੁਹਾਨੂੰ ਡੌਕ ਆਡੀਓ ਸੈੱਟ ਅੱਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਟੈਬਲੈੱਟ ਡੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ਤੁਹਾਨੂੰ ਡੌਕ ਔਡੀਓ ਸੈੱਟ ਅੱਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਫ਼ੋਨ ਡੌਕ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"ਡੌਕ ਇਨਸਰਟ ਅਵਾਜ਼"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"ਡੌਕ ਤੋਂ ਟੈਬਲੇਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਕਰੋ"</string>
-    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"ਡੌਕ ਤੋਂ ਫੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਕਰੋ"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ਡੌਕ ਤੋਂ ਟੈਬਲੇਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ਡੌਕ ਤੋਂ ਫੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"ਡੌਕ ਤੋਂ ਟੈਬਲੈੱਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਕਰੋ"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"ਡੌਕ ਤੋਂ ਫ਼ੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਚਲਾਓ"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ਡੌਕ ਤੋਂ ਟੈਬਲੈੱਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ਡੌਕ ਤੋਂ ਫ਼ੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਚਾਲੂ ਨਾ ਕਰੋ"</string>
     <string name="account_settings" msgid="6403589284618783461">"ਖਾਤੇ"</string>
-    <string name="accessibility_category_work" msgid="4339262969083355720">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+    <string name="accessibility_category_work" msgid="4339262969083355720">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ਕੰਮ ਖਾਤਾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"ਨਿੱਜੀ ਖਾਤਾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -953,10 +994,11 @@
     <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="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>
-    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"ਫੋਨ ਨੂੰ ਰੋਟੇਟ ਕਰਨ ਵੇਲੇ ਆਟੋਮੈਟਿਕਲੀ ਅਨੁਕੂਲਨ ਸਵਿਚ ਕਰੋ"</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>
+    <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"ਫ਼ੋਨ ਨੂੰ ਘੁੰਮਾਉਣ ਵੇਲੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦਿਸ਼ਾਮਾਨ ਸਵਿੱਚ ਕਰੋ"</string>
     <string name="brightness" msgid="8480105032417444275">"ਚਮਕ  ਦਾ ਪੱਧਰ"</string>
     <string name="brightness_title" msgid="5746272622112982836">"ਚਮਕ"</string>
     <string name="brightness_summary" msgid="838917350127550703">"ਸਕ੍ਰੀਨ ਦੀ ਚਮਕ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
@@ -980,29 +1022,28 @@
     <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_start_time_title" msgid="8918016772613689584">"ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ"</string>
-    <string name="night_display_end_time_title" msgid="8286061578083519350">"ਸਮਾਪਤੀ ਸਮਾਂ"</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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"ਵਾਲਪੇਪਰ"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ"</string>
+    <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"ਵਿਉਂਂਤੀ"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"ਵਾਲਪੇਪਰ ਬਦਲੋ"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਵਿਅਕਤੀਗਤ ਬਣਾਓ"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ਇਸਤੋਂ ਵਾਲਪੇਪਰ ਚੁਣੋ"</string>
@@ -1013,66 +1054,72 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ਜਦੋਂ ਡੌਕ ਕੀਤਾ ਹੋਵੇ"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ਬੰਦ"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ਇਹ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਕਿ ਜਦੋਂ ਫੋਨ ਡੌਕ ਕੀਤਾ ਅਤੇ/ਜਾਂ ਸਲੀਪ ਮੋਡ ਵਿੱਚ ਹੁੰਦਾ ਹੈ ਉਦੋਂ ਕੀ ਹੁੰਦਾ ਹੈ, ਸਕ੍ਰੀਨ ਸੇਵਰ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ਇਹ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਕਿ ਜਦੋਂ ਫ਼ੋਨ ਡੌਕ ਕੀਤਾ ਅਤੇ/ਜਾਂ ਸਲੀਪ ਮੋਡ ਵਿੱਚ ਹੁੰਦਾ ਹੈ ਉਦੋਂ ਕੀ ਹੁੰਦਾ ਹੈ, ਸਕ੍ਰੀਨ ਸੇਵਰ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"ਕਦੋਂ ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"ਵਰਤਮਾਨ ਸਕ੍ਰੀਨ ਸੇਵਰ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ਹੁਣ ਚਾਲੂ ਕਰੋ"</string>
     <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="doze_summary" msgid="3846219936142814032">"ਜਦ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਹੋਣ ਤਾਂ ਸਕ੍ਰੀਨ ਨੂੰ ਸਜੀਵ ਕਰੋ"</string>
+    <string name="lift_to_wake_title" msgid="4555378006856277635">"ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਲਈ ਚੁੱਕੋ"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"ਸਰਗਰਮ ਡਿਸਪਲੇ"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"ਹਮੇਸ਼ਾ ਚਾਲੂ / ਬੈਟਰੀ ਵਰਤੋਂ ਵਧ ਜਾਵੇਗੀ"</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="6978257596231155345">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦਿਖਾਓ। ਬੈਟਰੀ ਵਰਤੋਂ ਵਧ ਜਾਵੇਗੀ।"</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>
-    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM ਕਾਰਡ ਲੌਕ"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"ਸਿਮ ਕਾਰਡ ਲਾਕ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM ਕਾਰਡ  ਲਾਕ"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"ਬੰਦ"</string>
-    <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"ਲੌਕ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ਕਾਰਡ ਲੌਕ"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM ਕਾਰਡ ਲੌਕ ਕਰੋ"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
+    <string name="sim_lock_settings_summary_on" msgid="39103355956342985">" ਲਾਕ  ਕੀਤਾ ਗਿਆ"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ਕਾਰਡ  ਲਾਕ"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM ਕਾਰਡ  ਲਾਕ  ਕਰੋ"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ਟੈਬਲੈੱਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ਫ਼ੋਨ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ਟੈਬਲੈੱਟ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"ਫ਼ੋਨ ਵਰਤਣ ਲਈ ਪਿੰਨ ਦੀ ਲੋੜ ਹੈ"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"ਸਿਮ ਪਿੰਨ ਬਦਲੋ"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"ਸਿਮ ਪਿੰਨ"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM ਕਾਰਡ ਲੌਕ ਕਰੋ"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM ਕਾਰਡ ਅਨਲੌਕ ਕਰੋ"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM ਕਾਰਡ  ਲਾਕ  ਕਰੋ"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"ਸਿਮ ਕਾਰਡ ਅਣਲਾਕ ਕਰੋ"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"ਪੁਰਾਣਾ ਸਿਮ ਪਿੰਨ"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"ਨਵਾਂ ਸਿਮ ਪਿੰਨ"</string>
     <string name="sim_reenter_new" msgid="6523819386793546888">"ਨਵਾਂ ਪਿੰਨ ਮੁੜ-ਟਾਈਪ ਕਰੋ"</string>
     <string name="sim_change_pin" msgid="7328607264898359112">"ਸਿਮ ਪਿੰਨ"</string>
-    <string name="sim_bad_pin" msgid="2345230873496357977">"ਗ਼ਲਤ ਪਿੰਨ"</string>
+    <string name="sim_bad_pin" msgid="2345230873496357977">"ਗਲਤ ਪਿੰਨ"</string>
     <string name="sim_pins_dont_match" msgid="1695021563878890574">"ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
-    <string name="sim_change_failed" msgid="3602072380172511475">"ਪਿੰਨ ਨਹੀਂ ਬਦਲ ਸਕਦਾ।\nਸ਼ਾਇਦ ਪਿੰਨ ਗ਼ਲਤ ਹੈ।"</string>
+    <string name="sim_change_failed" msgid="3602072380172511475">"ਪਿੰਨ ਨਹੀਂ ਬਦਲ ਸਕਦਾ।\nਸ਼ਾਇਦ ਪਿੰਨ ਗਲਤ ਹੈ।"</string>
     <string name="sim_change_succeeded" msgid="8556135413096489627">"ਸਿਮ ਪਿੰਨ ਸਫਲਤਾਪੂਰਵਕ ਬਦਲਿਆ ਗਿਆ"</string>
-    <string name="sim_lock_failed" msgid="2489611099235575984">"ਸਿਮ ਕਾਰਡ ਲੌਕ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਬਦਲ ਸਕਦੀ।\nਸੰਭਾਵਿਤ ਤੌਰ \'ਤੇ ਗ਼ਲਤ ਪਿੰਨ।"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"ਸਿਮ ਕਾਰਡ ਲਾਕ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਬਦਲ ਸਕਦੀ।\nਸੰਭਾਵਿਤ ਤੌਰ \'ਤੇ ਗਲਤ ਪਿੰਨ।"</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"ਠੀਕ"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ਰੱਦ ਕਰੋ"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"ਮਲਟੀਪਲ SIM ਮਿਲੇ"</string>
-    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"ਉਹ SIM ਚੁਣੋ ਜਿਸਨੂੰ ਤੁਸੀਂ ਮੋਬਾਈਲ ਡੈਟੇ ਲਈ ਤਰਜੀਹ ਦਿੰਦੇ ਹੋ।"</string>
-    <string name="sim_change_data_title" msgid="294357201685244532">"ਕੀ ਡੈਟਾ SIM ਬਦਲਣਾ ਹੈ?"</string>
-    <string name="sim_change_data_message" msgid="5854582807996717811">"ਮੋਬਾਈਲ ਡੈਟੇ ਦੇ ਲਈ <xliff:g id="OLD_SIM">%2$s</xliff:g> ਦੀ ਬਜਾਏ <xliff:g id="NEW_SIM">%1$s</xliff:g> ਨੂੰ ਵਰਤੀਏ?"</string>
-    <string name="sim_preferred_title" msgid="5567909634636045268">"ਕੀ ਤਰਜੀਹੀ SIM ਕਾਰਡ ਅਪਡੇਟ ਕਰਨਾ ਹੈ?"</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"ਉਹ ਸਿਮ ਚੁਣੋ ਜਿਸਨੂੰ ਤੁਸੀਂ ਮੋਬਾਈਲ ਡਾਟੇ ਲਈ ਤਰਜੀਹ ਦਿੰਦੇ ਹੋ।"</string>
+    <string name="sim_change_data_title" msgid="294357201685244532">"ਕੀ  ਡਾਟਾ  SIM ਬਦਲਣਾ ਹੈ?"</string>
+    <string name="sim_change_data_message" msgid="5854582807996717811">"ਮੋਬਾਈਲ ਡਾਟੇ ਲਈ <xliff:g id="OLD_SIM">%2$s</xliff:g> ਦੀ ਬਜਾਏ <xliff:g id="NEW_SIM">%1$s</xliff:g> ਨੂੰ ਵਰਤਣਾ ਹੈ?"</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"ਕੀ ਤਰਜੀਹੀ ਸਿਮ ਕਾਰਡ ਅੱਪਡੇਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="sim_preferred_message" msgid="8466930554330635780">"ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਵਿੱਚ ਸਿਰਫ਼ <xliff:g id="NEW_SIM">%1$s</xliff:g> ਸਿਮ ਹੀ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਸਿਮ ਨੂੰ ਮੋਬਾਈਲ ਡਾਟੇ, ਕਾਲਾਂ, ਅਤੇ SMS ਸੁਨੇਹਿਆਂ ਦੇ ਲਈ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ਗ਼ਲਤ ਸਿਮ ਪਿੰਨ ਕੋਡ, ਹੁਣ ਤੁਹਾਨੂੰ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰਨਾ ਪਵੇਗਾ।"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"ਗਲਤ ਸਿਮ ਪਿੰਨ ਕੋਡ, ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਹੁਣ ਤੁਹਾਨੂੰ ਲਾਜ਼ਮੀ ਤੌਰ \'ਤੇ ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਸੰਪਰਕ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ।"</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
-      <item quantity="one">ਗ਼ਲਤ ਸਿਮ ਪਿੰਨ ਕੋਡ, ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ ਬਾਕੀ ਹੈ।</item>
-      <item quantity="other">ਗ਼ਲਤ ਸਿਮ ਪਿੰਨ ਕੋਡ, ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ ਬਾਕੀ ਹੈ।</item>
+      <item quantity="one">ਗਲਤ ਸਿਮ ਪਿੰਨ ਕੋਡ, ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ ਬਾਕੀ ਹੈ।</item>
+      <item quantity="other">ਗਲਤ ਸਿਮ ਪਿੰਨ ਕੋਡ, ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ ਬਾਕੀ ਹੈ।</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"ਸਿਮ ਪਿੰਨ ਕਾਰਵਾਈ ਅਸਫਲ ਰਹੀ!"</string>
-    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ਟੈਬਲੇਟ ਸਥਿਤੀ"</string>
-    <string name="device_info_settings" product="default" msgid="475872867864762157">"ਫੋਨ ਸਥਿਤੀ"</string>
+    <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"ਟੈਬਲੈੱਟ ਸਥਿਤੀ"</string>
+    <string name="device_info_settings" product="default" msgid="475872867864762157">"ਫ਼ੋਨ ਸਥਿਤੀ"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"ਸਿਸਟਮ ਅੱਪਡੇਟ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Android ਰੂਪ"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android ਵਰਜਨ"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android ਸੁਰੱਖਿਆ ਪੈਚ ਪੱਧਰ"</string>
     <string name="model_info" msgid="1952009518045740889">"ਮਾਡਲ"</string>
     <string name="hardware_info" msgid="2605080746512527805">"ਮਾਡਲ ਅਤੇ ਹਾਰਡਵੇਅਰ"</string>
-    <string name="hardware_revision" msgid="8893547686367095527">"ਹਾਰਡਵੇਅਰ ਰੂਪ"</string>
-    <string name="fcc_equipment_id" msgid="149114368246356737">"ਉਪਕਰਨ ID"</string>
+    <string name="hardware_revision" msgid="8893547686367095527">"ਹਾਰਡਵੇਅਰ ਵਰਜਨ"</string>
+    <string name="fcc_equipment_id" msgid="149114368246356737">"ਉਪਕਰਨ ਆਈ.ਡੀ."</string>
     <string name="baseband_version" msgid="1848990160763524801">"ਬੇਸਬੈਂਡ ਵਰਜਨ"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"Kernel ਰੂਪ"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"Kernel ਵਰਜਨ"</string>
     <string name="build_number" msgid="3075795840572241758">"ਬਿਲਡ ਨੰਬਰ"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux ਸਥਿਤੀ"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
@@ -1089,7 +1136,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"ਮੇਰਾ ਫ਼ੋਨ ਨੰਬਰ"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="1007470446618081441">"PRL ਰੂਪ"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL ਵਰਜਨ"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਪ੍ਰਕਾਰ"</string>
@@ -1099,11 +1146,11 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"ਸਿਗਨਲ ਸਟ੍ਰੈਂਥ"</string>
     <string name="status_roaming" msgid="2638800467430913403">"ਰੋਮਿੰਗ"</string>
     <string name="status_operator" msgid="2274875196954742087">"ਨੈੱਟਵਰਕ"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC ਪਤਾ"</string>
-    <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth ਪਤਾ"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"ਵਾਈ‑ਫਾਈ MAC ਪਤਾ"</string>
+    <string name="status_bt_address" msgid="4195174192087439720">"ਬਲੂਟੁੱਥ ਪਤਾ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"ਕ੍ਰਮ ਸੰਖਿਆ"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"ਅਣਉਪਲਬਧ"</string>
-    <string name="status_up_time" msgid="7294859476816760399">"ਅਪ ਟਾਈਮ"</string>
+    <string name="status_up_time" msgid="7294859476816760399">"ਅੱਪ ਟਾਈਮ"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"ਸਕਿਰਿਆ ਸਮਾਂ"</string>
     <string name="internal_memory" msgid="9129595691484260784">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB ਸਟੋਰੇਜ"</string>
@@ -1112,14 +1159,14 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"ਉਪਲਬਧ (ਰੀ਼ਡ-ਓਨਲੀ)"</string>
     <string name="memory_size" msgid="6629067715017232195">"ਕੁੱਲ ਸਪੇਸ"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"ਗਣਨਾ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
-    <string name="memory_apps_usage" msgid="5128673488173839077">"ਐਪਸ &amp; ਐਪ ਡੈਟਾ"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"ਐਪਸ &amp; ਐਪ  ਡਾਟਾ"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"ਮੀਡੀਆ"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"ਡਾਊਨਲੋਡ"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"ਤਸਵੀਰਾਂ, ਵੀਡੀਓ"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"ਔਡੀਓ (ਸੰਗੀਤ, ਰਿੰਗਟੋਨਾਂ, ਪੌਡਕਾਸਟਾਂ ਆਦਿ)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">" ਆਡੀਓ  (ਸੰਗੀਤ, ਰਿੰਗਟੋਨਾਂ, ਪੌਡਕਾਸਟਾਂ ਆਦਿ)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"ਹੋਰ ਫਾਈਲਾਂ"</string>
-    <string name="memory_media_cache_usage" msgid="6704293333141177910">"ਕੈਚ ਕੀਤਾ ਡੈਟਾ"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"ਸ਼ੇਅਰ ਕੀਤੀ ਸਟੋਰੇਜ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"ਕੈਚ ਕੀਤਾ  ਡਾਟਾ"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"ਸਾਂਝੀ ਕੀਤੀ ਸਟੋਰੇਜ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰੋ ਤਾਂ ਜੋ ਤੁਸੀਂ ਇਸਨੂੰ ਸੁਰੱਖਿਅਤ ਰੂਪ ਨਾਲ ਹਟਾ ਸਕੋ।"</string>
@@ -1131,32 +1178,32 @@
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
     <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB ਸਟੋਰੇਜ ਮਿਟਾਓ"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਉਂਦਾ ਹੈ, ਜਿਵੇਂ ਸੰਗੀਤ ਅਤੇ ਫ਼ੋਟੋਆਂ"</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾਉਂਦਾ ਹੈ, ਜਿਵੇਂ ਸੰਗੀਤ ਅਤੇ ਫ਼ੋਟੋਆਂ"</string>
-    <string name="memory_clear_cache_title" msgid="5423840272171286191">"ਕੀ ਕੈਚ ਕੀਤਾ ਡੈਟਾ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="memory_clear_cache_message" msgid="4550262490807415948">"ਇਹ ਸਾਰੇ ਐਪਸ ਲਈ ਕੈਚ ਕੀਤਾ ਡੈਟਾ ਹਟਾ ਦੇਵੇਗਾ।"</string>
-    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP ਜਾਂ PTP ਫੰਕਸ਼ਨ ਸਕਿਰਿਆ ਹੈ"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਂਦਾ ਹੈ, ਜਿਵੇਂ ਸੰਗੀਤ ਅਤੇ ਫ਼ੋਟੋਆਂ"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ  ਡਾਟਾ  ਮਿਟਾਉਂਦਾ ਹੈ, ਜਿਵੇਂ ਸੰਗੀਤ ਅਤੇ ਫ਼ੋਟੋਆਂ"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"ਕੀ ਕੈਚ ਕੀਤਾ  ਡਾਟਾ  ਹਟਾਉਣਾ ਹੈ?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"ਇਹ ਸਾਰੇ ਐਪਸ ਲਈ ਕੈਚ ਕੀਤਾ  ਡਾਟਾ  ਹਟਾ ਦੇਵੇਗਾ।"</string>
+    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP ਜਾਂ PTP ਫੰਕਸ਼ਨ ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"ਕੀ USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"ਕੀ SD ਕਾਰਡ ਨੂੰ  ਅਨਮਾਉਂਟ ਕਰਨਾ ਹੈ?"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"ਜੇਕਰ ਤੁਸੀਂ USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਸ ਜੋ ਤੁਸੀਂ ਵਰਤ ਰਹੇ ਹੋ ਬੰਦ ਹੋ ਜਾਣਗੇ ਅਤੇ ਅਣਉਪਲਬਧ ਹੋ ਸਕਦੇ ਹਨ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ USB ਸਟੋਰੇਜ ਨੂੰ ਰੀਮਾਉਂਟ ਨਹੀਂ ਕਰਦੇ।"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"ਜੇਕਰ ਤੁਸੀਂ USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਜੋ ਤੁਸੀਂ ਵਰਤ ਰਹੇ ਹੋ ਬੰਦ ਹੋ ਜਾਣਗੇ ਅਤੇ ਅਣਉਪਲਬਧ ਹੋ ਸਕਦੀਆਂ ਹਨ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ USB ਸਟੋਰੇਜ ਨੂੰ ਰੀਮਾਉਂਟ ਨਹੀਂ ਕਰਦੇ।"</string>
     <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"ਜੇਕਰ ਤੁਸੀਂ SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਕਰਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਸ ਜੋ ਤੁਸੀਂ ਵਰਤ ਰਹੇ ਹੋ ਬੰਦ ਹੋ ਜਾਣਗੇ ਅਤੇ ਅਣਉਪਲਬਧ ਹੋ ਸਕਦੇ ਹਨ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ SD ਕਾਰਡ ਨੂੰ ਰੀਮਾਉਂਟ ਨਹੀਂ ਕਰਦੇ।"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਨਹੀਂ ਕਰ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB ਸਟੋਰੇਜ ਨੂੰ ਅਨਮਾਉਂਟ ਨਹੀਂ ਹੋ ਸਕੀ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"SD ਕਾਰਡ ਨੂੰ ਅਨਮਾਉਂਟ ਨਹੀਂ ਕਰ ਸਕਿਆ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB ਸਟੋਰੇਜ ਅਨਮਾਉਂਟ ਹੋ ਜਾਏਗੀ।"</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD ਕਾਰਡ ਅਨਮਾਉਂਟ ਕੀਤਾ ਜਾਏਗਾ।"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"ਅਨਮਾਉਂਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"ਪ੍ਰਗਤੀ ਵਿੱਚ ਅਨਮਾਉਂਟ ਕਰੋ"</string>
-    <string name="storage_low_title" msgid="1388569749716225155">"ਸਟੋਰੇਜ ਸਪੇਸ ਖਾਲੀ ਹੋ ਰਿਹਾ ਹੈ"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"ਕੁਝ ਸਿਸਟਮ ਫੰਕਸ਼ਨ, ਜਿਵੇਂ ਸਿੰਕ ਕਰਨਾ, ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ। ਆਈਟਮਾਂ ਮਿਟਾ ਕੇ ਜਾਂ ਅਨਪਿੰਨ ਕਰਕੇ ਸਪੇਸ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਵੇਂ ਐਪਸ ਜਾਂ ਮੀਡੀਆ ਸਮੱਗਰੀ।"</string>
+    <string name="storage_low_title" msgid="1388569749716225155">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਾਲੀ ਹੋ ਰਹੀ ਹੈ"</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"ਕੁਝ ਸਿਸਟਮ ਫੰਕਸ਼ਨ, ਜਿਵੇਂ ਸਮਕਾਲੀਕਿਰਤ ਕਰਨਾ, ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਹੀਂ ਵੀ ਕਰ ਸਕਦੇ। ਆਈਟਮਾਂ ਮਿਟਾ ਕੇ ਜਾਂ ਅਨਪਿੰਨ ਕਰਕੇ ਸਪੇਸ ਖਾਲੀ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ, ਜਿਵੇਂ ਐਪਾਂ ਜਾਂ ਮੀਡੀਆ ਸਮੱਗਰੀ।"</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"ਮਾਉਂਟ ਕਰੋ"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"ਬਾਹਰ ਕੱਢੋ"</string>
     <string name="storage_menu_format" msgid="7690626079653152152">"ਫੌਰਮੈਟ"</string>
     <string name="storage_menu_format_public" msgid="7464714208010125682">"ਪੋਰਟੇਬਲ ਦੇ ਤੌਰ ਤੇ ਫੌਰਮੈਟ ਕਰੋ"</string>
     <string name="storage_menu_format_private" msgid="546017531835902096">"ਅੰਦਰਲੀ ਤੌਰ ਤੇ ਫੌਰਮੈਟ ਕਰੋ"</string>
-    <string name="storage_menu_migrate" msgid="3969621494238154294">"ਡੇਟਾ ਨੂੰ ਸਥਾਂਨਤਿਰਤ ਕਰੋ"</string>
+    <string name="storage_menu_migrate" msgid="3969621494238154294">" ਡਾਟਾ  ਨੂੰ ਸਥਾਂਨਤਿਰਤ ਕਰੋ"</string>
     <string name="storage_menu_forget" msgid="6305824238997983426">"ਭੁੱਲ ਜਾਓ"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"ਐਕਸਪਲੋਰ ਕਰੋ"</string>
@@ -1167,9 +1214,9 @@
     <string name="usb_mtp_title" msgid="3399663424394065964">"ਮੀਡੀਆ ਡੀਵਾਈਸ (MTP)"</string>
     <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows ਤੇ ਜਾਂ Mac Android ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਵਰਤਦੇ ਹੋਏ ਤੁਹਾਨੂੰ ਮੀਡੀਆ ਫਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ (www.android.com/filetransfer ਦੇਖੋ)"</string>
     <string name="usb_ptp_title" msgid="3852760810622389620">"ਕੈਮਰਾ (PTP)"</string>
-    <string name="usb_ptp_summary" msgid="7406889433172511530">"ਤੁਹਾਨੂੰ ਕੈਮਰਾ ਸੌਫਟਵੇਅਰ ਵਰਤਦੇ ਹੋਏ ਫ਼ੋਟੋਆਂ ਅਤੇ ਕੰਪਿਊਟਰ ਤੇ ਕੋਈ ਵੀ ਫਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜੋ MTP ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੇ"</string>
+    <string name="usb_ptp_summary" msgid="7406889433172511530">"ਤੁਹਾਨੂੰ ਕੈਮਰਾ ਸਾਫ਼ਟਵੇਅਰ ਵਰਤਦੇ ਹੋਏ ਫ਼ੋਟੋਆਂ ਅਤੇ ਕੰਪਿਊਟਰ ਤੇ ਕੋਈ ਵੀ ਫ਼ਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ ਜੋ MTP ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੇ"</string>
     <string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
-    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨਾਂ ਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਤੇ MIDI ਸੌਫਟਵੇਅਰ ਨਾਲ USB ਤੇ ਕੰਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
+    <string name="usb_midi_summary" msgid="539169474810956358">"MIDI ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨਾਂ ਨੂੰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਤੇ MIDI ਸਾਫ਼ਟਵੇਅਰ ਨਾਲ USB ਤੇ ਕੰਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="storage_other_users" msgid="808708845102611856">"ਹੋਰ ਉਪਭੋਗਤਾ"</string>
     <string name="storage_internal_title" msgid="690771193137801021">"ਡੀਵਾਈਸ ਸਟੋਰੇਜ"</string>
     <string name="storage_external_title" msgid="3433462910096848696">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ"</string>
@@ -1183,60 +1230,60 @@
     <string name="storage_unmount_failure" msgid="5758387106579519489">"<xliff:g id="NAME">%1$s</xliff:g> ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੂਪ ਨਾਲ ਨਹੀਂ ਕੱਢ ਸਕਿਆ"</string>
     <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> ਫੌਰਮੈਟ ਕੀਤਾ ਹੈ"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"<xliff:g id="NAME">%1$s</xliff:g> ਨੂੰ ਫੌਰਮੈਟ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
-    <string name="storage_rename_title" msgid="8242663969839491485">"ਸਟੋਰੇਜ ਨੂੰ ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
+    <string name="storage_rename_title" msgid="8242663969839491485">"ਸਟੋਰੇਜ ਦਾ ਨਾਮ ਬਦਲੋ"</string>
     <string name="storage_dialog_unmounted" msgid="6403320870103261477">"ਇਹ <xliff:g id="NAME_0">^1</xliff:g> ਸੁਰੱਖਿਅਤ ਰੂਪ ਨਾਲ ਹਟਾਇਆ ਗਿਆ ਹੈ, ਪਰੰਤੂ ਅਜੇ ਵੀ ਉਪਲਬਧ ਹੈ। \n\nਇਹ <xliff:g id="NAME_1">^1</xliff:g> ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਇਸਨੂੰ ਮਾਉਂਟ ਕਰਨਾ ਪਵੇਗਾ।"</string>
     <string name="storage_dialog_unmountable" msgid="3732209361668282254">"ਇਹ <xliff:g id="NAME_0">^1</xliff:g> ਕਰਪਟ ਹੈ। \n\nਇਹ <xliff:g id="NAME_1">^1</xliff:g> ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਇਸਨੂੰ ਸੈਟ ਅਪ ਕਰਨਾ ਪਵੇਗਾ।"</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"ਇਹ ਡੀਵਾਈਸ ਇਸ <xliff:g id="NAME_0">^1</xliff:g> ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ। \n\nਇਸ ਡੀਵਾਈਸ ਨਾਲ ਇਹ <xliff:g id="NAME_1">^1</xliff:g> ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ ਇਸਨੂੰ ਸੈੱਟ ਅੱਪ ਕਰਨਾ ਪਵੇਗਾ।"</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"ਫਾਰਮੈਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਦੂਜੇ ਡਿਵਾਈਸਾਂ ਵਿੱਚ ਇਸ <xliff:g id="NAME_0">^1</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। \n\nਇਸ <xliff:g id="NAME_1">^1</xliff:g> \'ਤੇ ਮੌਜੂਦ ਸਾਰਾ ਡਾਟਾ ਸਾਫ਼ ਕਰ ਦੇਵੇਗਾ। ਸਭ ਤੋਂ ਪਹਿਲਾਂ ਬੈੱਕਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ। \n\n"<b>"ਫੋਟੋਆਂ ਅਤੇ ਦੂਜੇ ਮੀਡੀਆ ਦਾ ਬੈੱਕਅੱਪ ਲਓ"</b>\n"ਆਪਣੀ ਮੀਡੀਆ ਫ਼ਾਈਲਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਵਿਕਲਪਿਕ ਸਟੋਰੇਜ ਵਿੱਚ ਮੂਵ ਕਰੋ, ਜਾਂ ਉਹਨਾਂ ਨੂੰ ਕਿਸੇ USB ਕੇਬਲ ਦਾ ਉਪਯੋਗ ਕਰਕੇ ਕਿਸੇ ਕੰਪਿਊਟਰ ਵਿੱਚ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰੋ। \n\n"<b>"ਐਪਾਂ ਦਾ ਬੈੱਕਅੱਪ ਲਓ"</b>\n"ਇਸ <xliff:g id="NAME_6">^1</xliff:g> \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਸਾਰੀਆਂ ਐਪਾਂ ਦੀ ਸਥਾਪਨਾ ਨੂੰ ਰੱਦ ਕੀਤਾ ਜਾਵੇਗਾ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡਾਟਾ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਰੱਖਣ ਲਈ, ਇਹਨਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਵਿਕਲਪਿਕ ਸਟੋਰੇਜ ਵਿੱਚ ਲੈ ਜਾਓ।"</string>
-    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"ਜਦੋਂ ਤੁਸੀਂ ਇਸ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਬਾਹਦ ਕੱਢਦੇ ਹੋ, ਤਾਂ ਇਸ \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਐਪਾਂ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਦੇਣਗੀ, ਅਤੇ ਇਸ \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਮੀਡੀਆ ਫ਼ਾਈਲਾਂ ਉਦੋਂ ਤੱਕ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ ਜਦੋਂ ਤੱਕ ਇਸਨੂੰ ਮੁੜ ਸੰਮਿਲਿਤ ਨਾ ਕੀਤਾ ਜਾਵੇ।"</b>\n\n"ਇਸ <xliff:g id="NAME_1">^1</xliff:g> ਨੂੰ ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਕੰਮ ਕਰਨ ਲਈ ਫਾਰਮੈਟ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ।"</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"ਐਪਾਂ, ਫ਼ੋਟੋਆਂ, ਜਾਂ ਇਸ <xliff:g id="NAME">^1</xliff:g> ਵਿੱਚ ਸ਼ਾਮਲ ਡਾਟਾ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਮੁੜ ਸੰਮਿਲਿਤ ਕਰੋ। \n\nਵਿਕਲਪਿਕ ਰੂਪ ਵਿੱਚ, ਤੁਸੀਂ ਇਸ ਸਟੋਰੇਜ ਨੂੰ ਭੁੱਲਣਾ ਚੁਣ ਸਕਦੇ ਹੋ, ਜੇਕਰ ਇਹ ਡੀਵਾਈਸ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। \n\nਜੇਕਰ ਤੁਸੀਂ ਭੁੱਲਣਾ ਚੁਣਦੇ ਹੋ, ਤਾਂ ਡੀਵਾਈਸ ਵਿੱਚ ਸ਼ਾਮਲ ਸਾਰਾ ਡਾਟਾ ਹਮੇਸ਼ਾ ਲਈ ਗੁਆਚ ਜਾਵੇਗਾ। \n\nਤੁਸੀਂ ਐਪਾਂ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਮੁੜ ਸਥਾਪਿਤ ਕਰ ਸਕਦੇ ਹੋ, ਲੇਕਿਨ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਸਟੋਰ ਕੀਤਾ ਉਹਨਾਂ ਦਾ ਡਾਟਾ ਗੁਆਚ ਜਾਵੇਗਾ।"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"ਫਾਰਮੈਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਦੂਜੇ ਡੀਵਾਈਸਾਂ ਵਿੱਚ ਇਸ <xliff:g id="NAME_0">^1</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ। \n\nਇਸ <xliff:g id="NAME_1">^1</xliff:g> \'ਤੇ ਮੌਜੂਦ ਸਾਰਾ ਡਾਟਾ ਸਾਫ਼ ਹੋ ਜਾਵੇਗਾ। ਸਭ ਤੋਂ ਪਹਿਲਾਂ ਬੈਕਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ। \n\n"<b>"ਫੋਟੋਆਂ ਅਤੇ ਦੂਜੇ ਮੀਡੀਆ ਦਾ ਬੈਕਅੱਪ ਲਓ"</b>" \nਆਪਣੀ ਮੀਡੀਆ ਫ਼ਾਈਲਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਵਿਕਲਪਿਕ ਸਟੋਰੇਜ ਵਿੱਚ ਲੈ ਜਾਓ, ਜਾਂ ਉਹਨਾਂ ਨੂੰ ਕਿਸੇ USB ਕੇਬਲ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕਿਸੇ ਕੰਪਿਊਟਰ ਵਿੱਚ ਟ੍ਰਾਂਸਫਰ ਕਰੋ। \n\n"<b>"ਐਪਾਂ ਦਾ ਬੈਕਅੱਪ ਲਓ"</b>" \nਇਸ <xliff:g id="NAME_6">^1</xliff:g> \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਸਾਰੀਆਂ ਐਪਾਂ ਦੀ ਸਥਾਪਨਾ ਨੂੰ ਰੱਦ ਕੀਤਾ ਜਾਵੇਗਾ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡਾਟਾ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਰੱਖਣ ਲਈ, ਇਹਨਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਵਿਕਲਪਿਕ ਸਟੋਰੇਜ ਵਿੱਚ ਲੈ ਜਾਓ।"</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"ਜਦੋਂ ਤੁਸੀਂ ਇਸ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਬਾਹਦ ਕੱਢਦੇ ਹੋ, ਤਾਂ ਇਸ \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਐਪਾਂ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰ ਦੇਣਗੀ, ਅਤੇ ਇਸ \'ਤੇ ਸਟੋਰ ਕੀਤੀਆਂ ਮੀਡੀਆ ਫ਼ਾਈਲਾਂ ਉਦੋਂ ਤੱਕ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ ਜਦੋਂ ਤੱਕ ਇਸਨੂੰ ਮੁੜ ਸੰਮਿਲਿਤ ਨਾ ਕੀਤਾ ਜਾਵੇ।"</b>" \n\nਇਸ <xliff:g id="NAME_1">^1</xliff:g> ਨੂੰ ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਕੰਮ ਕਰਨ ਲਈ ਫਾਰਮੈਟ ਕੀਤਾ ਗਿਆ ਹੈ। ਇਹ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਕੰਮ ਨਹੀਂ ਕਰੇਗਾ।"</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"ਐਪਾਂ, ਫ਼ੋਟੋਆਂ, ਜਾਂ ਇਸ <xliff:g id="NAME">^1</xliff:g> ਵਿੱਚ ਸ਼ਾਮਲ ਡਾਟਾ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ, ਇਸਨੂੰ ਦੁਬਾਰਾ ਪਾਓ। \n\nਵਿਕਲਪਿਕ ਤੌਰ \'ਤੇ, ਤੁਸੀਂ ਇਸ ਸਟੋਰੇਜ ਨੂੰ ਭੁੱਲਣਾ ਚੁਣ ਸਕਦੇ ਹੋ, ਜੇਕਰ ਇਹ ਡੀਵਾਈਸ ਉਪਲਬਧ ਨਹੀਂ ਹੈ। \n\nਜੇਕਰ ਤੁਸੀਂ ਭੁੱਲਣਾ ਚੁਣਦੇ ਹੋ, ਤਾਂ ਡੀਵਾਈਸ ਵਿੱਚ ਸ਼ਾਮਲ ਸਾਰਾ ਡਾਟਾ ਹਮੇਸ਼ਾਂ ਲਈ ਗੁਆਚ ਜਾਵੇਗਾ। \n\nਤੁਸੀਂ ਐਪਾਂ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਮੁੜ ਸਥਾਪਤ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਸਟੋਰ ਕੀਤਾ ਉਹਨਾਂ ਦਾ ਡਾਟਾ ਗੁਆਚ ਜਾਵੇਗਾ।"</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"ਕੀ <xliff:g id="NAME">^1</xliff:g> ਭੁੱਲ ਗਏ?"</string>
-    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"ਇਸ <xliff:g id="NAME">^1</xliff:g> ਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਐਪਸ, ਫ਼ੋਟੋਆਂ ਅਤੇ ਡੈਟਾ ਹਮੇਸ਼ਾਂ ਲਈ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
+    <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"ਇਸ <xliff:g id="NAME">^1</xliff:g> ਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਐਪਸ, ਫ਼ੋਟੋਆਂ ਅਤੇ  ਡਾਟਾ  ਹਮੇਸ਼ਾਂ ਲਈ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ।"</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"ਐਪਾਂ"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"ਚਿੱਤਰ"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"ਵੀਡੀਓ"</string>
-    <string name="storage_detail_audio" msgid="1197685141676483213">"ਔਡੀਓ"</string>
-    <string name="storage_detail_cached" msgid="8547136365247818567">"ਕੈਚ ਕੀਤਾ ਡੈਟਾ"</string>
+    <string name="storage_detail_audio" msgid="1197685141676483213">" ਆਡੀਓ"</string>
+    <string name="storage_detail_cached" msgid="8547136365247818567">"ਕੈਚ ਕੀਤਾ  ਡਾਟਾ"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"ਹੋਰ"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"ਸਿਸਟਮ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ਐਕਸਪਲੋਰ ਕਰੋ"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ਹੋਰਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹਨ ਐਪਾਂ ਦੁਆਰਾ ਰੱਖਿਅਤ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, ਇੰਟਰਨੈੱਟ ਜਾਂ ਬਲੂਟੁੱਥ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, Android ਫ਼ਾਈਲਾਂ, ਅਤੇ ਹੋਰ ਵੀ ਬਹੁਤ ਕੁਝ। \n\nਇਸ <xliff:g id="NAME">^1</xliff:g> ਦੀਆਂ ਦਿਖਣਯੋਗ ਸਮੱਗਰੀਆਂ ਨੂੰ ਵੇਖਣ ਲਈ, ਪੜਚੋਲ ਕਰੋ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"ਸਿਸਟਮ ਵਿੱਚ Android ਰੂਪ <xliff:g id="VERSION">%s</xliff:g> ਨੂੰ ਚਲਾਉਣ ਲਈ ਵਰਤੀਆਂ ਜਾਂਦੀਆਂ ਫ਼ਾਈਲਾਂ ਸ਼ਾਮਲ ਹਨ"</string>
-    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ਨੇ <xliff:g id="SIZE">^2</xliff:g> ਸਟੋਰੇਜ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋਏ ਫ਼ੋਟੋਆਂ, ਸੰਗੀਤ, ਐਪਾਂ ਜਾਂ ਹੋਰ ਡੈਟਾ ਰੱਖਿਅਤ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ। \n\nਵੇਰਵੇ ਦੇਖਣ ਲਈ, ਬਦਲੀ ਕਰਕੇ <xliff:g id="USER_1">^1</xliff:g> \'ਤੇ ਜਾਓ।"</string>
+    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ਹੋਰਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਹਨ ਐਪਾਂ ਦੁਆਰਾ ਰੱਖਿਅਤ ਸਾਂਝੀਆਂ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, ਇੰਟਰਨੈੱਟ ਜਾਂ ਬਲੂਟੁੱਥ ਤੋਂ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਫ਼ਾਈਲਾਂ, Android ਫ਼ਾਈਲਾਂ, ਅਤੇ ਹੋਰ ਵੀ ਬਹੁਤ ਕੁਝ। \n\nਇਸ <xliff:g id="NAME">^1</xliff:g> ਦੀਆਂ ਦਿਖਣਯੋਗ ਸਮੱਗਰੀਆਂ ਨੂੰ ਦੇਖਣ ਲਈ, ਪੜਚੋਲ ਕਰੋ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"ਸਿਸਟਮ ਵਿੱਚ Android ਵਰਜਨ <xliff:g id="VERSION">%s</xliff:g> ਨੂੰ ਚਲਾਉਣ ਲਈ ਵਰਤੀਆਂ ਜਾਂਦੀਆਂ ਫ਼ਾਈਲਾਂ ਸ਼ਾਮਲ ਹਨ"</string>
+    <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ਨੇ <xliff:g id="SIZE">^2</xliff:g> ਸਟੋਰੇਜ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋਏ ਫ਼ੋਟੋਆਂ, ਸੰਗੀਤ, ਐਪਾਂ ਜਾਂ ਹੋਰ ਡਾਟਾ ਰੱਖਿਅਤ ਕੀਤਾ ਹੋ ਸਕਦਾ ਹੈ। \n\nਵੇਰਵੇ ਦੇਖਣ ਲਈ, ਬਦਲੀ ਕਰਕੇ <xliff:g id="USER_1">^1</xliff:g> \'ਤੇ ਜਾਓ।"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"ਆਪਣੇ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
-    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ ਦੇ ਰੂਪ ਵਿੱਚ ਉਪਯੋਗ ਕਰੋ"</string>
+    <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ ਦੇ ਵੱਜੋਂ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"ਡਿਵਾਈਸਾਂ ਦੇ ਵਿੱਚਕਾਰ ਫ਼ੋਟੋਆਂ ਅਤੇ ਦੂਜੇ ਮੀਡੀਓ ਨੂੰ ਮੂਵ ਕਰਨ ਲਈ."</string>
-    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ਅੰਦਰਲੀ ਸਟੋਰੇਜ ਦੇ ਰੂਪ ਵਿੱਚ ਉਪਯੋਗ ਕਰੋ"</string>
+    <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਵੱਜੋਂ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"ਐਪਾਂ ਅਤੇ ਫ਼ੋਟੋਆਂ ਸਮੇਤ, ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਕੁਝ ਵੀ ਸਟੋਰ ਕਰਨ ਦੇ ਲਈ। ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ ਜੋ ਇਸਨੂੰ ਦੂਜੇ ਡੀਵਾਈਸਾਂ ਦੇ ਨਾਲ ਕੰਮ ਕਰਨ ਤੋਂ ਬਚਾਉਂਦਾ ਹੈ।"</string>
-    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ਅੰਦਰਲੀ ਸਟੋਰੇਜ ਦੇ ਰੂਪ ਵਿੱਚ ਫਾਰਮੈਟ ਕਰੋ"</string>
+    <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਵੱਜੋਂ ਫਾਰਮੈਟ ਕਰੋ"</string>
     <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ਇਸਨੂੰ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਸੁਰੱਖਿਅਤ ਬਣਾਉਣ ਲਈ ਇਹ ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। \n\nਫਾਰਮੈਟ ਕਰਨ ਤੋਂ ਬਾਅਦ, ਇਹ <xliff:g id="NAME_1">^1</xliff:g> ਸਿਰਫ਼ ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਕੰਮ ਕਰੇਗਾ। \n\n"<b>"ਫਾਰਮੈਟ ਕਰਨਾ ਵਰਤਮਾਨ ਵਿੱਚ <xliff:g id="NAME_2">^1</xliff:g> \'ਤੇ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਡਾਟਾ ਨੂੰ ਸਾਫ਼ ਕਰ ਦਿੰਦਾ ਹੈ।"</b>" ਡਾਟਾ ਗੁਆਚਣ ਤੋਂ ਬੱਚਣ ਲਈ, ਇਸਦਾ ਬੈੱਕਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
     <string name="storage_wizard_format_confirm_public_title" msgid="4905690038882041566">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ ਵੱਜੋਂ ਫਾਰਮੈਟ ਕਰੋ"</string>
-    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ਇਸਨੂੰ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। \n\n"<b>"ਫਾਰਮੈਟ ਕਰਨਾ <xliff:g id="NAME_1">^1</xliff:g> \'ਤੇ ਵਰਤਮਾਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਡੇਟਾ ਨੂੰ ਮਿਟਾ ਦਿੰਦਾ ਹੈ।"</b>" ਡੇਟਾ ਨੂੰ ਗੁਆਚਣ ਤੋਂ ਬੱਚਣ ਲਈ, ਇਸਦਾ ਬੈੱਕ ਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
+    <string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ਇਸਨੂੰ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। \n\n"<b>"ਫਾਰਮੈਟ ਕਰਨਾ <xliff:g id="NAME_1">^1</xliff:g> \'ਤੇ ਵਰਤਮਾਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ  ਡਾਟਾ  ਨੂੰ ਮਿਟਾ ਦਿੰਦਾ ਹੈ।"</b>"  ਡਾਟਾ  ਨੂੰ ਗੁਆਚਣ ਤੋਂ ਬੱਚਣ ਲਈ, ਇਸਦਾ ਬੈੱਕ ਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
     <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ਸਾਫ਼ ਕਰੋ ਅਤੇ ਫਾਰਮੈਟ ਕਰੋ"</string>
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਨਾ ਹਟਾਓ."</string>
-    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ਡੇਟਾ ਨੂੰ ਨਵੇਂ ਸਟੋਰੇਜ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
-    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"ਤੁਸੀਂ ਇਸ ਨਵੇਂ <xliff:g id="NAME">^1</xliff:g>ਵਿੱਚ ਆਪਣੀਆਂ ਫ਼ੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ ਅਤੇ ਐਪ ਦੇ ਡੇਟਾ ਨੂੰ ਮੂਵ ਕਰ ਸਕਦੇ ਹੋ।\n\nਇਹ ਮੂਵ ਲਗਭਗ <xliff:g id="TIME">^2</xliff:g> ਲੈਂਦਾ ਹੈ ਅੰਦਰਲੀ ਸਟੋਰੇਜ \'ਤੇ <xliff:g id="SIZE">^3</xliff:g> ਖਾਲੀ ਕਰ ਦੇਵੇਗਾ। ਕੁਝ ਐਪਸ ਇਹ ਕਿਰਿਆ ਹੋਣ ਵੇਲੇ ਕੰਮ ਨਹੀਂ ਕਰਨਗੇ।"</string>
+    <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਵੇਲੇ ਇਸਨੂੰ ਨਾ ਹਟਾਓ।"</string>
+    <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ਡਾਟਾ ਨੂੰ ਨਵੀਂ ਸਟੋਰੇਜ ਵਿੱਚ ਲਿਜਾਓ"</string>
+    <string name="storage_wizard_migrate_body" msgid="890751699549542345">"ਤੁਸੀਂ ਇਸ ਨਵੇਂ <xliff:g id="NAME">^1</xliff:g> ਵਿੱਚ ਆਪਣੀਆਂ ਫ਼ੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ ਅਤੇ ਐਪ ਦਾ ਡਾਟਾ ਲੈ ਕੇ ਜਾ ਸਕਦੇ ਹੋ।\n\nਲਿਜਾਣ ਵਿੱਚ ਲਗਭਗ <xliff:g id="TIME">^2</xliff:g> ਲੱਗਣਗੇ, ਅਤੇ ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ \'ਤੇ <xliff:g id="SIZE">^3</xliff:g> ਖਾਲੀ ਹੋ ਜਾਵੇਗੀ। ਕੁਝ ਐਪਾਂ ਇਹ ਕਿਰਿਆ ਹੋਣ ਵੇਲੇ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
     <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ਹੁਣੇ ਮੂਵ ਕਰੋ"</string>
     <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"ਬਾਅਦ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
-    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"ਡੇਟਾ ਨੂੰ ਹੁਣੇ ਮੂਵ ਕਰੋ"</string>
+    <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">" ਡਾਟਾ  ਨੂੰ ਹੁਣੇ ਮੂਵ ਕਰੋ"</string>
     <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"ਇਹ ਮੂਵ ਲਗਭਗ <xliff:g id="TIME">^1</xliff:g> ਲੈਂਦਾ ਹੈ। ਅਤੇ ਇਹ <xliff:g id="NAME">^3</xliff:g> \'ਤੇ <xliff:g id="SIZE">^2</xliff:g> ਨੂੰ ਮੁਕਤ ਕਰ ਏਵੇਗਾ।"</b></string>
     <string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"ਮੂਵ ਕਰੋ"</string>
-    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"ਡੇਟਾ ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"ਮੂਵ ਦੇ ਦੌਰਾਨ \n• <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ. \n• ਕੁਝ ਐਪ ਸਹੀ ਤਰੀਕੇ ਦੇ ਨਾਲ ਕੰਮ ਨਹੀਂ ਕਰਨSome apps won\'t work correctly. \n• Keep the device charged."</string>
+    <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">" ਡਾਟਾ  ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"ਮੂਵ ਦੇ ਦੌਰਾਨ \n• <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ. \n• ਕੁਝ ਐਪ ਸਹੀ ਤਰੀਕੇ ਦੇ ਨਾਲ ਕੰਮ ਨਹੀਂ ਕਰਨ। \n• ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਰੱਖੋ"</string>
     <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> ਤਿਆਰ ਹੈ"</string>
     <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"ਤੁਹਾਡ <xliff:g id="NAME">^1</xliff:g> ਫ਼ੋਟੋਆਂ ਅਤੇ ਦੂਜੇ ਮੀਡੀਆ ਦੇ ਨਾਲ ਉਪਯੋਗ ਕਰਨ ਲਈ ਬਿਲਕੁਲ ਤਿਆਰ ਹੈ."</string>
-    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ਤੁਹਾਡਾ ਨਵਾਂ <xliff:g id="NAME">^1</xliff:g> ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ। \n\nਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਫੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ, ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਮੂਵ ਕਰਨ ਲਈ, ਸੈੱਟਿੰਗਾਂ ਅਤੇ ਸਟੋਰੇਜ \'ਤੇ ਜਾਓ।"</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"ਤੁਹਾਡਾ ਨਵਾਂ <xliff:g id="NAME">^1</xliff:g> ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ। \n\nਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਫੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ, ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਲੈ ਜਾਣ ਲਈ, ਸੈਟਿੰਗਾਂ ਅਤੇ ਸਟੋਰੇਜ \'ਤੇ ਜਾਓ।"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g> ਨੂੰ ਮੂਵ ਕਰੋ"</string>
-    <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ਅਤੇ ਇਸਦੇ ਡੇਟਾ ਨੂੰ <xliff:g id="NAME_0">^2</xliff:g> ਵਿੱਚ ਮੂਵ ਕਰਨਾ ਸਿਰਫ਼ ਕੁਝ ਸਮਾਂ ਲੈਂਦਾ ਹੈ. ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਇਸ ਐਪ ਦਾ ਉਪਯੋਗ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ ਜਦੋਂ ਤੱਕ ਇਹ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ. \n\nਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME_1">^2</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ."</string>
+    <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g> ਅਤੇ ਇਸਦੇ ਡਾਟਾ ਨੂੰ <xliff:g id="NAME_0">^2</xliff:g> ਵਿੱਚ ਮੂਵ ਕਰਨਾ ਸਿਰਫ਼ ਕੁਝ ਸਮਾਂ ਲੈਂਦਾ ਹੈ। ਤੁਸੀਂ ਉਦੋਂ ਤੱਕ ਇਸ ਐਪ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਯੋਗ ਨਹੀਂ ਹੋਵੋਗੇ ਜਦੋਂ ਤੱਕ ਇਹ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ। \n\nਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME_1">^2</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ।"</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> ਨੂੰ ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"ਮੂਵ ਦੇ ਦੌਰਾਨ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ। \n\nਇਸ ਡੀਵਾਈਸ \'ਤੇ <xliff:g id="APP">^2</xliff:g> ਐਪ ਉਦੋਂ ਤੱਕ ਉਪਲਬਧ ਨਹੀਂ ਹੋਵੇਗੀ ਜਦੋਂ ਤੱਕ ਮੂਵ ਪੂਰਾ ਨਹੀਂ ਹੋ ਜਾਂਦਾ ਹੈ।"</string>
-    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ਮੂਵ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
-    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"ਇਹ <xliff:g id="NAME_0">^1</xliff:g> ਹੌਲੀ ਜਾਪਦਾ ਹੈ। \n\nਤੁਸੀਂ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ, ਲੇਕਿਨ ਇਸ ਸਥਾਨ ਵਿੱਚ ਮੂਵ ਕੀਤੀ ਗਈ ਐਪਸ ਅਟਕ ਸਕਦੀ ਹੈ ਅਤੇ ਡੇਟਾ ਟ੍ਰਾਂਸਫ਼ਰ ਵਿੱਚ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। \n\nਬਿਹਤਰ ਪ੍ਰਦਰਸ਼ਨ ਲਈ ਹੋਰ ਤੇਜ਼ <xliff:g id="NAME_1">^1</xliff:g> ਦਾ ਉਪਯੋਗ ਕਰਨ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
+    <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"ਹਲਚਲ ਨੂੰ ਰੱਦ ਕਰੋ"</string>
+    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"ਇਹ <xliff:g id="NAME_0">^1</xliff:g> ਹੌਲੀ ਜਾਪਦਾ ਹੈ। \n\nਤੁਸੀਂ ਜਾਰੀ ਰੱਖ ਸਕਦੇ ਹੋ, ਲੇਕਿਨ ਇਸ ਸਥਾਨ ਵਿੱਚ ਮੂਵ ਕੀਤੀ ਗਈ ਐਪਸ ਅਟਕ ਸਕਦੀ ਹੈ ਅਤੇ  ਡਾਟਾ  ਟ੍ਰਾਂਸਫ਼ਰ ਵਿੱਚ ਵੱਧ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ। \n\nਬਿਹਤਰ ਪ੍ਰਦਰਸ਼ਨ ਲਈ ਹੋਰ ਤੇਜ਼ <xliff:g id="NAME_1">^1</xliff:g> ਦਾ ਉਪਯੋਗ ਕਰਨ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"ਬੈਟਰੀ ਸਥਿਤੀ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ਬੈਟਰੀ ਪੱਧਰ"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"ਪਹੁੰਚ ਬਿੰਦੂ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"ਪਹੁੰਚ ਬਿੰਦੂ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="apn_name" msgid="4115580098369824123">"ਨਾਮ"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -1258,7 +1305,7 @@
     <string name="apn_type" msgid="469613123902220544">"APN ਪ੍ਰਕਾਰ"</string>
     <string name="apn_protocol" msgid="3272222921649348640">"APN ਪ੍ਰੋਟੋਕੋਲ"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN ਰੋਮਿੰਗ ਪ੍ਰੋਟੋਕੋਲ"</string>
-    <string name="carrier_enabled" msgid="407655861175280806">"APN ਸਮਰੱਥ/ਅਸਮਰੱਥ"</string>
+    <string name="carrier_enabled" msgid="407655861175280806">"APN ਚਾਲੂ/ਬੰਦ"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ਸਮਰਥਿਤ"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN ਅਸਮਰਥਿਤ"</string>
     <string name="bearer" msgid="594270280031923558">"ਬੀਅਰਰ"</string>
@@ -1267,44 +1314,50 @@
     <string name="menu_delete" msgid="6981294422841124659">"APN ਮਿਟਾਓ"</string>
     <string name="menu_new" msgid="3014205883303921729">"ਨਵਾਂ APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"ਰੱਖਿਅਤ ਕਰੋ"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"ਖਾਰਜ ਕਰੋ"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"ਰੱਦ ਕਰੋ"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"ਨਾਮ ਖੇਤਰ ਨੂੰ ਖਾਲੀ ਨਹੀਂ ਛੱਡਿਆ ਜਾ ਸਕਦਾ।"</string>
     <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="menu_restore" msgid="8260067415075573273">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਤੇ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="restore_default_apn_completed" msgid="2824775307377604897">"ਪੂਰਵ-ਨਿਰਧਾਰਤ APN ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ।"</string>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"ਇਹ ਨੈੱਟਵਰਕ ਦੀਆਂ ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੇਗਾ, ਜਿਸ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:\n\n"<li>"Wi‑Fi"</li>\n<li>"ਮੋਬਾਈਲ ਡੈਟਾ"</li>\n<li>"ਬਲੂਟੁੱਥ"</li></string>
-    <string name="reset_network_button_text" msgid="2035676527471089853">"ਰੀਸੈੱਟ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="reset_network_final_desc" msgid="6388371121099245116">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਹ ਕਿਰਿਆ ਅਨਡੂ ਨਹੀ ਕਰ ਸਕਦੇ!"</string>
-    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ਰੀਸੈੱਟ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"ਇਹ ਨੈੱਟਵਰਕ ਦੀਆਂ ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੇਗਾ, ਜਿਸ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:\n\n"<li>"ਵਾਈ-ਫਾਈ"</li>\n<li>"ਮੋਬਾਈਲ ਡਾਟਾ"</li>\n<li>"ਬਲੂਟੁੱਥ"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="reset_network_final_desc" msgid="6388371121099245116">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀ ਕਰ ਸਕਦੇ!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"ਕੀ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਨੈੱਟਵਰਕ ਰੀਸੈੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"ਫੈਕਟਰੀ ਡਾਟਾ ਰੀਸੈੱਟ"</string>
     <plurals name="master_clear_with_account_summary" formatted="false" msgid="5911377203778818712">
-      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ਖਾਤਾ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਵੇਗਾ</item>
-      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ਖਾਤੇ ਰੀਸੈੱਟ ਕੀਤੇ ਜਾਣਗੇ</item>
+      <item quantity="one"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ਖਾਤੇ ਰੀਸੈੱਟ ਕੀਤੇੇ ਜਾਣਗੇ</item>
+      <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> ਖਾਤੇ ਰੀਸੈੱਟ ਕੀਤੇੇ ਜਾਣਗੇ</item>
     </plurals>
-    <string name="master_clear_summary" msgid="6902443944660426951">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਅਤੇ ਸਾਰਾ ਡੈਟਾ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਵੇਗਾ"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ਇਹ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>"ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡੈਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ਇਹ ਤੁਹਾਡੇ ਫੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡੈਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡੈਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ"</li></string>
+    <string name="master_clear_summary" msgid="6902443944660426951">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਅਤੇ ਸਾਰਾ ਡਾਟਾ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾਵੇਗਾ"</string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ਇਹ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>"ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਾਂ"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ਤੁਸੀਂ ਇਸ ਵੇਲੇ ਇਹਨਾਂ ਖਾਤਿਆਂ ਤੇ ਸਾਈਨ ਇਨ ਕਰ ਰਹੇ ਹੋ:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ਇਸ ਡੀਵਾਈਸ ਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੌਜੂਦ ਨਹੀਂ ਹਨ।\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ਸੰਗੀਤ"</li>\n<li>"ਫੋਟੋਆਂ"</li>\n<li>"ਹੋਰ ਉਪਭੋਗਤਾ ਡੈਟਾ"</li></string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ਸੰੰਗੀਤ ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਉਪਭੋਗਤਾ ਡੈਟਾ ਹਟਾਉਣ ਲਈ, "<b>"USB ਸਟੋਰੇਜ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਉਪਭੋਗਤਾ ਡੈਟਾ ਹਟਾਉਣ ਲਈ, "<b>"SD ਕਾਰਡ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ਸੰਗੀਤ"</li>\n<li>"ਫੋਟੋਆਂ"</li>\n<li>"ਹੋਰ ਉਪਭੋਗਤਾ  ਡਾਟਾ "</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM \'ਤੇ ਕੈਰੀਅਰ"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ਇਸ ਨਾਲ ਤੁਹਾਡੀ ਮੋਬਾਈਲ ਸੇਵਾ ਯੋਜਨਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਸਾਫ਼ ਕਰਨ ਲਈ, "<b>"USB ਸਟੋਰੇਜ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਉਪਭੋਗਤਾ  ਡਾਟਾ  ਹਟਾਉਣ ਲਈ, "<b>"SD ਕਾਰਡ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ਸਟੋਰੇਜ ਮਿਟਾਓ"</string>
     <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="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ਟੈਬਲੇਟ ਰੀਸੈੱਟ ਕਰੋ"</string>
-    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ਫੋਨ ਰੀਸੈੱਟ ਕਰੋ"</string>
-    <string name="master_clear_final_desc" msgid="7318683914280403086">"ਕੀ ਆਪਣੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਅਤੇ ਡਾਊਨਲੋਡ ਕੀਤੇ ਐਪਸ ਮਿਟਾਉਣੇ ਹਨ? ਤੁਸੀਂ ਇਹ ਕਿਰਿਆ ਅਨਡੂ ਨਹੀਂ ਕਰ ਸਕਦੇ!"</string>
+    <string name="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">"ਟੈਬਲੈੱਟ ਵਿੱਚੋਂ ਸਾਰੇ eSIM ਮਿਟਾਓ। ਇਹ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਸੇਵਾ ਪਲਾਨ ਨੂੰ ਰੱਦ ਨਹੀਂ ਕਰੇਗਾ।"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ਟੈਬਲੈੱਟ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ਫ਼ੋਨ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"ਕੀ ਆਪਣੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਅਤੇ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਮਿਟਾਉਣੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"ਸਭ ਕੁਝ ਮਿਟਾਓ"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"ਕੋਈ ਰੀਸੈੱਟ ਪਰਫੌਰਮ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ ਕਿਉਂਕਿ ਸਿਸਟਮ ਕਲੀਅਰ ਸੇਵਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ਕੀ ਰੀਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
@@ -1312,38 +1365,27 @@
     <string name="master_clear_progress_title" msgid="5194793778701994634">"ਮਿਟਾ ਰਿਹਾ ਹੈ"</string>
     <string name="master_clear_progress_text" msgid="6559096229480527510">"ਕਿਰਪਾ ਕਰਕੇ ਠਹਿਰੋ..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"ਵੌਇਸਮੇਲ, ਕਾਲ ਫਾਰਵਰਡਿੰਗ, ਕਾਲ ਵੇਟਿੰਗ, ਕਾਲਰ ਆਈ.ਡੀ. ਸੈਟ ਅਪ ਕਰੋ"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"ਵੌਇਸਮੇਲ, ਕਾਲ ਫਾਰਵਰਡਿੰਗ, ਕਾਲ ਵੇਟਿੰਗ, ਕਾਲਰ ਆਈ.ਡੀ. ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB ਟੈਦਰਿੰਗ"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ਪੋਰਟੇਬਲ ਹੌਟਸਪੌਟ"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth ਟੈਦਰਿੰਗ"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ਟੀਥਰਿੰਗ"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ਬਲੂਟੁੱਥ ਟੈਦਰਿੰਗ"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ਟੈਦਰਿੰਗ"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਹੈ, ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਹੈ"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ਟੈਦਰਿੰਗ ਚਾਲੂ ਹੈ"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ਟੈਦਰਿੰਗ"</string>
     <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="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="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_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>
@@ -1356,16 +1398,16 @@
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"ਕੀ ਵਾਈ‑ਫਾਈ ਸਹਾਇਕ ਬਦਲਣਾ ਹੈ?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"ਕੀ ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ਦੀ ਬਜਾਇ  <xliff:g id="NEW_APP">%1$s</xliff:g> ਨੂੰ ਵਰਤਣਾ ਹੈ?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"ਕੀ ਆਪਣੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ <xliff:g id="NEW_APP">%s</xliff:g> ਵਰਤਣਾ ਹੈ?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"ਅਗਿਆਤ SIM ਓਪਰੇਟਰ"</string>
+    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"ਅਗਿਆਤ ਸਿਮ ਓਪਰੇਟਰ"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> ਦੀ ਕੋਈ ਗਿਆਤ ਵਿਵਸਥਾਕਰਨ ਵੈੱਬਸਾਈਟ ਨਹੀਂ ਹੈ"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"ਕਿਰਪਾ ਕਰਕੇ SIM ਕਾਰਡ ਪਾਓ ਅਤੇ ਰੀਸਟਾਰਟ ਕਰੋ"</string>
-    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ਕਿਰਪਾ ਕਰਕੇ ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ਕਿਰਪਾ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="location_title" msgid="1029961368397484576">"ਮੇਰਾ ਟਿਕਾਣਾ"</string>
-    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
+    <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ਮੋਡ"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ਉੱਚ ਸ਼ੁੱਧਤਾ"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ਬੈਟਰੀ ਦੀ ਬਚਤ"</string>
-    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ਸਿਰਫ਼ ਡੀਵਾਈਸ"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ਕੇਵਲ ਡੀਵਾਈਸ"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"ਟਿਕਾਣਾ ਬੰਦ"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ਐਪ-ਪੱਧਰ ਇਜਾਜ਼ਤਾਂ"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"ਹਾਲੀਆ ਟਿਕਾਣਾ ਬੇਨਤੀਆਂ"</string>
@@ -1374,32 +1416,32 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"ਉੱਚ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ਘੱਟ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <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_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="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>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth ਸਕੈਨਿੰਗ"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ Bluetooth ਡੀਵਾਈਸਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
-    <string name="location_neighborhood_level" msgid="5141318121229984788">"ਐਪਸ ਨੂੰ ਤੁਹਾਡੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਤੇਜ਼ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ Google ਦੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾ ਵਰਤਣ ਦਿਓ। ਅਨਾਮ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਡੈਟਾ ਇਕੱਤਰ ਕੀਤਾ ਜਾਏਗਾ ਅਤੇ Google ਨੂੰ ਭੇਜਿਆ ਜਾਏਗਾ।"</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi ਵੱਲੋਂ ਨਿਸ਼ਚਿਤ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ਵਾਈ‑ਫਾਈ ਸਕੈਨਿੰਗ"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ਬਲੂਟੁੱਥ ਸਕੈਨਿੰਗ"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"ਵਾਈ‑ਫਾਈ &amp; ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਟਿਕਾਣਾ"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"ਐਪਸ ਨੂੰ ਤੁਹਾਡੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਤੇਜ਼ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ Google ਦੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾ ਵਰਤਣ ਦਿਓ। ਅਨਾਮ ਨਿਰਧਾਰਿਤ ਸਥਾਨ  ਡਾਟਾ  ਇਕੱਤਰ ਕੀਤਾ ਜਾਏਗਾ ਅਤੇ Google ਨੂੰ ਭੇਜਿਆ ਜਾਏਗਾ।"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ਵਾਈ‑ਫਾਈ ਵੱਲੋਂ ਪਤਾ ਲਗਾਇਆ ਟਿਕਾਣਾ"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS ਸੈਟੇਲਾਈਟਸ"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"ਆਪਣੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਨੂੰ ਸੁਨਿਸ਼ਚਿਤ ਕਰਨ ਲਈ ਐਪਸ ਨੂੰ ਆਪਣੀ ਟੈਬਲੇਟ ਤੇ GPS ਵਰਤਣ ਦਿਓ"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"ਆਪਣੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਨੂੰ ਸੁਨਿਸ਼ਚਿਤ ਕਰਨ ਲਈ ਐਪਸ ਨੂੰ ਆਪਣੇ ਫੋਨ ਤੇ GPS ਵਰਤਣ ਦਿਓ"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"ਆਪਣੇ ਟਿਕਾਣੇ ਨੂੰ ਸੁਨਿਸ਼ਚਿਤ ਕਰਨ ਲਈ ਐਪਾਂ ਨੂੰ ਆਪਣੇ ਟੈਬਲੈੱਟ ਤੇ GPS ਵਰਤਣ ਦਿਓ"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"ਆਪਣੇ ਟਿਕਾਣੇ ਨੂੰ ਸੁਨਿਸ਼ਚਿਤ ਕਰਨ ਲਈ ਐਪਾਂ ਨੂੰ ਆਪਣੇ ਫ਼ੋਨ ਤੇ GPS ਵਰਤਣ ਦਿਓ"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"ਸਹਾਇਤ ਪ੍ਰਾਪਤ GPS ਵਰਤੋ"</string>
-    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ਦੀ ਸਹਾਇਤਾ ਲਈ ਸਰਵਰ ਵਰਤੋ (ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਘੱਟ ਕਰਨ ਲਈ ਅਨਚੈਕ ਕਰੋ)"</string>
-    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ਦੀ ਸਹਾਇਤਾ ਲਈ ਸਰਵਰ ਵਰਤੋ (GPS ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਅਨਚੈਕ ਕਰੋ)"</string>
+    <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ਦੀ ਸਹਾਇਤਾ ਲਈ ਸਰਵਰ ਵਰਤੋ (ਨੈੱਟਵਰਕ ਵਰਤੋਂ ਘੱਟ ਕਰਨ ਲਈ ਨਿਸ਼ਾਨ ਹਟਾਓ)"</string>
+    <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ਦੀ ਸਹਾਇਤਾ ਲਈ ਸਰਵਰ ਵਰਤੋ (GPS ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਨਿਸ਼ਾਨ ਹਟਾਓ)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"ਟਿਕਾਣਾ &amp; Google ਖੋਜ"</string>
-    <string name="use_location_summary" msgid="3978805802386162520">"Google ਨੂੰ ਖੋਜ ਨਤੀਜਿਆਂ ਅਤੇ ਹੋਰ ਸੇਵਾਵਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਤੁਹਾਡਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਵਰਤਣ ਦਿਓ"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"ਮੇਰੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Google ਨੂੰ ਖੋਜ ਨਤੀਜਿਆਂ ਅਤੇ ਹੋਰ ਸੇਵਾਵਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਉਣ ਲਈ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਵਰਤਣ ਦਿਓ"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"ਮੇਰੇ ਟਿਕਾਣਾ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="location_access_summary" msgid="69031404093194341">"ਜਿਹਨਾਂ ਐਪਸ ਨੇ ਤੁਹਾਡੀ ਅਨੁਮਤੀ ਮੰਗੀ ਹੈ, ਉਹਨਾਂ ਨੂੰ ਆਪਣੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਜਾਣਕਾਰੀ ਵਰਤਣ ਦਿਓ"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"ਨਿਰਧਾਰਿਤ ਸਰੋਤ"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"ਟੈਬਲੇਟ ਬਾਰੇ"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"ਟੈਬਲੈੱਟ ਬਾਰੇ"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ਫ਼ੋਨ ਬਾਰੇ"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"ਇਮੂਲੇਟ ਕੀਤੇ ਡੀਵਾਈਸ ਬਾਰੇ"</string>
-    <string name="about_settings_summary" msgid="3371517697156165959">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ, ਸਥਿਤੀ, ਸੌਫਟਵੇਅਰ ਰੂਪ ਦੇਖੋ"</string>
+    <string name="about_settings_summary" msgid="3371517697156165959">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ, ਸਥਿਤੀ, ਸਾਫ਼ਟਵੇਅਰ ਵਰਜਨ ਦੇਖੋ"</string>
     <string name="legal_information" msgid="5769301644270604095">"ਕਨੂੰਨੀ ਜਾਣਕਾਰੀ"</string>
     <string name="contributors_title" msgid="5917703088825286504">"ਸਹਿਯੋਗੀ"</string>
     <string name="manual" msgid="3025943393642974445">"ਮੈਨੁਅਲ"</string>
@@ -1418,18 +1460,21 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"ਲੋਡ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"ਸੁਰੱਖਿਆ ਜਾਣਕਾਰੀ"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਡੈਟਾ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ। ਹੁਣ ਇਸ ਜਾਣਕਾਰੀ ਨੂੰ ਦੇਖਣ ਲਈ, ਇੰਟਰਨੈਟ ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਕਿਸੇ ਵੀ ਕੰਪਿਊਟਰ ਤੋਂ %s ਤੇ ਜਾਓ।"</string>
+    <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>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"ਪਾਸਵਰਡ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"ਪਿੰਨ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ਅਨਲੌਕ ਚੋਣ"</string>
-    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"ਪਾਸਵਰਡ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਗਿਆ ਹੈ"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"ਅਣਲਾਕ ਚੋਣ"</string>
+    <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"ਪਾਸਵਰਡ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"ਪਿੰਨ ਸੈੱਟ ਹੋ ਗਿਆ ਹੈ"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ਪੈਟਰਨ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਗਿਆ ਹੈ"</string>
     <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣੇ ਡੀਵਾਈਸ ਦਾ ਪੈਟਰਨ ਵਰਤੋ"</string>
@@ -1444,66 +1489,69 @@
     <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪੈਟਰਨ ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦਾ ਹੈ।"</string>
     <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਿੰਨ ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦਾ ਹੈ।"</string>
     <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"ਜਾਰੀ ਰੱਖਣ ਲਈ ਆਪਣਾ ਕੰਮ ਸਬੰਧੀ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ। ਡੀਵਾਈਸ ਦੇ ਦੁਬਾਰਾ ਚਾਲੂ ਹੋਣ \'ਤੇ ਲੋੜੀਂਦਾ ਹੈ।"</string>
-    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ਗ਼ਲਤ ਪਿੰਨ"</string>
-    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ਗ਼ਲਤ ਪਾਸਵਰਡ"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"ਗਲਤ ਪਿੰਨ"</string>
+    <string name="lockpassword_invalid_password" msgid="4038507398784975200">"ਗਲਤ ਪਾਸਵਰਡ"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"ਗ਼ਲਤ ਪੈਟਰਨ"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ"</string>
-    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"ਅਨਲੌਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ਅਨਲੌਕ ਪਿੰਨ ਬਦਲੋ"</string>
-    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ਅਨਲੌਕ ਕਰਨ ਲਈ ਇੱਕ ਪੈਟਰਨ ਉਲੀਕੋ"</string>
+    <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"ਅਣਲਾਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
+    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"ਅਣਲਾਕ ਪਿੰਨ ਬਦਲੋ"</string>
+    <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"ਅਣਲਾਕ ਕਰਨ ਲਈ ਇੱਕ ਪੈਟਰਨ ਉਲੀਕੋ"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"ਮਦਦ ਲਈ ਮੀਨੂ ਦਬਾਓ।"</string>
     <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"ਜਦੋਂ ਹੋ ਜਾਏ ਤਾਂ ਉਂਗਲ ਹਟਾਓ"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"ਘੱਟੋ-ਘੱਟ <xliff:g id="NUMBER">%d</xliff:g> ਬਿੰਦੂਆਂ ਨੂੰ ਜੋੜੋ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"ਪੈਟਰਨ ਰਿਕਾਰਡ ਕੀਤਾ"</string>
-    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਦੁਬਾਰਾ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰੋ"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"ਤੁਹਾਡਾ ਨਵਾਂ ਅਨਲੌਕ ਪੈਟਰਨ"</string>
+    <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"ਪੈਟਰਨ ਰਿਕਾਰਡ ਹੋ ਗਿਆ"</string>
+    <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਦੁਬਾਰਾ ਪੈਟਰਨ ਉਲੀਕੋ"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"ਤੁਹਾਡਾ ਨਵਾਂ ਅਣਲਾਕ ਪੈਟਰਨ"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"ਰੀਡ੍ਰਾ ਕਰੋ"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"ਹਟਾਓ"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="lockpattern_settings_title" msgid="3207750489460466680">"ਪੈਟਰਨ ਅਨਲੌਕ ਕਰੋ"</string>
+    <string name="lockpattern_settings_title" msgid="3207750489460466680">"ਪੈਟਰਨ ਅਣਲਾਕ ਕਰੋ"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"ਲੁੜੀਂਦਾ ਪੈਟਰਨ"</string>
-    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
+    <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"ਪੈਟਰਨ ਨੂੰ ਦਿਖਣਯੋਗ ਬਣਾਓ"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"ਪ੍ਰੋਫਾਈਲ ਪੈਟਰਨ ਨੂੰ ਦਿਖਣਯੋਗ ਬਣਾਓ"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"ਟੈਪ \'ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ਪਾਵਰ ਬਟਨ ਤੁਰੰਤ ਲੌਕ ਹੁੰਦਾ ਹੈ"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਨਲੌਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
-    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ਅਨਲੌਕ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"ਅਨਲੌਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"ਇੱਕ ਅਨਲੌਕ ਪੈਟਰਨ ਕਿਵੇਂ ਉਲੀਕੀਏ"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ਪਾਵਰ ਬਟਨ ਤੁਰੰਤ  ਲਾਕ  ਹੁੰਦਾ ਹੈ"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਅਣਲਾਕ ਰੱਖਿਆ ਹੋਵੇ"</string>
+    <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ਅਣਲਾਕ ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"ਅਣਲਾਕ ਪੈਟਰਨ ਬਦਲੋ"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"ਇੱਕ ਅਣਲਾਕ ਪੈਟਰਨ ਕਿਵੇਂ ਉਲੀਕੀਏ"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"ਬਹੁਤ ਸਾਰੀਆਂ ਗ਼ਲਤ ਕੋਸ਼ਿਸ਼ਾਂ। <xliff:g id="NUMBER">%d</xliff:g> ਸਕਿੰਟਾਂ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="activity_not_found" msgid="5551664692991605325">"ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀ ਹੈ।"</string>
-    <string name="lock_settings_profile_title" msgid="2121876391814535295">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ"</string>
-    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ ਲੌਕ"</string>
-    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"ਇੱਕ ਲੌਕ ਵਰਤੋ"</string>
-    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲਈ ਇੱਕ ਲੌਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
-    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"ਕੀ ਇੱਕ ਲੌਕ ਵਰਤਣਾ ਹੈ?"</string>
-    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ ਲੌਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗਾ। ਕਾਰਜ ਨੀਤੀਆਂ ਦੋਵਾਂ ਲੌਕਾਂ \'ਤੇ ਲਾਗੂ ਹੋਣਗੀਆਂ।"</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲੌਕ ਤੁਹਾਡੀ ਸੰਸਥਾ ਦੀਆਂ ਸੁਰੱਖਿਆ ਲੋੜਾਂ ਨੂੰ ਪੂਰਾ ਨਹੀਂ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਇੱਕੋ ਲੌਕ ਦੀ ਵਰਤੋਂ ਆਪਣੇ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਅਤੇ ਆਪਣੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ ਕੋਈ ਵੀ ਕਾਰਜ ਲੌਕ ਨੀਤੀਆਂ ਲਾਗੂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ।"</string>
-    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"ਇੱਕ ਲੌਕ ਵਰਤੋ"</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"ਇੱਕ ਲੌਕ ਵਰਤੋ"</string>
-    <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲੌਕ ਵਰਗਾ"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਹੈ।"</string>
+    <string name="lock_settings_profile_title" msgid="2121876391814535295">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੁਰੱਖਿਆ"</string>
+    <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ  ਲਾਕ"</string>
+    <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"ਇੱਕ  ਲਾਕ  ਵਰਤੋ"</string>
+    <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਤੇ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲਈ ਇੱਕ ਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"ਕੀ ਇੱਕ  ਲਾਕ  ਵਰਤਣਾ ਹੈ?"</string>
+    <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰੇਗਾ। ਕਾਰਜ ਨੀਤੀਆਂ ਦੋਵਾਂ ਲਾਕਾਂ \'ਤੇ ਲਾਗੂ ਹੋਣਗੀਆਂ।"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"ਤੁਹਾਡਾ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਾਕ ਤੁਹਾਡੀ ਸੰਸਥਾ ਦੀਆਂ ਸੁਰੱਖਿਆ ਲੋੜਾਂ ਨੂੰ ਪੂਰਾ ਨਹੀਂ ਕਰਦਾ ਹੈ। ਤੁਸੀਂ ਇੱਕੋ ਲਾਕ ਦੀ ਵਰਤੋਂ ਆਪਣੇ ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਅਤੇ ਆਪਣੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਕਰ ਸਕਦੇ ਹੋ, ਪਰ ਕੋਈ ਵੀ ਕਾਰਜ ਲਾਕ ਨੀਤੀਆਂ ਲਾਗੂ ਕੀਤੀਆਂ ਜਾਣਗੀਆਂ।"</string>
+    <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"ਇੱਕ  ਲਾਕ  ਵਰਤੋ"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"ਇੱਕ  ਲਾਕ  ਵਰਤੋ"</string>
+    <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"ਡੀਵਾਈਸ ਸਕ੍ਰੀਨ ਲਾਕ ਵਰਗਾ"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ ਅਤੇ ਹਟਾਓ"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਵਿਵਸਥਿਤ ਕਰੋ ਅਤੇ ਹਟਾਓ"</string>
     <string name="applications_settings" msgid="5281808652705396152">"ਐਪ ਜਾਣਕਾਰੀ"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"ਐਪਸ ਵਿਵਸਥਿਤ ਕਰੋ, ਤਤਕਾਲ ਲੌਂਚ ਸ਼ਾਰਟਕੱਟ ਸੈਟ ਅਪ ਕਰੋ"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"ਐਪਾਂ ਵਿਵਸਥਿਤ ਕਰੋ, ਤਤਕਾਲ ਲਾਂਚ ਸ਼ਾਰਟਕੱਟ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
     <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="install_all_warning" product="tablet" msgid="8310489909586138165">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡੈਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="install_all_warning" product="default" msgid="1952257127370115988">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਅਗਿਆਤ ਐਪਾਂ ਤੋਂ ਹਮਲੇ ਪ੍ਰਤੀ ਵਧੇਰੇ ਵਿੰਨਣਸ਼ੀਲ ਹਨ। ਇਸ ਸਰੋਤ ਤੋਂ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰ ਕੇ, ਤੁਸੀਂ ਸਹਿਮਤੀ ਦਿੰਦੇ ਹੋ ਕਿ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਹੋਣ ਵਾਲੇ ਕਿਸੇ ਵੀ ਨੁਕਸਾਨ ਜਾਂ ਡੈਟੇ ਦੇ ਗੁੰਮ ਹੋਣ ਲਈ ਤੁਸੀਂ ਜ਼ਿੰਮੇਵਾਰ ਹੋ ਜੋ ਸ਼ਾਇਦ ਇਹਨਾਂ ਐਪਾਂ ਨੂੰ ਵਰਤਣ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਹੋ ਸਕਦਾ ਹੈ।"</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>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"ਹੋਰ ਸੈਟਿੰਗਾਂ ਚੋਣਾਂ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"ਹੋਰ ਸੈਟਿੰਗਾਂ ਚੋਣਾਂ ਚਾਲੂ ਕਰੋ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"ਐਪ ਜਾਣਕਾਰੀ"</string>
     <string name="storage_label" msgid="8700867073480107253">"ਸਟੋਰੇਜ"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਵਜੋਂ ਖੋਲ੍ਹੋ"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ਡਿਫੌਲਟਸ"</string>
-    <string name="screen_compatibility_label" msgid="663250687205465394">"ਸਕ੍ਰੀਨ ਅਨੁਕੂਲਤਾ"</string>
-    <string name="permissions_label" msgid="2605296874922726203">"ਅਨੁਮਤੀਆਂ"</string>
-    <string name="cache_header_label" msgid="1877197634162461830">"ਕੈਚ"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ਕੈਚ ਹਟਾਓ"</string>
-    <string name="cache_size_label" msgid="7505481393108282913">"ਕੈਚ"</string>
+    <string name="screen_compatibility_label" msgid="663250687205465394">"ਸਕ੍ਰੀਨ ਅਨੁਰੂਪਤਾ"</string>
+    <string name="permissions_label" msgid="2605296874922726203">"ਇਜਾਜ਼ਤਾਂ"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"ਕੈਸ਼ੇ"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ਕੈਸ਼ੇ ਹਟਾਓ"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"ਕੈਸ਼ੇ"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
       <item quantity="one">%d ਆਈਟਮਾਂ</item>
       <item quantity="other">%d ਆਈਟਮਾਂ</item>
@@ -1514,18 +1562,18 @@
     <string name="total_size_label" msgid="1048676419552557254">"ਕੁੱਲ"</string>
     <string name="application_size_label" msgid="7376689739076506885">"ਐਪ ਦਾ ਆਕਾਰ"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB ਸਟੋਰੇਜ ਐਪ"</string>
-    <string name="data_size_label" msgid="6117971066063850416">"ਵਰਤੋਂਕਾਰ ਦਾ ਡੈਟਾ"</string>
-    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB ਸਟੋਰੇਜ ਡੈਟਾ"</string>
+    <string name="data_size_label" msgid="6117971066063850416">"ਵਰਤੋਂਕਾਰ ਦਾ  ਡਾਟਾ"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB ਸਟੋਰੇਜ ਡਾਟਾ"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD ਕਾਰਡ"</string>
-    <string name="uninstall_text" msgid="3644892466144802466">"ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="uninstall_all_users_text" msgid="851857393177950340">"ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਲਈ ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="install_text" msgid="884360662922471113">"ਇੰਸਟੌਲ ਕਰੋ"</string>
+    <string name="uninstall_text" msgid="3644892466144802466">"ਅਣਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="uninstall_all_users_text" msgid="851857393177950340">"ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਲਈ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="install_text" msgid="884360662922471113">"ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="disable_text" msgid="6544054052049395202">"ਅਸਮਰੱਥ ਬਣਾਓ"</string>
-    <string name="enable_text" msgid="9217362512327828987">"ਸਮਰੱਥ ਬਣਾਓ"</string>
-    <string name="clear_user_data_text" msgid="5597622864770098388">"ਡੈਟਾ ਹਟਾਓ"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"ਅਪਡੇਟਾਂ ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="auto_launch_enable_text" msgid="4275746249511874845">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਕੁਝ ਕਿਰਿਆਵਾਂ ਲਈ ਬਾਇ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਲੌਂਚ ਕਰਨ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਲਈ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡੈਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
+    <string name="enable_text" msgid="9217362512327828987">"ਚਾਲੂ ਕਰੋ"</string>
+    <string name="clear_user_data_text" msgid="5597622864770098388">" ਡਾਟਾ  ਹਟਾਓ"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"ਅੱਪਡੇਟਾਂ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="auto_launch_enable_text" msgid="4275746249511874845">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਕੁਝ ਕਾਰਵਾਈਆਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਤੌਰ \'ਤੇ ਲਾਂਚ ਕਰਨ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਲਈ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਦੀ ਚੋਣ ਕੀਤੀ ਹੈ।"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ਕੋਈ ਡਿਫੌਲਟਸ ਸੈਟ ਨਹੀਂ ਕੀਤੇ"</string>
     <string name="clear_activities" msgid="7408923511535174430">"ਡਿਫੌਲਟਸ ਹਟਾਓ"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ਇਹ ਐਪ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲਈ ਡਿਜਾਈਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਤੁਸੀਂ ਇਸਤੇ ਨਿਯੰਤਰਣ ਪਾ ਸਕਦੇ ਹੋ ਕਿ ਇਹ ਇੱਥੇ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਕਿਵੇਂ ਵਿਵਸਥਿਤ ਕਰੇ।"</string>
@@ -1539,11 +1587,11 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"ਆਪਾਤਕਾਲ ਐਪ"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"ਐਪ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"ਕੀ ਐਪ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ਇਹ ਨਿਮਨਲਿਖਤ ਲਈ ਸਾਰੀਆਂ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰ ਦੇਵੇਗਾ:\n\n "<li>"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪਾਂ"</li>\n" "<li>"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪ ਸੂਚਨਾਵਾਂ"</li>\n" "<li>"ਕਿਰਿਆਵਾਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਲੀਕੇਸ਼ਨਾਂ"</li>\n" "<li>"ਐਪਾਂ ਲਈ ਪਿਛੋਕੜ ਡੈਟਾ ਪਾਬੰਦੀਆਂ"</li>\n" "<li>"ਕੋਈ ਵੀ ਇਜਾਜ਼ਤ ਪਾਬੰਦੀਆਂ"</li>\n\n" ਤੁਹਾਡਾ ਕੋਈ ਵੀ ਐਪ ਡੈਟਾ ਨਸ਼ਟ ਨਹੀਂ ਹੋਵੇਗਾ।"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ਇਹ ਨਿਮਨਲਿਖਤ ਲਈ ਸਾਰੀਆਂ ਤਰਜੀਹਾਂ ਰੀਸੈੱਟ ਕਰ \n\n "<li>"ਅਯੋਗ ਬਣਾਈਆਂ "</li>\n" "<li>"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪਾਂ"</li>\n" "<li>"ਕਿਰਿਆਵਾਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਲੀਕੇਸ਼ਨਾਂ"</li>\n" "<li>"ਐਪਾਂ ਲਈ ਪਿਛੋਕੜ ਡਾਟਾ ਪਾਬੰਦੀਆਂ"</li>\n" "<li>"ਕੋਈ ਵੀ ਇਜਾਜ਼ਤ ਪਾਬੰਦੀਆਂ"</li>\n\n" ਤੁਹਾਡਾ ਕੋਈ ਵੀ ਐਪ ਡਾਟਾ ਨਸ਼ਟ ਨਹੀਂ ਹੋਵੇਗਾ।"</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"ਐਪਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"ਸਪੇਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="filter" msgid="2018011724373033887">"ਫਿਲਟਰ"</string>
-    <string name="filter_dlg_title" msgid="8693024463731076091">"ਫਿਲਟਰ ਚੋਣਾਂ ਚੁਣੋ"</string>
+    <string name="filter_dlg_title" msgid="8693024463731076091">"ਫਿਲਟਰ ਵਿਕਲਪ ਚੁਣੋ"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"ਸਾਰੀਆਂ ਐਪਾਂ"</string>
     <string name="filter_apps_disabled" msgid="5862632369555319938">"ਅਯੋਗ ਬਣਾਈਆਂ ਐਪਾਂ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ਡਾਊਨਲੋਡ ਕੀਤਾ"</string>
@@ -1554,23 +1602,23 @@
     <string name="installed" msgid="3070865169422600098">"ਸਥਾਪਤ"</string>
     <string name="no_applications" msgid="7336588977497084921">"ਕੋਈ ਐਪਾਂ ਨਹੀਂ।"</string>
     <string name="internal_storage" msgid="1584700623164275282">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
-    <string name="internal_storage_sentence" msgid="889098931914857143">"ਅੰਦਰਲੀ ਸਟੋਰੇਜ"</string>
+    <string name="internal_storage_sentence" msgid="889098931914857143">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB ਸਟੋਰੇਜ"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD ਕਾਰਡ ਸਟੋਰੇਜ"</string>
     <string name="recompute_size" msgid="7722567982831691718">"ਅਕਾਰ ਰੀਕੰਪਿਊਟ ਕਰ ਰਿਹਾ ਹੈ..."</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"ਕੀ ਐਪ ਡੈਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"ਇਸ ਐਪ ਦਾ ਸਾਰਾ ਡੈਟਾ ਸਥਾਈ ਤੌਰ ਤੇ ਮਿਟਾਇਆ ਜਾਏਗਾ। ਇਸ ਵਿੱਚ ਸਾਰੀਆਂ ਫਾਈਲਾਂ, ਸੈਟਿੰਗਾਂ, ਖਾਤੇ, ਡੈਟਾਬੇਸ ਆਦਿ ਸ਼ਾਮਲ ਹਨ।"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"ਕੀ ਐਪ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"ਇਸ ਐਪ ਦਾ ਸਾਰਾ ਡਾਟਾ ਸਥਾਈ ਤੌਰ ਤੇ ਮਿਟਾਇਆ ਜਾਏਗਾ। ਇਸ ਵਿੱਚ ਸਾਰੀਆਂ ਫ਼ਾਈਲਾਂ, ਸੈਟਿੰਗਾਂ, ਖਾਤੇ, ਡਾਟਾਬੇਸ ਆਦਿ ਸ਼ਾਮਲ ਹਨ।"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ਠੀਕ"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ਰੱਦ ਕਰੋ"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"ਐਪ ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਦੀ ਸੂਚੀ ਵਿੱਚ ਨਹੀਂ ਮਿਲਿਆ ਸੀ।"</string>
-    <string name="clear_data_failed" msgid="7214074331627422248">"ਐਪ ਡੈਟਾ ਨਹੀਂ ਹਟਾ ਸਕਿਆ"</string>
-    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"ਡੈਟਾ ਹਟਾਓ"</string>
-    <string name="clear_failed_dlg_text" msgid="5464475937929941008">"ਐਪ ਲਈ ਡੈਟਾ ਨਹੀਂ ਹਟਾ ਸਕਿਆ।"</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ਇਹ ਐਪ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ:"</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਇਹ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ਇਹ ਐਪ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦਾ ਹੈ। ਪਰਫੌਰਮੈਂਸ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਅਨੁਮਤੀਆਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ਤੇ ਉਪਲਬਧ ਹਨ ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦਾ ਹੈ। ਪਰਫੌਰਮੈਂਸ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਅਨੁਮਤੀਆਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ਤੇ ਉਪਲਬਧ ਹਨ ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
+    <string name="clear_data_failed" msgid="7214074331627422248">"ਐਪ  ਡਾਟਾ  ਨਹੀਂ ਹਟਾ ਸਕਿਆ"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">" ਡਾਟਾ  ਹਟਾਓ"</string>
+    <string name="clear_failed_dlg_text" msgid="5464475937929941008">"ਐਪ ਲਈ  ਡਾਟਾ  ਨਹੀਂ ਹਟਾ ਸਕਿਆ।"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੀ ਹੈ:"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਇਹ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੀ ਹੈ:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦੀ ਹੈ। ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਇਜਾਜ਼ਤਾਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> \'ਤੇ ਉਪਲਬਧ ਹਨ, ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦਾ ਹੈ। ਪਰਫੌਰਮੈਂਸ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਇਜਾਜ਼ਤਾਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ਤੇ ਉਪਲਬਧ ਹਨ ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ਅਤੇ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ਅਤੇ <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
@@ -1581,31 +1629,31 @@
     <string name="computing_size" msgid="1599186977475211186">"ਹਿਸਾਬ ਲਗਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"ਪੈਕੇਜ ਅਕਾਰ ਨੂੰ ਕੰਪਿਊਟ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
     <string name="empty_list_msg" msgid="3552095537348807772">"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਤੀਜੀ-ਪਾਰਟੀ ਦੇ ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਨਹੀਂ ਹਨ।"</string>
-    <string name="version_text" msgid="9189073826278676425">"ਰੂਪ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="version_text" msgid="9189073826278676425">"ਵਰਜਨ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"ਮੂਵ ਕਰੋ"</string>
-    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ਟੈਬਲੇਟ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
-    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ਫੋਨ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
-    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB ਸਟੋਰੇਜ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ਟੈਬਲੈੱਟ ਵਿੱਚ ਲਿਜਾਓ"</string>
+    <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ਫ਼ੋਨ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB ਸਟੋਰੇਜ ਵਿੱਚ ਲਿਜਾਓ"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD ਕਾਰਡ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
     <string name="moving" msgid="6431016143218876491">"ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="another_migration_already_in_progress" msgid="7817354268848365487">"ਕੋਈ ਹੋਰ ਮਾਈਗ੍ਰੇਸ਼ਨ ਪਹਿਲਾਂ ਤੋਂ ਹੀ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਹੈ।"</string>
-    <string name="insufficient_storage" msgid="481763122991093080">"ਕਾਫ਼ੀ ਸਟੋਰੇਜ ਸਪੇਸ ਨਹੀਂ।"</string>
+    <string name="insufficient_storage" msgid="481763122991093080">"ਸਟੋਰੇਜ ਲਈ ਲੋੜੀਂਦੀ ਜਗ੍ਹਾ ਨਹੀਂ ਹੈ।"</string>
     <string name="does_not_exist" msgid="1501243985586067053">"ਐਪ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"ਐਪ ਕਾਪੀ-ਸੁਰੱਖਿਅਤ ਹੈ।"</string>
-    <string name="invalid_location" msgid="4354595459063675191">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਇੰਸਟੌਲ ਕਰਨਾ ਪ੍ਰਮਾਣਿਕ ਨਹੀਂ ਹੈ।"</string>
+    <string name="invalid_location" msgid="4354595459063675191">"ਟਿਕਾਣਾ ਸਥਾਪਤ ਕਰਨਾ ਵੈਧ ਨਹੀਂ ਹੈ।"</string>
     <string name="system_package" msgid="1352722848400644991">"ਸਿਸਟਮ ਅਪਡੇਟਾਂ ਬਾਹਰੀ ਮੀਡੀਆ ਤੇ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ।"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਬਾਹਰੀ ਮੀਡੀਆ \'ਤੇ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"ਕੀ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"ਜੇ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਇਹ ਠੀਕ ਤਰ੍ਹਾਂ ਕਾਰਜ ਨਾ ਕਰੇ।"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ਐਪ ਮੂਵ ਨਹੀਂ ਕਰ ਸਕਿਆ। <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <string name="app_install_location_title" msgid="2068975150026852168">"ਤਰਜੀਹੀ ਇੰਸਟੌਲ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"ਤਰਜੀਹੀ ਸਥਾਪਤ ਟਿਕਾਣਾ"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"ਨਵੇਂ ਐਪਸ ਲਈ ਤਰਜੀਹੀ ਇੰਸਟੌਲੇਸ਼ਨ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਬਦਲੋ"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"ਕੀ ਬਿਲਟ-ਇਨ ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਓ"</string>
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ Android ਅਤੇ ਹੋਰ ਐਪਾਂ ਉਸ ਤਰ੍ਹਾਂ ਕੰਮ ਨਾ ਕਰਨ ਜਿਵੇਂ ਇਹਨਾਂ ਤੋਂ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।"</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ਕੀ ਡੈਟਾ ਮਿਟਾਉਣਾ ਹੈ ਅਤੇ ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ Android ਅਤੇ ਹੋਰ ਐਪਾਂ ਉਸ ਤਰ੍ਹਾਂ ਕੰਮ ਨਾ ਕਰਨ ਜਿਵੇਂ ਇਹਨਾਂ ਤੋਂ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਤੁਹਾਡਾ ਡੈਟਾ ਵੀ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ਕੀ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ ਅਤੇ ਐਪ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
+    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ Android ਅਤੇ ਹੋਰ ਐਪਾਂ ਉਸ ਤਰ੍ਹਾਂ ਕੰਮ ਨਾ ਕਰਨ ਜਿਵੇਂ ਇਹਨਾਂ ਤੋਂ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਤੁਹਾਡਾ  ਡਾਟਾ  ਵੀ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ਕੀ ਸੂਚਨਾਵਾਂ ਬੰਦ ਕਰਨੀਆਂ ਹਨ?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਸੂਚਨਾਵਾਂ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਤੋਂ ਮਹੱਤਵਪੂਰਣ ਚਿਤਾਵਨੀਆਂ ਅਤੇ ਅਪਡੇਟਾਂ ਖੁੰਝ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"ਸਟੋਰ"</string>
@@ -1615,9 +1663,9 @@
     <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"ਦੌੜ"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ਕਦੇ ਵੀ ਨਹੀਂ ਵਰਤਿਆ)"</string>
-    <string name="no_default_apps" msgid="2915315663141025400">"ਕੋਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਸ ਨਹੀਂ।"</string>
+    <string name="no_default_apps" msgid="2915315663141025400">"ਕੋਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਾਂ ਨਹੀਂ।"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ਸਟੋਰੇਜ ਵਰਤੋਂ"</string>
-    <string name="storageuse_settings_summary" msgid="3748286507165697834">"ਐਪਸ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਸਟੋਰੇਜ ਦੇਖੋ"</string>
+    <string name="storageuse_settings_summary" msgid="3748286507165697834">"ਐਪਾਂ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਸਟੋਰੇਜ ਦੇਖੋ"</string>
     <string name="service_restarting" msgid="2242747937372354306">"ਰੀਸਟਾਰਟ ਹੋ ਰਿਹਾ ਹੈ"</string>
     <string name="cached" msgid="1059590879740175019">"ਕੈਚ ਕੀਤੀ ਪਿਛੋਕੜ ਪ੍ਰਕਿਰਿਆ"</string>
     <string name="no_running_services" msgid="2059536495597645347">"ਕੁਝ ਨਹੀਂ ਚੱਲ ਰਿਹਾ।"</string>
@@ -1635,7 +1683,7 @@
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ਪ੍ਰਕਿਰਿਆ ਅਤੇ <xliff:g id="NUMSERVICES">%2$d</xliff:g> ਸੇਵਾਵਾਂ"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ਪ੍ਰਕਿਰਿਆਵਾਂ ਅਤੇ <xliff:g id="NUMSERVICES">%2$d</xliff:g> ਸੇਵਾ"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ਪ੍ਰਕਿਰਿਆਵਾਂ ਅਤੇ <xliff:g id="NUMSERVICES">%2$d</xliff:g> ਸੇਵਾਵਾਂ"</string>
-    <string name="running_processes_header_title" msgid="6588371727640789560">"ਡੀਵਾਈਸ ਮੈਮਰੀ"</string>
+    <string name="running_processes_header_title" msgid="6588371727640789560">"ਡੀਵਾਈਸ ਮੈਮੋਰੀ"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"ਐਪ RAM ਵਰਤੋਂ"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"ਸਿਸਟਮ"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"ਐਪਾਂ"</string>
@@ -1657,8 +1705,12 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"ਸੇਵਾ <xliff:g id="COMP_NAME">%1$s</xliff:g> ਵਰਤੋਂ ਵਿੱਚ ਹੈ।"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"ਪ੍ਰੋਵਾਈਡਰ <xliff:g id="COMP_NAME">%1$s</xliff:g> ਵਰਤੋਂ ਵਿੱਚ ਹੈ।"</string>
     <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="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>
@@ -1672,9 +1724,9 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"ਆਟੋ-ਵਿਸ਼ਰਾਮ ਚਿੰਨ੍ਹ ਲਗਾਓ"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"ਫਿਜੀਕਲ ਕੀ-ਬੋਰਡ ਸੈਟਿੰਗਾਂ"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\" \" ਦਰਜ ਕਰਨ ਲਈ ਸਪੇਸ ਕੁੰਜੀ ਦੋ ਵਾਰ ਦਬਾਓ।"</string>
-    <string name="show_password" msgid="4837897357002495384">"ਪਾਸਵਰਡ ਵਿਖਾਓ"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"ਟਾਈਪ ਕੀਤੇ ਜਾਣ ਸਮੇਂ ਅੱਖਰ-ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਥੋੜ੍ਹੇ ਸਮੇਂ ਲਈ ਵਿਖਾਓ"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ਇਹ ਸਪੈੱਲ ਚੈਕਰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤਾ ਜਾਣ ਵਾਲਾ ਸਾਰਾ ਟੈਕਸਟ ਇਕੱਤਰ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋ ਸਕਦਾ ਹੈ, ਨਿੱਜੀ ਡੈਟਾ ਸਮੇਤ ਜਿਵੇਂ ਪਾਸਵਰਡ ਅਤੇ ਕ੍ਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ। ਇਹ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ਐਪ ਤੋਂ ਆਉਂਦਾ ਹੈ। ਕੀ ਇਹ ਸਪੈੱਲ ਚੈਕਰ ਵਰਤਣਾ ਹੈ?"</string>
+    <string name="show_password" msgid="4837897357002495384">"ਪਾਸਵਰਡ  ਦਿਖਾਓ"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"ਟਾਈਪ ਕੀਤੇ ਜਾਣ ਸਮੇਂ ਅੱਖਰ-ਚਿੰਨ੍ਹਾਂ ਨੂੰ ਥੋੜ੍ਹੇ ਸਮੇਂ ਲਈ ਦਿਖਾਓ"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ਇਹ ਸਪੈੱਲ-ਚੈਕਰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਟਾਈਪ ਕੀਤਾ ਜਾਣ ਵਾਲੀ ਸਾਰੀ ਲਿਖਤ ਇਕੱਤਰ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋ ਸਕਦਾ ਹੈ, ਨਿੱਜੀ ਡਾਟਾ ਸਮੇਤ ਜਿਵੇਂ ਪਾਸਵਰਡ ਅਤੇ ਕ੍ਰੈਡਿਟ ਕਾਰਡ ਨੰਬਰ। ਇਹ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> ਐਪ ਤੋਂ ਆਉਂਦਾ ਹੈ। ਕੀ ਇਸ ਸਪੈੱਲ-ਚੈਕਰ ਨੂੰ ਵਰਤਣਾ ਹੈ?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ਭਾਸ਼ਾ"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"ਕੀ-ਬੋਰਡ ਅਤੇ ਇਨਪੁੱਟ"</string>
@@ -1683,10 +1735,10 @@
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"ਕੀ-ਬੋਰਡਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"ਕੀ-ਬੋਰਡ ਸਹਾਇਤਾ"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ"</string>
-    <string name="show_ime" msgid="2658582193437188227">"ਆਭਾਸੀ ਕੀ-ਬੋਰਡ ਵਿਖਾਓ"</string>
+    <string name="show_ime" msgid="2658582193437188227">"ਆਭਾਸੀ ਕੀ-ਬੋਰਡ  ਦਿਖਾਓ"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ ਕਿਰਿਆਸ਼ੀਲ ਹੋਣ ਦੌਰਾਨ ਇਸ ਨੂੰ ਸਕ੍ਰੀਨ \'ਤੇ ਬਣਾਈ ਰੱਖੋ"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਸਹਾਇਕ"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ਉਪਲਬਧ ਸ਼ਾਰਟਕੱਟ ਵਿਖਾਓ"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ਉਪਲਬਧ ਸ਼ਾਰਟਕੱਟ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ਪੋਆਇੰਟਰ ਗਤੀ"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ਗੇਮ ਕੰਟ੍ਰੋਲਰ"</string>
@@ -1694,13 +1746,13 @@
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ ਤੇ ਗੇਮ ਕੰਟ੍ਰੋਲਰ ਲਈ ਰੀਡਾਇਰੈਕਟ ਵਾਈਬ੍ਰੇਟਰ।"</string>
     <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"ਕੀ-ਬੋਰਡ ਲੇਆਉਟ ਚੁਣੋ"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"ਕੀ-ਬੋਰਡ ਲੇਆਉਟ ਸੈਟ ਅਪ ਕਰੋ"</string>
-    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"ਸਵਿਚ ਕਰਨ ਲਈ, ਕੰਟ੍ਰੋਲ-ਸਪੇਸਬਾਰ ਦਬਾਓ"</string>
+    <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"ਸਵਿੱਚ ਕਰਨ ਲਈ, ਕੰਟ੍ਰੋਲ-ਸਪੇਸਬਾਰ ਦਬਾਓ"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"ਕੀ-ਬੋਰਡ ਲੇਆਉਟ"</string>
     <string name="user_dict_settings_title" msgid="3427169369758733521">"ਨਿੱਜੀ ਸ਼ਬਦਕੋਸ਼"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
-    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"ਜੋੜੋ"</string>
-    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"ਸ਼ਬਦਕੋਸ਼ ਵਿੱਚ ਜੋੜੋ"</string>
+    <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"ਸ਼ਬਦਕੋਸ਼ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"ਵਾਕਾਂਸ਼"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"ਹੋਰ ਚੋਣਾਂ"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"ਘੱਟ ਚੋਣਾਂ"</string>
@@ -1710,19 +1762,19 @@
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ਭਾਸ਼ਾ:"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"ਇੱਕ ਸ਼ਬਦ ਟਾਈਪ ਕਰੋ"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ਵਿਕਲਪਕ ਸ਼ਾਰਟਕੱਟ"</string>
-    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ਸ਼ਬਦ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ਸੰਪਾਦਿਤ ਕਰੋ"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ਸ਼ਬਦ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ਮਿਟਾਓ"</string>
     <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"ਤੁਹਾਡੇ ਕੋਲ ਵਰਤੋਂਕਾਰ ਸ਼ਬਦਕੋਸ਼ ਵਿੱਚ ਕੋਈ ਸ਼ਬਦ ਨਹੀਂ ਹਨ। ਇੱਕ ਸ਼ਬਦ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਸ਼ਾਮਲ ਕਰੋ (+) ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"ਸਾਰੀਆਂ ਭਾਸ਼ਾਵਾਂ ਲਈ"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"ਹੋਰ ਭਾਸ਼ਾਵਾਂ…"</string>
     <string name="testing" msgid="6584352735303604146">"ਜਾਂਚ"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ਟੈਬਲੇਟ ਜਾਣਕਾਰੀ"</string>
-    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ਫੋਨ ਜਾਣਕਾਰੀ"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"ਟੈਬਲੈੱਟ ਜਾਣਕਾਰੀ"</string>
+    <string name="testing_phone_info" product="default" msgid="8656693364332840056">"ਫ਼ੋਨ ਜਾਣਕਾਰੀ"</string>
     <string name="input_methods_settings_title" msgid="6800066636850553887">"ਟੈਕਸਟ ਇਨਪੁਟ"</string>
-    <string name="input_method" msgid="5434026103176856164">"ਇਨਪੁਟ ਵਿਧੀ"</string>
+    <string name="input_method" msgid="5434026103176856164">"ਇਨਪੁੱਟ ਵਿਧੀ"</string>
     <string name="current_input_method" msgid="2636466029213488159">"ਮੌਜੂਦਾ ਕੀ-ਬੋਰਡ"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"ਇਨਪੁਟ ਵਿਧੀ ਚੋਣਕਾਰ"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"ਇਨਪੁੱਟ ਵਿਧੀ ਚੋਣਕਾਰ"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"ਸਵੈਚਲਿਤ"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"ਹਮੇਸਾਂ ਦਿਖਾਓ"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"ਹਮੇਸ਼ਾਂ ਲੁਕਾਓ"</string>
@@ -1737,8 +1789,8 @@
     <string name="gadget_picker_title" msgid="98374951396755811">"ਗੈਜੇਟ ਚੁਣੋ"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"ਵਿਜੇਟ ਚੁਣੋ"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"ਕੀ ਵਿਜੇਟ ਬਣਾਉਣਾ ਹੈ ਅਤੇ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਿਜੇਟ ਬਣਾਉਣ ਤੋਂ ਬਾਅਦ, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਸਾਰੇ ਡੈਟਾ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ, ਜੋ ਇਹ ਡਿਸਪਲੇ ਕਰਦਾ ਹੈ।"</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"ਹਮੇਸ਼ਾਂ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡੈਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਿਜੇਟ ਬਣਾਉਣ ਤੋਂ ਬਾਅਦ, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਸਾਰੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ, ਜੋ ਇਹ ਡਿਸਪਲੇ ਕਰਦਾ ਹੈ।"</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"ਹਮੇਸ਼ਾਂ <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ਨੂੰ ਵਿਜੇਟ ਬਣਾਉਣ ਅਤੇ ਉਹਨਾਂ ਦੇ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>d <xliff:g id="HOURS">%2$d</xliff:g>h <xliff:g id="MINUTES">%3$d</xliff:g>m <xliff:g id="SECONDS">%4$d</xliff:g>s"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>ਘੰ <xliff:g id="MINUTES">%2$d</xliff:g>ਮਿੰ <xliff:g id="SECONDS">%3$d</xliff:g>ਸ"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ਮਿੰ <xliff:g id="SECONDS">%2$d</xliff:g>ਸ"</string>
@@ -1756,9 +1808,10 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"ਪਹੁੰਚਯੋਗਤਾ ਸੈਟਿੰਗਾਂ"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"ਸਕ੍ਰੀਨ ਰੀਡਰ, ਡਿਸਪਲੇ, ਅੰਤਰਕਿਰਿਆ ਕੰਟਰੋਲ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"ਨਜ਼ਰ ਸਬੰਧੀ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਆਪਣੀਆਂ ਲੋੜਾਂ ਦੇ ਅਨੁਸਾਰ ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹੋ। ਇਹਨਾਂ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱੱਚ ਜਾਕੇ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਆਪਣੀਆਂ ਲੋੜਾਂ ਦੇ ਅਨੁਸਾਰ ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹੋ। ਇਹਨਾਂ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਜਾ ਕੇ ਬਦਲਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ਫੌਂਟ ਆਕਾਰ ਵਧਾਓ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"ਸਕ੍ਰੀਨ ਪਾਠਕ"</string>
-    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ਔਡੀਓ ਅਤੇ ਔਨ-ਸਕ੍ਰੀਨ ਲਿਖਤ"</string>
+    <string name="audio_and_captions_category_title" msgid="3420727114421447524">" ਆਡੀਓ  ਅਤੇ ਔਨ-ਸਕ੍ਰੀਨ ਲਿਖਤ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ਡਿਸਪਲੇ"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"ਅੰਤਰਕਿਰਿਆ ਕੰਟਰੋਲ"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਸੇਵਾਵਾਂ"</string>
@@ -1771,23 +1824,23 @@
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"ਤਿੰਨ-ਟੈਪਾਂ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"ਬਟਨ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"ਬਟਨ ਅਤੇ ਤਿੰਨ-ਟੈਪ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"ਸਕ੍ਰੀਨ \'ਤੇ ਜ਼ੂਮ ਇਨ ਕਰੋ"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"ਸਕ੍ਰੀਨ \'ਤੇ ਜ਼ੂਮ ਵਧਾਓ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ਜ਼ੂਮ ਕਰਨ ਲਈ 3 ਵਾਰ ਟੈਪ ਕਰੋ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ਜ਼ੂਮ ਕਰਨ ਲਈ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ ਤੇਜ਼ੀ ਨਾਲ 3 ਵਾਰ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ 3 ਵਾਰ ਟੈਪ ਕਰੋ, ਅਤੇ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਤੀਜੇ ਟੈਪ \'ਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਆਊਟ ਕਰਨ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਆਵਾਗੌਣ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਇਨ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"ਜਦੋਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੇਜ਼ੀ ਨਾਲ ਵੱਡਾ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰੋ।\n\n"<b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕੀਤੇ ਵੀ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਆਊਟ ਕਰਨ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਆਵਾਗੌਣ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਇਨ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ ਤੇਜ਼ੀ ਨਾਲ 3 ਵਾਰ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਸਕ੍ਰੀਨ \'ਤੇ 3 ਵਾਰ ਟੈਪ ਕਰੋ, ਅਤੇ ਆਪਣੀ ਉਂਗਲ ਨੂੰ ਤੀਜੇ ਟੈਪ \'ਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਘਟਾਉਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਨਹੀਂ ਸਕਦੇ।"</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"ਜਦੋਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੇਜ਼ੀ ਨਾਲ ਵੱਡਾ ਕਰਨ ਲਈ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਾਂ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਦੀ ਵਰਤੋਂ ਕਰੋ।\n\n"<b>"ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿਤੇ ਵੀ ਟੈਪ ਕਰੋ।\n"<ul><li>"ਸਕ੍ਰੋਲ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰਨ ਲਈ 2 ਜਾਂ ਜ਼ਿਆਦਾ ਉਂਗਲਾਂ ਨਾਲ ਚੂੰਢੀ ਭਰੋ"</li></ul>\n\n<b>"ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਜ਼ੂਮ ਕਰਨ ਲਈ"</b>", ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਟੈਪ ਕਰੋ, ਫਿਰ ਸਕ੍ਰੀਨ \'ਤੇ ਕੀਤੇ ਵੀ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ।\n"<ul><li>"ਸਕ੍ਰੀਨ \'ਤੇ ਆਲੇ-ਦੁਆਲੇ ਜਾਣ ਲਈ ਘਸੀਟੋ"</li>\n<li>"ਜ਼ੂਮ ਘਟਾਉਣ ਲਈ ਉਂਗਲ ਚੁੱਕੋ"</li></ul>\n\n"ਤੁਸੀਂ ਕੀ-ਬੋਰਡ ਜਾਂ ਦਿਸ਼ਾ-ਨਿਰਦੇਸ਼ ਪੱਟੀ \'ਤੇ ਜ਼ੂਮ ਵਧਾ ਨਹੀਂ ਸਕਦੇ।"</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ <xliff:g id="SERVICE">%1$s</xliff:g> \'ਤੇ ਸੈੱਟ ਹੈ। ਵੱਡਦਰਸ਼ੀਕਰਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ, ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ, ਫਿਰ ਵੱਡਦਰਸ਼ੀਕਰਨ ਨੂੰ ਚੁਣੋ।"</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ਪਹੁੰਚਯੋਗਤਾ ਸ਼ਾਰਟਕੱਟ"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"ਸ਼ਾਰਟਕੱਟ ਸੇਵਾ"</string>
-    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੋਂ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"ਜਦੋਂ ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਕਿਸੇ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਦੋਵੇਂ ਵੌਲਿਊਮ ਬਟਨਾਂ ਨੂੰ 3 ਸਕਿੰਟਾਂ ਲਈ ਦੱਬ ਸਕਦੇ ਹੋ।"</string>
+    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤੋਂ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"ਜਦੋਂ ਸ਼ਾਰਟਕੱਟ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਕਿਸੇ ਪਹੁੰਚਯੋਗਤਾ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਦੋਵੇਂ ਅਵਾਜ਼ ਬਟਨਾਂ ਨੂੰ 3 ਸਕਿੰਟਾਂ ਲਈ ਦੱਬ ਸਕਦੇ ਹੋ।"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"ਉੱਚ ਵਖਰੇਵਾਂ ਲਿਖਤ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"ਸਕ੍ਰੀਨ ਵਿਸਤਰੀਕਰਨ ਸਵੈ-ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"ਐਪ ਟ੍ਰਾਂਜਿਸ਼ਨਾਂ ਤੇ ਸਕ੍ਰੀਨ ਵਿਸਤਰੀਕਰਨ ਅੱਪਡੇਟ ਕਰੋ"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ਪਾਵਰ ਬਟਨ ਕਾਲ ਖ਼ਤਮ ਕਰਦਾ ਹੈ"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ਪਾਵਰ ਬਟਨ ਕਾਲ ਖਤਮ ਕਰਦਾ ਹੈ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ਵੱਡਾ ਮਾਊਸ ਪੁਆਇੰਟਰ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"ਮੋਨੋ ਔਡੀਓ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ਔਡੀਓ ਚਲਾਉਣ ਦੌਰਾਨ ਚੈਨਲਾਂ ਨੂੰ ਇਕੱਠਾ ਕਰੋ"</string>
+    <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"ਮੋਨੋ  ਆਡੀਓ"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">" ਆਡੀਓ  ਚਲਾਉਣ ਦੌਰਾਨ ਚੈਨਲਾਂ ਨੂੰ ਇਕੱਠਾ ਕਰੋ"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ਛੋਹਣ ਅਤੇ ਛੋਹੀ ਰੱਖਣ ਵਿੱਚ ਦੇਰੀ"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"ਰੰਗ ਇਨਵਰਜਨ"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ਪ੍ਰਦਰਸ਼ਨ \'ਤੇ ਅਸਰ ਪਾ ਸਕਦੀ ਹੈ"</string>
@@ -1821,21 +1874,21 @@
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ਚਾਲੂ"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ਬੰਦ"</string>
-    <string name="captioning_preview_title" msgid="1234015253497016890">"ਪ੍ਰੀਵਿਊ"</string>
+    <string name="captioning_preview_title" msgid="1234015253497016890">"ਪੂਰਵ-ਝਲਕ"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"ਮਿਆਰੀ ਚੋਣਾਂ"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ਭਾਸ਼ਾ"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"ਲਿਖਤ ਦਾ ਆਕਾਰ"</string>
-    <string name="captioning_preset" msgid="8939737196538429044">"ਕੈਪਸ਼ਨ ਸਟਾਈਲ"</string>
-    <string name="captioning_custom_options_title" msgid="5067500939930322405">"ਕਸਟਮ ਚੋਣਾਂ"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"ਸੁਰਖੀ ਸ਼ੈਲੀ"</string>
+    <string name="captioning_custom_options_title" msgid="5067500939930322405">"ਵਿਉਂਂਤੀ ਵਿਕਲਪ"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"ਬੈਕਗ੍ਰਾਉਂਡ ਦਾ ਰੰਗ"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"ਬੈਕਗ੍ਰਾਉਂਡ ਅਪਾਰਦਰਸ਼ਤਾ"</string>
-    <string name="captioning_window_color" msgid="6902052743419717394">"ਕੈਪਸ਼ਨ ਵਿੰਡੋ ਰੰਗ"</string>
-    <string name="captioning_window_opacity" msgid="5041556024849862376">"ਕੈਪਸ਼ਨ ਵਿੰਡੋ ਧੁੰਦਲਾਪਣ"</string>
+    <string name="captioning_window_color" msgid="6902052743419717394">"ਸੁਰਖੀ ਵਿੰਡੋ ਰੰਗ"</string>
+    <string name="captioning_window_opacity" msgid="5041556024849862376">"ਸੁਰਖੀ ਵਿੰਡੋ ਧੁੰਦਲਾਪਣ"</string>
     <string name="captioning_foreground_color" msgid="85623486537640059">"ਟੈਕਸਟ ਰੰਗ"</string>
     <string name="captioning_foreground_opacity" msgid="4370967856995419788">"ਪਾਠ ਅਪਾਰਦਰਸ਼ਤਾ"</string>
     <string name="captioning_edge_color" msgid="3670094753735263238">"ਕਿਨਾਰੇ ਦਾ ਰੰਗ"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"ਐਜ ਪ੍ਰਕਾਰ"</string>
-    <string name="captioning_typeface" msgid="1826169240566563259">"ਫੌਂਟ ਪਰਿਵਾਰ"</string>
+    <string name="captioning_typeface" msgid="1826169240566563259">"ਫ਼ੌਂਟ ਪਰਿਵਾਰ"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"ਸੁਰਖੀਆਂ ਇੰਜ ਦਿਖਾਈ ਦੇਣਗੀਆਂ"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
@@ -1853,12 +1906,12 @@
     <string name="color_magenta" msgid="5059212823607815549">"ਮਜੈਂਟਾ"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਵਰਤਣੀ ਹੈ?"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਇਹ ਕਰਨ ਦੀ ਲੋੜ ਹੈ:"</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"ਕਿਉਂਕਿ ਇੱਕ ਐਪ ਇੱਕ ਅਨੁਮਤੀ ਬੇਨਤੀ ਨੂੰ ਅਸਪਸ਼ਟ ਬਣਾ ਰਿਹਾ ਹੈ, ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੇ ਜਵਾਬ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ।"</string>
-    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ਜੇਕਰ ਤੁਸੀਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲੌਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
-    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ਕਿਉਂਕਿ ਤੁਸੀਂ ਇੱਕ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾ ਚਾਲੂ ਕੀਤੀ ਹੈ, ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੂੰ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡਾ ਸਕ੍ਰੀਨ ਅਨਲੌਕ ਨਹੀਂ ਵਰਤੇਗਾ।"</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"ਕਿਉਂਕਿ ਇੱਕ ਐਪ ਇੱਕ ਇਜਾਜ਼ਤ ਬੇਨਤੀ ਨੂੰ ਅਸਪਸ਼ਟ ਬਣਾ ਰਿਹਾ ਹੈ, ਸੈਟਿੰਗਾਂ ਤੁਹਾਡੇ ਜਵਾਬ ਦੀ ਜਾਂਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ।"</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"ਜੇਕਰ ਤੁਸੀਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਲਾਕ ਨਹੀਂ ਵਰਤੇਗੀ।"</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"ਕਿਉਂਕਿ ਤੁਸੀਂ ਇੱਕ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾ ਚਾਲੂ ਕੀਤੀ ਹੈ, ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੂੰ ਵਧਾਉਣ ਲਈ ਤੁਹਾਡਾ ਸਕ੍ਰੀਨ ਅਨਲਾਕ ਨਹੀਂ ਵਰਤੇਗਾ।"</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ  ਡਾਟਾ  ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਿੰਨ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ, ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ।"</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡੈਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"ਕਿਉਂਕਿ <xliff:g id="SERVICE">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਡਾਟਾ ਇਨਕ੍ਰਿਪਸ਼ਨ ਤੇ ਅਸਰ ਪੈਂਦਾ ਹੈ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"ਤੁਹਾਡੀਆਂ ਸਰਗਰਮੀਆਂ ਦਾ ਨਿਰੀਖਣ ਕਰਨਾ"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"ਜਦੋਂ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਨਾਲ ਅੰਤਰਕਿਰਿਆ ਕਰ ਰਹੇ ਹੋਵੋ ਤਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰਨਾ।"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਬੰਦ ਕਰਨੀ ਹੈ?"</string>
@@ -1870,18 +1923,22 @@
     <string name="print_settings" msgid="4742428530112487843">"ਪ੍ਰਿੰਟਿੰਗ"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"ਬੰਦ"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਿੰਟ ਸੇਵਾ ਚਾਲੂ ਹੈ</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਿੰਟ ਸੇਵਾਵਾਂ ਚਾਲੂ ਹਨ</item>
+      <item quantity="one"> ਪ੍ਰਿੰਟ ਸੇਵਾ ਚਾਲੂ ਹੈ<xliff:g id="COUNT">%1$d</xliff:g></item>
+      <item quantity="other"> ਪ੍ਰਿੰਟ ਸੇਵਾ ਚਾਲੂ ਹੈ<xliff:g id="COUNT">%1$d</xliff:g></item>
+    </plurals>
+    <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>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ਪ੍ਰਿੰਟਰ ਜੋੜੋ"</string>
+    <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ਪ੍ਰਿੰਟਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"ਚਾਲੂ"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ਬੰਦ"</string>
-    <string name="print_menu_item_add_service" msgid="3811645167869797802">"ਸੇਵਾ ਜੋੜੋ"</string>
-    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ਪ੍ਰਿੰਟਰ ਜੋੜੋ"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"ਸੇਵਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ਪ੍ਰਿੰਟਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ਖੋਜੋ"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"ਪ੍ਰਿੰਟਰ ਖੋਜ ਰਿਹਾ ਹੈ"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"ਸੇਵਾ ਅਯੋਗ ਬਣਾਈ ਗਈ ਹੈ"</string>
@@ -1894,8 +1951,8 @@
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ਨੂੰ ਰੱਦ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="print_failed_state_title_template" msgid="1436099128973357969">"ਪ੍ਰਿੰਟਰ ਅਸ਼ੁੱਧੀ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"ਪ੍ਰਿੰਟਰ ਬਲੌਕ ਕੀਤਾ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
-    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"ਖੋਜ ਬੌਕਸ ਦਿਖਾਇਆ"</string>
-    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"ਖੋਜ ਬੌਕਸ ਲੁਕਾਇਆ"</string>
+    <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"ਖੋਜ ਬਾਕਸ ਦਿਖਾਇਆ"</string>
+    <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"ਖੋਜ ਬਾਕਸ ਲੁਕਾਇਆ"</string>
     <string name="printer_info_desc" msgid="5824995108703060003">"ਇਸ ਪ੍ਰਿੰਟਰ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ਬੈਟਰੀ"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"ਬੈਟਰੀ ਵਰਤਦੇ ਹੋਏ ਕੀ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
@@ -1920,53 +1977,76 @@
     <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>
     <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"ਫਲੈਸ਼ਲਾਈਟ ਚਾਲੂ"</string>
-    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"ਸਕਿਰਿਆ"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਿਗਨਲ"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"ਡੀਵਾਈਸ ਦਾ ਕਿਰਿਆਸ਼ੀਲ ਸਮਾਂ"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"ਉੱਨਤ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਹੋਣ ਦਾ ਸਮਾਂ"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"ਵਿਕਸਿਤ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="history_details_title" msgid="3608240585315506067">"ਇਤਿਹਾਸ ਵੇਰਵੇ"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <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="4006631636646776488">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਨੂੰ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ਐਪ ਬੰਦ ਕਰੋ"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"ਕੀ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਵਰਤੋਂ ਅਤੇ ਐਪ ਨੂੰ ਬੰਦ ਕਰੀਏ?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਉਸਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਉਸਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP_0">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ <xliff:g id="APP_1">%1$s</xliff:g> ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਉਸਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਤੋਂ ਰੋਕ ਸਕਦੇ ਹੋ।"</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="7774807745601479888">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ <xliff:g id="APP">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਹੇ ਹੁੰਦੇ ਤਾਂ ਵੀ ਐਪ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪੁੱਛਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਟਿਕਾਣੇ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ <xliff:g id="APP">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਰਹੇ ਹੁੰਦੇ ਹੋ ਤਾਂ ਵੀ ਐਪ ਤੁਹਾਡਾ ਟਿਕਾਣਾ ਪੁੱਛਦੀ ਰਹਿੰਦੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਟਿਕਾਣੇ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ ਜਦੋਂ ਤੁਸੀਂ <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>
-    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
-    <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="3392999761958982492">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਟੈਂਡਬਾਇ"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="power_bluetooth" msgid="4373329044379008289">"ਬਲੂਟੁੱਥ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਟੈਂਡਬਾਏ"</string>
     <string name="power_phone" msgid="5392641106474567277">"ਵੌਇਸ ਕਾਲਾਂ"</string>
-    <string name="power_idle" product="tablet" msgid="4612478572401640759">"ਟੈਬਲੇਟ ਨਿਸ਼ਕਿਰਿਆ"</string>
-    <string name="power_idle" product="default" msgid="9055659695602194990">"ਫੋਨ ਨਿਸ਼ਕਿਰਿਆ"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"ਟੈਬਲੈੱਟ ਨਿਸ਼ਕਿਰਿਆ"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"ਫ਼ੋਨ ਨਿਸ਼ਕਿਰਿਆ"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"ਵਿਵਿਧ"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"ਓਵਰ-ਕਾਉਂਟਿਡ"</string>
     <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>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi ਚੱਲ ਰਿਹਾ ਹੈ"</string>
-    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"ਟੈਬਲੇਟ"</string>
-    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ਫੋਨ"</string>
-    <string name="usage_type_data_send" msgid="8971710128438365919">"ਮੋਬਾਈਲ ਪੈਕੇਟ ਭੇਜਿਆ ਗਿਆ"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"ਵਾਈ‑ਫਾਈ ਚੱਲ ਰਿਹਾ ਹੈ"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"ਟੈਬਲੈੱਟ"</string>
+    <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ਫ਼ੋਨ ਕਰੋ"</string>
+    <string name="usage_type_data_send" msgid="8971710128438365919">"ਮੋਬਾਈਲ ਪੈਕੇਟ ਭੇਜੇ ਗਏ"</string>
     <string name="usage_type_data_recv" msgid="5468564329333954445">"ਮੋਬਾਈਲ ਪੈਕੇਟ ਪ੍ਰਾਪਤ ਕੀਤੇ"</string>
-    <string name="usage_type_radio_active" msgid="1732647857619420121">"ਮੋਬਾਈਲ ਰੇਡੀਓ ਸਕਿਰਿਆ"</string>
-    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"Wi‑Fi ਪੈਕੇਟ ਭੇਜੇ"</string>
-    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"Wi‑Fi ਪੈਕੇਟ ਪ੍ਰਾਪਤ ਕੀਤੇ"</string>
-    <string name="usage_type_audio" msgid="6957269406840886290">"ਔਡੀਓ"</string>
+    <string name="usage_type_radio_active" msgid="1732647857619420121">"ਮੋਬਾਈਲ ਰੇਡੀਓ ਕਿਰਿਆਸ਼ੀਲ"</string>
+    <string name="usage_type_data_wifi_send" msgid="1847552143597396162">"ਵਾਈ‑ਫਾਈ ਪੈਕੇਟ ਭੇਜੇ"</string>
+    <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"ਵਾਈ‑ਫਾਈ ਪੈਕੇਟ ਪ੍ਰਾਪਤ ਕੀਤੇ"</string>
+    <string name="usage_type_audio" msgid="6957269406840886290">" ਆਡੀਓ"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"ਵੀਡੀਓ"</string>
     <string name="usage_type_camera" msgid="8299433109956769757">"ਕੈਮਰਾ"</string>
     <string name="usage_type_flashlight" msgid="1516392356962208230">"ਫਲੈਸ਼ਲਾਈਟ"</string>
@@ -1979,38 +2059,39 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"ਐਪ ਜਾਣਕਾਰੀ"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"ਐਪ ਸੈਟਿੰਗਾਂ"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"ਸਕ੍ਰੀਨ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi‑Fi ਸੈਟਿੰਗਾਂ"</string>
-    <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth ਸੈਟਿੰਗਾਂ"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="battery_action_bluetooth" msgid="8374789049507723142">"ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"ਵੌਇਸ ਕਾਲਾਂ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"ਜਦੋਂ ਟੈਬਲੇਟ ਨਿਸ਼ਕਿਰਿਆ ਹੁੰਦੀ ਹੈ ਤਾਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ਫੋਨ ਦੇ ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਵੇਲੇ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"ਜਦੋਂ ਟੈਬਲੈੱਟ ਨਿਸ਼ਕਿਰਿਆ ਹੁੰਦਾ ਹੈ ਤਾਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ਫ਼ੋਨ ਦੇ ਨਿਸ਼ਕਿਰਿਆ ਹੋਣ ਵੇਲੇ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"ਸੈਲ ਰੇਡੀਓ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"ਕੋਈ ਸੈਲ ਕਵਰੇਜ ਨਹੀਂ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਪਾਵਰ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਏਅਰਪਲੇਨ ਮੋਡ ਤੇ ਸਵਿਚ ਕਰੋ"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"ਕੋਈ ਸੈੱਲ ਕਵਰੇਜ ਨਹੀਂ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਪਾਵਰ ਰੱਖਿਅਤ ਕਰਨ ਲਈ ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ \'ਤੇ ਬਦਲੋ"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"ਫਲੈਸ਼ਲਾਈਟ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"ਕੈਮਰੇ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"ਡਿਸਪਲੇ ਅਤੇ ਬੈਕਲਾਈਟ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"ਸਕ੍ਰੀਨ ਚਮਕ ਅਤੇ/ਜਾਂ ਸਕ੍ਰੀਨ ਟਾਈਮਆਉਟ ਘਟਾਓ"</string>
-    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi‑Fi ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_sugg_wifi" msgid="7776093125855397043">"Wi‑Fi ਬੰਦ ਕਰੋ ਜਦੋਂ ਇਸਨੂੰ ਵਰਤ ਨਾ ਰਹੇ ਹੋਵੋ ਜਾਂ ਜਦੋਂ ਇਹ ਉਪਲਬਧ ਨਾ ਹੋਵੇ"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"ਵਾਈ‑ਫਾਈ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
+    <string name="battery_sugg_wifi" msgid="7776093125855397043">"ਵਾਈ‑ਫਾਈ ਬੰਦ ਕਰੋ ਜਦੋਂ ਇਸਨੂੰ ਵਰਤ ਨਾ ਰਹੇ ਹੋਵੋ ਜਾਂ ਜਦੋਂ ਇਹ ਉਪਲਬਧ ਨਾ ਹੋਵੇ"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ਬਲੂਟੁੱਥ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"ਜਦੋਂ ਤੁਸੀਂ Bluetooth ਨਾ ਵਰਤ ਰਹੇ ਹੋਵੋ ਤਾਂ ਇਸਨੂੰ ਬੰਦ ਕਰੋ"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ਇੱਕ ਵੱਖਰੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"ਐਪ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
-    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ਐਪ ਰੋਕੋ ਜਾਂ ਅਣਇੰਸਟੌਲ ਕਰੋ"</string>
+    <string name="battery_sugg_apps_info" msgid="6907588126789841231">"ਐਪ ਰੋਕੋ ਜਾਂ ਅਣਸਥਾਪਤ ਕਰੋ"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"ਬੈਟਰੀ-ਬਚਤ ਮੋਡ ਚੁਣੋ"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ਐਪ ਬੈਟਰੀ ਵਰਤੋਂ ਨੂੰ ਘਟਾਉਣ ਲਈ ਸੈਟਿੰਗਾਂ ਆੱਫਰ ਕਰ ਸਕਦੇ ਹਨ"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"ਐਪ ਬੈਟਰੀ ਵਰਤੋਂ ਨੂੰ ਘਟਾਉਣ ਲਈ ਸੈਟਿੰਗਾਂ ਪੇਸ਼ਕਸ਼ ਕਰ ਸਕਦੇ ਹਨ"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"ਉਪਭੋਗਤਾ ਵੱਲੋਂ ਵਰਤੀ ਗਈ ਬੈਟਰੀ"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"ਵਿਵਿਧ ਪਾਵਰ ਵਰਤੋਂ"</string>
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ਬੈਟਰੀ ਵਰਤੋਂ ਪਾਵਰ ਵਰਤੋਂ ਦਾ ਇੱਕ ਅਨੁਮਾਨ ਹੈ ਅਤੇ ਇਸ ਵਿੱਚ ਬੈਟਰੀ ਖ਼ਰਚ ਦਾ ਹਰੇਕ ਸਰੋਤ ਸ਼ਾਮਲ ਨਹੀਂ ਹੁੰਦਾ। ਵਿਵਿਧ ਹਿਸਾਬ ਲਗਾਈ ਅਨੁਮਾਨਿਤ ਪਾਵਰ ਵਰਤੋਂ ਅਤੇ ਬੈਟਰੀ ਤੇ ਦੇਖੇ ਗਏ ਅਸਲੀ ਖ਼ਰਚ ਵਿਚਕਾਰ ਅੰਤਰ ਹੈ।"</string>
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਦੇ ਵੇਰਵੇ"</string>
-    <string name="battery_last_full_charge" msgid="7151251641099019361">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ਬਾਕੀ ਰਹਿੰਦਾ ਬੈਟਰੀ ਸਮਾਂ ਅਨੁਮਾਨਿਤ ਹੈ ਅਤੇ ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਬਦਲ ਸਕਦਾ ਹੈ"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"ਪਿਛਲੀ ਵਾਰ ਪੂਰਾ ਚਾਰਜ ਕੀਤਾ:"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ਬੈਟਰੀ ਵਰਤੋਂ ਸਬੰਧੀ ਡਾਟਾ ਅਨੁਮਾਨਿਤ ਹੈ ਅਤੇ ਵਰਤੋਂ ਦੇ ਆਧਾਰ \'ਤੇ ਬਦਲ ਸਕਦਾ ਹੈ"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"ਕਿਰਿਆਸ਼ੀਲ ਵਰਤੋਂ ਵਿੱਚ ਹੋਣ ਦੌਰਾਨ"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਹੋਣ ਦੌਰਾਨ"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ਬੈਟਰੀ ਵਰਤੋਂ"</string>
@@ -2048,7 +2129,7 @@
     <string name="process_stats_os_cache" msgid="6432533624875078233">"ਕੈਚਿਸ"</string>
     <string name="process_stats_ram_use" msgid="976912589127397307">"RAM ਵਰਤੋਂ"</string>
     <string name="process_stats_bg_ram_use" msgid="5398191511030462404">"RAM ਵਰਤੋਂ (ਪਿਛੋਕੜ)"</string>
-    <string name="process_stats_run_time" msgid="6520628955709369115">"ਰਨ ਸਮਾਂ"</string>
+    <string name="process_stats_run_time" msgid="6520628955709369115">"ਚੱਲਣ ਦਾ ਸਮਾਂ"</string>
     <string name="processes_subtitle" msgid="6827502409379462438">"ਪ੍ਰਕਿਰਿਆਵਾਂ"</string>
     <string name="services_subtitle" msgid="4296402367067266425">"ਸੇਵਾਵਾਂ"</string>
     <string name="menu_proc_stats_duration" msgid="2323483592994720196">"ਮਿਆਦ"</string>
@@ -2074,15 +2155,15 @@
     <string name="menu_proc_stats_type_foreground" msgid="2286182659954958586">"ਫੋਰਗ੍ਰਾਊਂਡ"</string>
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"ਕੈਚ ਕੀਤੀ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"ਵੌਇਸ ਇਨਪੁਟ &amp; ਆਊਟਪੁਟ"</string>
-    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ਵੌਇਸ ਇਨਪੁਟ &amp; ਆਊਟਪੁਟ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ਵੌਇਸ ਇਨਪੁੱਟ &amp; ਆਉਟਪੁੱਟ ਸੈਟਿੰਗਾਂ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ਵੌਇਸ ਖੋਜ"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android ਕੀ-ਬੋਰਡ"</string>
-    <string name="voice_input_settings" msgid="1099937800539324567">"ਵੌਇਸ ਇਨਪੁਟ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="voice_input_settings" msgid="1099937800539324567">"ਵੌਇਸ ਇਨਪੁੱਟ ਸੈਟਿੰਗਾਂ"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ਵੌਇਸ ਇਨਪੁਟ"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"ਵੌਇਸ ਇਨਪੁਟ ਸੇਵਾਵਾਂ"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"ਪੂਰਾ ਹੌਟਵਰਡ ਅਤੇ ਇੰਟਰੈਕਸ਼ਨ"</string>
-    <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ਸਧਾਰਨ ਸਪੀਚ ਟੂ ਟੈਕਸਟ"</string>
-    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ਇਹ ਵੌਇਸ ਇਨਪੁਟ ਸੇਵਾ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ ਵੌਇਸ ਨਿਰੀਖਣ ਪਰਫੌਰਮ ਕਕਰ ਵਿੱਚ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵੌਇਸ ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੇ ਨਿਯੰਤਰਣ ਪਾਉਣ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗੀ। ਇਹ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> ਐਪਲੀਕੇਸ਼ਨ ਤੋਂ ਆਉਂਦੀ ਹੈ। ਕੀ ਇਸ ਸੇਵਾ ਦੀ ਵਰਤੋਂ ਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"ਸਧਾਰਨ ਬੋਲੀ ਤੋਂ ਲਿਖਤ"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"ਇਹ ਵੌਇਸ ਇਨਪੁੱਟ ਸੇਵਾ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ ਵੌਇਸ ਨਿਰੀਖਣ ਪਰਫੌਰਮ ਕਰਨ ਵਿੱਚ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵੌਇਸ ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੇ ਨਿਯੰਤਰਣ ਪਾਉਣ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗੀ। ਇਹ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>ਐਪਲੀਕੇਸ਼ਨ ਤੋਂ ਆਉਂਦੀ ਹੈ। ਕੀ ਇਸ ਸੇਵਾ ਦੀ ਵਰਤੋਂ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"ਤਰਜੀਹੀ ਇੰਜਣ"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"ਇੰਜਣ ਦੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="tts_sliders_title" msgid="992059150784095263">"ਬੋਲਣ ਦੀ ਗਤੀ ਅਤੇ ਸੁਰ"</string>
@@ -2096,15 +2177,15 @@
     <string name="tts_reset" msgid="2661752909256313270">"ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="tts_play" msgid="2628469503798633884">"ਚਲਾਓ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ਪਾਵਰ ਨਿਯੰਤਰਣ"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi ਸੈਟਿੰਗ ਅਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ਸੈਟਿੰਗ ਅਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"ਵਾਈ‑ਫਾਈ ਸੈਟਿੰਗ ਅੱਪਡੇਟ ਹੋ ਰਹੀ ਹੈ"</string>
+    <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ਸੈਟਿੰਗ ਅੱਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"ਚਾਲੂ"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"ਬੰਦ"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
-    <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"ਵਾਈ‑ਫਾਈ"</string>
+    <string name="gadget_bluetooth" msgid="8998572807378694410">"ਬਲੂਟੁੱਥ"</string>
     <string name="gadget_location" msgid="2974757497945178165">"ਟਿਕਾਣਾ"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ਸਿੰਕ ਕਰੋ"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"ਚਮਕ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -2115,52 +2196,52 @@
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ਸਟੋਰੇਜ ਤੋਂ ਸਥਾਪਤ ਕਰੋ"</string>
-    <string name="credentials_install" product="default" msgid="953914549998062317">"SD ਕਾਰਡ ਤੋਂ ਇੰਸਟੌਲ ਕਰੋ"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ਸਟੋਰੇਜ ਤੋਂ ਸਰਟੀਫਿਕੇਟ ਸਥਾਪਤ ਕਰੋ"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD ਕਾਰਡ ਤੋਂ ਸਰਟੀਫਿਕੇਟ ਇੰਸਟੌਲ ਕਰੋ"</string>
+    <string name="credentials_install" product="default" msgid="953914549998062317">"SD ਕਾਰਡ ਤੋਂ ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"ਸਟੋਰੇਜ ਤੋਂ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"SD ਕਾਰਡ ਤੋਂ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਹਟਾਓ"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ਸਾਰੇ ਸਰਟੀਫਿਕੇਟ ਹਟਾਓ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
-    <string name="trusted_credentials_summary" msgid="6735221351155686632">"ਭਰੋਸੇਯੋਗ CA ਸਰਟੀਫਿਕੇਟ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"ਭਰੋਸੇਯੋਗ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="user_credentials" msgid="3719013347787187083">"ਵਰਤੋਂਕਾਰ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
-    <string name="user_credentials_summary" msgid="7271228342106080167">"ਸਟੋਰ ਕੀਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਵੇਖੋ ਅਤੇ ਸੋਧੋ"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"ਉੱਨਤ"</string>
-    <string name="credential_storage_type" msgid="8629968543494001364">"ਸਟੋਰੇਜ ਦੀ ਕਿਸਮ"</string>
+    <string name="user_credentials_summary" msgid="7271228342106080167">"ਸਟੋਰ ਕੀਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਦੇਖੋ ਅਤੇ ਸੋਧੋ"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"ਵਿਕਸਿਤ"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਕਾਰ"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ਹਾਰਡਵੇਅਰ-ਸਮਰਥਿਤ"</string>
-    <string name="credential_storage_type_software" msgid="4403117271207715378">"ਕੇਵਲ ਸੌਫਟਵੇਅਰ"</string>
-    <string name="credentials_settings_not_available" msgid="7968275634486624215">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"ਕੇਵਲ ਸਾਫਟਵੇਅਰ"</string>
+    <string name="credentials_settings_not_available" msgid="7968275634486624215">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"VPN ਅਤੇ ਐਪਾਂ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
-    <string name="credential_for_wifi" msgid="6228425986551591864">"Wi-Fi ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="credential_for_wifi" msgid="6228425986551591864">"ਵਾਈ-ਫਾਈ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
-    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਈ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ।"</string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲਈ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"ਵਰਤਮਾਨ ਪਾਸਵਰਡ:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"ਕੀ ਸਾਰੀਆਂ ਸਮੱਗਰੀਆਂ ਹਟਾਉਣੀਆਂ ਹਨ?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"ਪਾਸਵਰਡ ਵਿੱਚ ਘੱਟੋ-ਘੱਟ 8 ਅੱਖਰ-ਚਿੰਨ੍ਹ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ।"</string>
-    <string name="credentials_wrong_password" msgid="2541932597104054807">"ਗ਼ਲਤ ਪਾਸਵਰਡ।"</string>
-    <string name="credentials_reset_warning" msgid="5320653011511797600">"ਗ਼ਲਤ ਪਾਸਵਰਡ। ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਮਿਟਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਹੋਰ ਮੌਕਾ ਹੈ।"</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"ਗ਼ਲਤ ਪਾਸਵਰਡ। ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਮਿਟਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER">%1$d</xliff:g> ਹੋਰ ਮੌਕੇ ਹਨ।"</string>
-    <string name="credentials_erased" msgid="2907836028586342969">"ਪ੍ਰਮਾਣੀਕਰਨ ਸਟੋਰੇਜ ਮਿਟਾਈ ਗਈ ਹੈ।"</string>
-    <string name="credentials_not_erased" msgid="7685932772284216097">"ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਨਹੀਂ ਮਿਟਾਈ ਜਾ ਸਕੀ।"</string>
-    <string name="credentials_enabled" msgid="7588607413349978930">"ਪ੍ਰਮਾਣੀਕਰਨ ਸਟੋਰੇਜ ਸਮਰਥਿਤ ਹੈ।"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"ਤੁਹਾਨੂੰ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵਰਤ ਸਕਣ ਤੋਂ ਪਹਿਲਾਂ ਇੱਕ ਲੌਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</string>
+    <string name="credentials_wrong_password" msgid="2541932597104054807">"ਗਲਤ ਪਾਸਵਰਡ।"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"ਗਲਤ ਪਾਸਵਰਡ। ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਮਿਟਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਕੋਲ ਇੱਕ ਹੋਰ ਮੌਕਾ ਹੈ।"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"ਗਲਤ ਪਾਸਵਰਡ। ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਮਿਟਾਉਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER">%1$d</xliff:g> ਹੋਰ ਮੌਕੇ ਹਨ।"</string>
+    <string name="credentials_erased" msgid="2907836028586342969">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਮਿਟਾਈ ਗਈ।"</string>
+    <string name="credentials_not_erased" msgid="7685932772284216097">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਨਹੀਂ ਮਿਟ ਸਕੀ।"</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਚਾਲੂ ਹੈ।"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵਰਤਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਨੂੰ ਇੱਕ ਲਾਕ ਸਕ੍ਰੀਨ ਪਿੰਨ ਜਾਂ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰਨ ਦੀ ਲੋੜ ਹੈ"</string>
     <string name="usage_access_title" msgid="332333405495457839">"ਵਰਤੋਂ ਤੱਕ ਪਹੁੰਚ ਵਾਲੀਆਂ ਐਪਾਂ"</string>
-    <string name="emergency_tone_title" msgid="1055954530111587114">"ਐਮਰਜੈਂਸੀ ਟੋਨ"</string>
-    <string name="emergency_tone_summary" msgid="722259232924572153">"ਜਦੋਂ ਇੱਕ ਐਮਰਜੈਂਸੀ ਕਾਲ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਤਾਂ ਵਿਵਹਾਰ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="emergency_tone_title" msgid="1055954530111587114">"ਸੰਕਟਕਾਲੀਨ ਟੋਨ"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"ਜਦੋਂ ਇੱਕ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਤਾਂ ਵਿਵਹਾਰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"ਬੈਕਅੱਪ"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"ਬੈਕਅਪ &amp; ਰੀਸਟੋਰ ਕਰੋ"</string>
-    <string name="personal_data_section_title" msgid="7815209034443782061">"ਨਿੱਜੀ ਡੈਟਾ"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"ਮੇਰਾ ਡੈਟਾ ਬੈਕ ਅਪ ਕਰੋ"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Google ਸਰਵਰਾਂ ਤੇ ਐਪ ਡੈਟਾ, Wi‑Fi ਪਾਸਵਰਡਾਂ ਅਤੇ ਹੋਰ ਸੈਟਿੰਗਾਂ ਬੈਕ ਅਪ ਕਰੋ"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"ਬੈਕਅਪ ਖਾਤਾ"</string>
-    <string name="include_app_data_title" msgid="2829970132260278394">"ਐਪ ਡੈਟਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"ਬੈਕਅੱਪ &amp; ਰੀਸਟੋਰ ਕਰੋ"</string>
+    <string name="personal_data_section_title" msgid="7815209034443782061">"ਨਿੱਜੀ  ਡਾਟਾ"</string>
+    <string name="backup_data_title" msgid="1239105919852668016">"ਮੇਰਾ ਡਾਟਾ ਬੈਕ ਅੱਪ ਲਓ"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Google ਸਰਵਰਾਂ ਤੇ ਐਪ ਡਾਟਾ, Wi‑Fi ਪਾਸਵਰਡਾਂ ਅਤੇ ਹੋਰ ਸੈਟਿੰਗਾਂ ਬੈਕ ਅੱਪ ਲਓ"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"ਬੈਕਅੱਪ ਖਾਤਾ"</string>
+    <string name="include_app_data_title" msgid="2829970132260278394">"ਐਪ  ਡਾਟਾ  ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ਆਟੋਮੈਟਿਕ ਰੀਸਟੋਰ ਕਰੋ"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"ਇੱਕ ਐਪ ਨੂੰ ਦੁਬਾਰਾ ਇੰਸਟੌਲ ਕਰਦੇ ਸਮੇਂ, ਬੈਕ ਅਪ ਸੈਟਿੰਗਾਂ ਅਤੇ ਡੈਟਾ ਰੀਸਟੋਰ ਕਰੋ"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"ਇੱਕ ਐਪ ਨੂੰ ਦੁਬਾਰਾ ਸਥਾਪਤ ਕਰਦੇ ਸਮੇਂ, ਬੈਕ ਅੱਪ ਸੈਟਿੰਗਾਂ ਅਤੇ ਡਾਟਾ ਰੀਸਟੋਰ ਕਰੋ"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"ਬੈਕਅੱਪ ਸੇਵਾ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ"</string>
-    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"ਕੋਈ ਖਾਤਾ ਇਸ ਵੇਲੇ ਬੈਕ ਅਪ ਕੀਤਾ ਡੈਟਾ ਸਟੋਰ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"ਵਰਤਮਾਨ ਤੌਰ \'ਤੇ ਕੋਈ ਖਾਤਾ ਉਸ ਡਾਟਾ ਨੂੰ ਸਟੋਰ ਨਹੀਂ ਕਰ ਰਿਹਾ ਹੈ, ਜਿਸ ਦਾ ਬੈਕਅੱਪ ਲਿਆ ਗਿਆ ਹੈ"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"ਆਪਣੇ Wi‑Fi ਪਾਸਵਰਡਾਂ, ਬੁੱਕਮਾਰਕਾਂ, ਹੋਰ ਸੈਟਿੰਗਾਂ ਅਤੇ ਐਪ ਡੈਟਾ ਨੂੰ ਬੈਕ ਅਪ ਕਰਨਾ ਬੰਦ ਕਰਨਾ ਹੈ ਅਤੇ Google ਸਰਵਰਾਂ ਦੀਆਂ ਸਾਰੀਆਂ ਕਾਪੀਆਂ ਮਿਟਾਉਣੀਆਂ ਹਨ?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ਕੀ ਡੀਵਾਈਸ ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ) ਅਤੇ ਐਪ ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਐਪਾਂ ਦਾ ਸਟੋਰ ਕੀਤੀ ਸੈੱਟਿੰਗਾਂ ਅਤੇ ਫ਼ਾਈਲਾਂ) ਦੇ ਬੈੱਕਅੱਪ ਤੋਂ ਰੋਕਣਾ ਹੈ, ਅਤੇ ਇਸਦੇ ਨਾਲ-ਨਾਲ ਰਿਮੋਟ ਸਰਵਰ \'ਤੇ ਸਾਰੀਆਂ ਪ੍ਰਤੀਲਿਪੀਆਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"ਡੀਵਾਈਸ ਡਾਟਾ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ (ਜਿਵੇਂ ਕਿ ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ ਅਤੇ ਕਲ ਇਤਿਹਾਸ) ਅਤੇ ਐਪ ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਐਪਾਂ ਦਾ ਸਟੋਰ ਕੀਤੀ ਸੈੱਟਿੰਗਾਂ ਅਤੇ ਫ਼ਾਈਲਾਂ) ਦਾ ਸਵੈਚਲ ਬੈੱਕਅੱਪ ਲਓ।\n\nਜਦੋਂ ਤੁਸੀਂ ਸਵੈਚਲ ਬੈੱਕਅੱਪ ਨੂੰ ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਡੀਵਾਈਸ ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ ਅਵਧੀ ਅਨੁਸਾਰ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਐਪ ਡਾਟਾ ਕੋਈ ਵੀ ਡਾਟਾ ਹੋ ਸਕਦਾ ਹੈ ਜੋ ਸੰਪਰਕ, ਸੁਨੇਹੇ, ਅਤੇ ਫ਼ੋਟੋਆਂ ਵਰਗੇ ਸੰਭਾਵੀ ਸੰਵੇਦਨਸ਼ੀਲ ਡਾਟਾ ਸਮੇਤ, ਕਿਸੇ ਐਪ ਨੇ ਸੁਰੱਖਿਅਤ ਕੀਤਾ ਹੁੰਦਾ ਹੈ (ਨਿਰਮਾਤਾ ਸੈੱਟਿੰਗਾਂ ਦੇ ਅਧਾਰ \'ਤੇ)।"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"ਆਪਣੇ ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡਾਂ, ਬੁੱਕਮਾਰਕਾਂ, ਹੋਰ ਸੈਟਿੰਗਾਂ ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਬੈਕ ਅੱਪ ਕਰਨਾ ਬੰਦ ਕਰਨਾ ਹੈ ਅਤੇ Google ਸਰਵਰਾਂ ਦੀਆਂ ਸਾਰੀਆਂ ਕਾਪੀਆਂ ਮਿਟਾਉਣੀਆਂ ਹਨ?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"ਕੀ ਡੀਵਾਈਸ ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ) ਅਤੇ ਐਪ ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਐਪਾਂ ਦਾ ਸਟੋਰ ਕੀਤੀ ਸੈਟਿੰਗਾਂ ਅਤੇ ਫ਼ਾਈਲਾਂ) ਦੇ ਬੈੱਕਅੱਪ ਤੋਂ ਰੋਕਣਾ ਹੈ, ਅਤੇ ਇਸਦੇ ਨਾਲ-ਨਾਲ ਰਿਮੋਟ ਸਰਵਰ \'ਤੇ ਸਾਰੀਆਂ ਪ੍ਰਤੀਲਿਪੀਆਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"ਡੀਵਾਈਸ ਡਾਟਾ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ (ਜਿਵੇਂ ਕਿ ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ) ਅਤੇ ਐਪ ਡਾਟਾ (ਜਿਵੇਂ ਕਿ ਐਪਾਂ ਵੱਲੋਂ ਸਟੋਰ ਕੀਤੀਆਂ ਸੈਟਿੰਗਾਂ ਅਤੇ ਫ਼ਾਈਲਾਂ) ਦਾ ਸਵੈਚਲਿਤ ਬੈੱਕਅੱਪ ਲਓ।\n\nਜਦੋਂ ਤੁਸੀਂ ਸਵੈਚਲਿਤ ਬੈਕਅੱਪ ਨੂੰ ਚਾਲੂ ਕਰਦੇ ਹੋ, ਤਾਂ ਡੀਵਾਈਸ ਅਤੇ ਐਪ ਡਾਟਾ ਨੂੰ ਰਿਮੋਟ ਦੇ ਰੂਪ ਵਿੱਚ ਅਵਧੀ ਅਨੁਸਾਰ ਰੱਖਿਅਤ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਐਪ ਡਾਟਾ ਕੋਈ ਵੀ ਡਾਟਾ ਹੋ ਸਕਦਾ ਹੈ ਜੋ ਸੰਪਰਕ, ਸੁਨੇਹੇ, ਅਤੇ ਫ਼ੋਟੋਆਂ ਵਰਗੇ ਸੰਭਾਵੀ ਸੰਵੇਦਨਸ਼ੀਲ ਡਾਟਾ ਸਮੇਤ, ਕਿਸੇ ਐਪ ਨੇ ਰੱਖਿਅਤ ਕੀਤਾ ਹੁੰਦਾ ਹੈ (ਵਿਕਾਸਕਾਰ ਸੈਟਿੰਗਾਂ ਦੇ ਅਧਾਰ \'ਤੇ)।"</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਸੈਟਿੰਗਾਂ"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"ਇਸ ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਨੂੰ ਅਕਿਰਿਆਸ਼ੀਲ ਕਰੋ"</string>
@@ -2176,22 +2257,22 @@
     <string name="device_admin_add_title" msgid="3140663753671809044">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ"</string>
     <string name="device_admin_warning" msgid="7482834776510188134">"ਇਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਨਾਲ <xliff:g id="APP_NAME">%1$s</xliff:g> ਐਪ ਨੂੰ ਅੱਗੇ ਦਿੱਤੀਆਂ ਕਾਰਵਾਈਆਂ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਮਿਲਦੀ ਹੈ:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"ਇਹ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਕਿਰਿਆਸ਼ੀਲ ਹੈ ਅਤੇ <xliff:g id="APP_NAME">%1$s</xliff:g> ਐਪ ਨੂੰ ਅੱਗੇ ਦਿੱਤੀਆਂ ਕਾਰਵਾਈਆਂ ਨੂੰ ਕਰਨ ਲਈ ਇਜਾਜ਼ਤ ਦਿੰਦੀ ਹੈ:"</string>
-    <string name="profile_owner_add_title" msgid="6249331160676175009">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਮੈਨੇਜਰ ਨੂੰ ਸਕਿਰਿਆ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"ਜਾਰੀ ਰੱਖਣ ਦੁਆਰਾ, ਤੁਹਾਡੇ ਵਰਤੋਂਕਾਰ ਨੂੰ ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਪ੍ਰਬੰਧਿਤ ਕੀਤਾ ਜਾਏਗਾ ਜੋ ਕਿ ਤੁਹਾਡੇ ਨਿੱਜੀ ਡਾਟੇ ਤੋਂ ਇਲਾਵਾ, ਸਬੰਧਿਤ ਡਾਟੇ ਨੂੰ ਸਟੋਰ ਕਰਨ ਦੇ ਵੀ ਯੋਗ ਹੋ ਸਕਦਾ ਹੈ।\n\n ਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸਬੰਧਿਤ ਸੈਟਿੰਗਾਂ, ਪਹੁੰਚ, ਐਪਾਂ, ਅਤੇ ਡਾਟੇ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਅਤੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਵੀ ਸ਼ਾਮਲ ਹੈ।"</string>
+    <string name="profile_owner_add_title" msgid="6249331160676175009">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਮੈਨੇਜਰ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="adding_profile_owner_warning" msgid="1354474524852805802">"ਜਾਰੀ ਰੱਖਣ ਦੁਆਰਾ, ਤੁਹਾਡੇ ਵਰਤੋਂਕਾਰ ਨੂੰ ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਪ੍ਰਬੰਧਿਤ ਕੀਤਾ ਜਾਏਗਾ ਜੋ ਕਿ ਤੁਹਾਡੇ ਨਿੱਜੀ ਡਾਟੇ ਤੋਂ ਇਲਾਵਾ, ਸੰਬੰਧਿਤ ਡਾਟੇ ਨੂੰ ਸਟੋਰ ਕਰਨ ਦੇ ਵੀ ਯੋਗ ਹੋ ਸਕਦਾ ਹੈ।\n\n ਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸੰਬੰਧਿਤ ਸੈਟਿੰਗਾਂ, ਪਹੁੰਚ, ਐਪਾਂ, ਅਤੇ ਡਾਟੇ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਨੈੱਟਵਰਕ ਕਿਰਿਆਸ਼ੀਲਤਾ ਅਤੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਵੀ ਸ਼ਾਮਲ ਹੈ।"</string>
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਹੋਰ ਵਿਕਲਪਾਂ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ ਹੈ"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"ਹੋਰ ਵੇਰਵੇ"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"ਬਿਨਾਂ ਨਾਮ"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"ਸਧਾਰਨ"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"ਸੂਚਨਾ ਲੌਗ"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"ਕਾਲ ਰਿੰਗਟੋਨ ਅਤੇ ਥਰਥਰਾਹਟ"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"ਕਾਲ ਰਿੰਗਟੋਨ &amp; ਵਾਈਬ੍ਰੇਟ"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"ਸਿਸਟਮ"</string>
-    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi‑Fi ਸੈਟਅਪ"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi‑Fi ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi‑Fi ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi‑Fi ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
-    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ਇੱਕ ਨੈੱਟਵਰਕ ਜੋੜੋ"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"ਵਾਈ‑ਫਾਈ ਸੈੱਟਅੱਪ"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ <xliff:g id="NETWORK_NAME">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ਇੱਕ ਨੈੱਟਵਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ"</string>
-    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ਨੈੱਟਵਰਕ ਜੋੜੋ"</string>
+    <string name="wifi_setup_add_network" msgid="5939624680150051807">"ਨੈੱਟਵਰਕ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ਸੂਚੀ ਤਾਜ਼ਾ ਕਰੋ"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"ਛੱਡੋ"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"ਅੱਗੇ"</string>
@@ -2210,9 +2291,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"ਅਗਲੇ ਸਟੈਪ ਤੇ ਜਾਓ"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ।"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"ਤੁਸੀਂ ਸੈਟਅਪ ਦੇ ਦੌਰਾਨ ਇੱਕ EAP Wi‑Fi ਕਨੈਕਸ਼ਨ ਕੌਂਫਿਗਰ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਸੈਟਅਪ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਵਾਇਰਲੈਸ &amp; ਨੈਟਵਰਕਾਂ ਵਿੱਚ ਅਜਿਹਾ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"ਤੁਸੀਂ ਸੈੱਟਅੱਪ ਦੇ ਦੌਰਾਨ ਇੱਕ EAP ਵਾਈ-ਫਾਈ ਕਨੈਕਸ਼ਨ ਰੂਪ-ਰੇਖਾ ਨਹੀਂ ਬਦਲ ਸਕਦੇ। ਸੈੱਟਅੱਪ ਤੋਂ ਬਾਅਦ, ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ &gt; ਵਾਇਰਲੈਸ &amp; ਨੈੱਟਵਰਕਾਂ ਵਿੱਚ ਅਜਿਹਾ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"ਕਨੈਕਟ ਹੋਣ ਵਿੱਚ ਥੋੜ੍ਹੀ ਦੇਰ ਲੱਗ ਸਕਦੀ ਹੈ..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"ਸੈੱਟਅਪ ਜਾਰੀ ਰੱਖਣ ਲਈ "<b>"ਅੱਗੇ"</b>" \'ਤੇ ਟੈਪ ਕਰੋ।\n\n ਇੱਕ ਵੱਖਰੇ Wi-Fi ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਲਈ "<b>"ਪਿੱਛੇ"</b>" \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"ਸੈੱਟਅੱਪ ਜਾਰੀ ਰੱਖਣ ਲਈ "<b>"ਅੱਗੇ"</b>" \'ਤੇ ਟੈਪ ਕਰੋ।\n\nਇੱਕ ਵੱਖਰੇ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਲਈ "<b>"ਪਿੱਛੇ"</b>" \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"ਸਿੰਕ ਸਮਰਥਿਤ"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"ਸਿੰਕ ਅਸਮਰਥਿਤ"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ਹੁਣ ਸਮਕਾਲੀਕਰਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
@@ -2222,22 +2303,22 @@
     <string name="account_sync_settings_title" msgid="5131314922423053588">"ਸਿੰਕ ਕਰੋ"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"ਸਮਕਾਲੀਕਰਨ ਵਿੱਚ ਇਸ ਵੇਲੇ ਸਮੱਸਿਆਵਾਂ ਹੋ ਰਹੀਆਂ ਹਨ। ਇਹ ਜਲਦੀ ਹੀ ਠੀਕ ਹੋ ਜਾਏਗਾ।"</string>
     <string name="add_account_label" msgid="7811707265834013767">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="managed_profile_not_available_label" msgid="852263300911325904">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="managed_profile_not_available_label" msgid="852263300911325904">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="work_mode_label" msgid="5794470908668593961">"ਕੰਮ ਮੋਡ"</string>
-    <string name="work_mode_summary" msgid="1620246003886940776">"ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਸਬੰਧਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋਏ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਕੰਮ ਕਰਨ ਦੀ ਮਨਜ਼ੂਰੀ ਦਿਓ"</string>
-    <string name="remove_managed_profile_label" msgid="3856519337797285325">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਹਟਾਓ"</string>
-    <string name="background_data" msgid="5779592891375473817">"ਪਿਛੋਕੜ ਡੈਟਾ"</string>
-    <string name="background_data_summary" msgid="8328521479872763452">"ਐਪਸ ਕਿਸੇ ਵੀ ਸਮੇਂ ਡੈਟਾ ਸਿੰਕ ਕਰ ਸਕਦੇ ਹਨ, ਭੇਜ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹਨ"</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"ਕੀ ਪਿਛੋਕੜ ਡੈਟਾ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਨਾਲ ਇਹ ਬੈਟਰੀ ਸਮਰੱਥਾ ਵਧਾਉਂਦਾ ਹੈ ਅਤੇ ਡਾਟਾ ਵਰਤੋਂ ਨੂੰ ਘੱਟ ਕਰਦਾ ਹੈ। ਕੁਝ ਐਪ ਤਦ ਵੀ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਵਰਤ ਸਕਦੇ ਹਨ।"</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"ਐਪ ਡੈਟਾ ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
+    <string name="work_mode_summary" msgid="1620246003886940776">"ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਸਬੰਧਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋਏ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਕੰਮ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="remove_managed_profile_label" msgid="3856519337797285325">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਹਟਾਓ"</string>
+    <string name="background_data" msgid="5779592891375473817">"ਪਿਛੋਕੜ  ਡਾਟਾ"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"ਐਪਸ ਕਿਸੇ ਵੀ ਸਮੇਂ  ਡਾਟਾ  ਸਿੰਕ ਕਰ ਸਕਦੇ ਹਨ, ਭੇਜ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੇ ਹਨ"</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"ਕੀ ਪਿਛੋਕੜ  ਡਾਟਾ  ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣ ਨਾਲ ਇਹ ਬੈਟਰੀ ਸਮਰੱਥਾ ਵਧਾਉਂਦਾ ਹੈ ਅਤੇ ਡਾਟਾ ਵਰਤੋਂ ਨੂੰ ਘੱਟ ਕਰਦਾ ਹੈ। ਕੁਝ ਐਪਾਂ ਤਦ ਵੀ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਵਰਤ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"ਐਪ  ਡਾਟਾ  ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"ਸਿੰਕ ਚਾਲੂ ਹੈ"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"ਸਮਕਾਲੀਕਰਨ ਬੰਦ ਹੈ"</string>
     <string name="sync_error" msgid="5060969083117872149">"ਸਿੰਕ ਅਸ਼ੁੱਧੀ"</string>
     <string name="last_synced" msgid="4242919465367022234">"ਪਿਛਲਾ ਸਮਕਾਲੀਕਰਨ <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"ਹੁਣ ਸਮਕਾਲੀਕਰਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
-    <string name="settings_backup" msgid="2274732978260797031">"ਬੈਕ ਅਪ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="settings_backup_summary" msgid="7916877705938054035">"ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ ਬੈਕ ਅਪ ਕਰੋ"</string>
+    <string name="settings_backup" msgid="2274732978260797031">"ਬੈਕ ਅੱਪ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="settings_backup_summary" msgid="7916877705938054035">"ਮੇਰੀਆਂ ਸੈਟਿੰਗਾਂ ਬੈਕ ਅੱਪ ਲਓ"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"ਹੁਣ ਸਮਕਾਲੀਕਰਨ ਕਰੋ"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"ਸਮਕਾਲੀਕਰਨ ਰੱਦ ਕਰੋ"</string>
     <string name="sync_one_time_sync" msgid="3733796114909082260">"ਹੁਣੇ ਸਮਕਾਲੀਕਰਨ ਲਈ ਟੈਪ ਕਰੋ<xliff:g id="LAST_SYNC_TIME">
@@ -2245,31 +2326,31 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"ਕੈਲੰਡਰ"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"ਸੰਪਰਕ"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google ਸਿੰਕ ਤੇ ਤੁਹਾਡਾ ਸੁਆਗਤ ਹੈ!"</font>" \nਤੁਸੀਂ ਜਿੱਥੇ ਵੀ ਹੋਵੋ, ਉੱਥੋਂ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ, ਮੁਲਾਕਾਤਾਂ ਆਦਿ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਲਈ ਡੈਟਾ ਸਿੰਕ ਕਰਨ ਲਈ ਇੱਕ Google ਪਹੁੰਚ।"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Google ਸਿੰਕ ਤੇ ਤੁਹਾਡਾ ਸੁਆਗਤ ਹੈ!"</font>" \nਤੁਸੀਂ ਜਿੱਥੇ ਵੀ ਹੋਵੋ, ਉੱਥੋਂ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ, ਮੁਲਾਕਾਤਾਂ ਆਦਿ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣ ਲਈ ਡਾਟਾ ਸਿੰਕ ਕਰਨ ਲਈ ਇੱਕ Google ਪਹੁੰਚ।"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"ਐਪ ਸਿੰਕ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="header_data_and_synchronization" msgid="5165024023936509896">"ਡੈਟਾ &amp; ਸਿੰਕ੍ਰੋਨਾਈਜ਼ੇਸ਼ਨ"</string>
+    <string name="header_data_and_synchronization" msgid="5165024023936509896">" ਡਾਟਾ  &amp; ਸਿੰਕ੍ਰੋਨਾਈਜ਼ੇਸ਼ਨ"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"ਪਾਸਵਰਡ ਬਦਲੋ"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"ਖਾਤਾ ਸੈਟਿੰਗਾਂ"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"ਖਾਤਾ ਹਟਾਓ"</string>
     <string name="header_add_an_account" msgid="756108499532023798">"ਇੱਕ ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="finish_button_label" msgid="481587707657751116">"ਸਮਾਪਤ ਕਰੋ"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"ਕੀ ਖਾਤਾ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਟੈਬਲੇਟ ਦਾ ਹੋਰ ਡੈਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
-    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਫੋਨ ਦਾ ਹੋਰ ਡੈਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਟੈਬਲੈੱਟ ਦਾ ਹੋਰ ਡਾਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
+    <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"ਇਸ ਖਾਤੇ ਨੂੰ ਹਟਾਉਣ ਨਾਲ ਇਸਦੇ ਸਾਰੇ ਸੁਨੇਹੇ, ਸੰਪਰਕ ਅਤੇ ਫ਼ੋਨ ਦਾ ਹੋਰ ਡਾਟਾ ਮਿਟ ਜਾਏਗਾ!"</string>
     <string name="remove_account_failed" msgid="3901397272647112455">"ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਇਸ ਤਬਦੀਲੀ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="provider_label" msgid="7724593781904508866">"Push ਸਬਸਕ੍ਰਿਪਸ਼ੰਸ"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"ਮੈਨੂਅਲੀ ਸਿੰਕ ਨਹੀਂ ਕਰ ਸਕਦਾ"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ਇਸ ਆਈਟਮ ਲਈ ਸਿੰਕ ਇਸ ਵੇਲੇ ਅਸਮਰਥਿਤ ਹੈ। ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣ ਲਈ, ਪਿਛੋਕੜ ਡੈਟਾ ਅਤੇ ਆਟੋਮੈਟਿਕ ਸਿੰਕ ਅਸਥਾਈ ਤੌਰ ਤੇ ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"ਇਸ ਆਈਟਮ ਲਈ ਸਿੰਕ ਇਸ ਵੇਲੇ ਅਸਮਰਥਿਤ ਹੈ। ਇਸ ਸੈਟਿੰਗ ਨੂੰ ਬਦਲਣ ਲਈ, ਪਿਛੋਕੜ  ਡਾਟਾ  ਅਤੇ ਆਟੋਮੈਟਿਕ ਸਿੰਕ ਅਸਥਾਈ ਤੌਰ ਤੇ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC ਪਤਾ"</string>
     <string name="enter_password" msgid="8035706727471334122">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Android ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ, ਆਪਣਾ ਪੈਟਰਨ ਡ੍ਰਾ ਕਰੋ"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"ਗ਼ਲਤ ਪੈਟਰਨ"</string>
-    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ਗ਼ਲਤ ਪਾਸਵਰਡ"</string>
-    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ਗ਼ਲਤ ਪਿੰਨ"</string>
+    <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"ਗਲਤ ਪਾਸਵਰਡ"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ਗਲਤ ਪਿੰਨ"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"ਜਾਂਚ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android ਨੂੰ ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ..."</string>
     <string name="delete" msgid="4219243412325163003">"ਮਿਟਾਓ"</string>
@@ -2282,89 +2363,89 @@
     <string name="data_usage_accounting" msgid="7170028915873577387">"ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਹਿਸਾਬ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="data_usage_app" msgid="4970478397515423303">"ਐਪ ਵਰਤੋਂ"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"ਐਪ ਜਾਣਕਾਰੀ"</string>
-    <string name="data_usage_cellular_data" msgid="9168928285122125137">"ਮੋਬਾਈਲ ਡੈਟਾ"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_cellular_data" msgid="9168928285122125137">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">" ਡਾਟਾ  ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"ਡਾਟਾ ਵਰਤੋਂ ਸਾਈਕਲ"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"ਐਪ ਵਰਤੋਂ"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"ਡਾਟਾ ਰੋਮਿੰਗ"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"ਪਿਛੋਕੜ ਡੈਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਓ"</string>
-    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"ਪਿਛੋਕੜ ਡੈਟਾ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"ਪਿਛੋਕੜ  ਡਾਟਾ  ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਓ"</string>
+    <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"ਪਿਛੋਕੜ  ਡਾਟਾ  ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"ਵੱਖ 4G ਵਰਤੋਂ"</string>
-    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Wi‑Fi ਦਿਖਾਓ"</string>
-    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Wi‑Fi ਲੁਕਾਓ"</string>
+    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"ਵਾਈ‑ਫਾਈ ਦਿਖਾਓ"</string>
+    <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"ਵਾਈ‑ਫਾਈ ਲੁਕਾਓ"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"ਈਥਰਨੈਟ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"ਈਥਰਨੈਟ ਵਰਤੋਂ ਲੁਕਾਓ"</string>
     <string name="data_usage_menu_metered" msgid="6235119991372755026">"ਨੈੱਟਵਰਕ ਪ੍ਰਤਿਬੰਧ"</string>
-    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ਡੈਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">" ਡਾਟਾ  ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM ਕਾਰਡ"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"ਸੀਮਾ ਤੇ ਰੋਕਿਆ"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"ਡੈਟਾ ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"ਨਿੱਜੀ ਡੈਟਾ ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
-    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"ਕੰਮ ਡੈਟਾ ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">" ਡਾਟਾ  ਸਵੈ-ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"ਨਿੱਜੀ  ਡਾਟਾ  ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"ਕੰਮ  ਡਾਟਾ  ਆਟੋ-ਸਿੰਕ ਕਰੋ"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"ਸਾਈਕਲ ਬਦਲੋ..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"ਡਾਟਾ ਵਰਤੋਂ ਸਾਈਕਲ ਰੀਸੈੱਟ ਕਰਨ ਲਈ ਮਹੀਨੇ ਦਾ ਦਿਨ:"</string>
-    <string name="data_usage_empty" msgid="8621855507876539282">"ਇਸ ਮਿਆਦ ਦੇ ਦੌਰਾਨ ਕਿਸੇ ਐਪਸ ਨੇ ਡੈਟਾ ਨਹੀਂ ਵਰਤਿਆ।"</string>
+    <string name="data_usage_empty" msgid="8621855507876539282">"ਇਸ ਮਿਆਦ ਦੇ ਦੌਰਾਨ ਕਿਸੇ ਐਪਸ ਨੇ  ਡਾਟਾ  ਨਹੀਂ ਵਰਤਿਆ।"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"ਫੋਰਗ੍ਰਾਊਂਡ"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"ਪਿਛੋਕੜ"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"ਪ੍ਰਤਿਬੰਧਿਤ"</string>
-    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"ਮੋਬਾਈਲ ਡੈਟਾ ਬੰਦ ਕਰੀਏ?"</string>
-    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"ਮੋਬਾਈਲ ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi‑Fi ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
+    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"ਮੋਬਾਈਲ ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G  ਡਾਟਾ  ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"ਵਾਈ‑ਫਾਈ ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"ਈਥਰਨੈਟ"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"ਮੋਬਾਈਲ"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"ਮੋਬਾਈਲ"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"ਕੋਈ ਨਹੀਂ"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"ਮੋਬਾਈਲ ਡੈਟਾ"</string>
-    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G ਡੈਟਾ"</string>
-    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G ਡੈਟਾ"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
+    <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G ਡਾਟਾ"</string>
+    <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G  ਡਾਟਾ"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"ਫੋਰਗ੍ਰਾਊਂਡ:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"ਪਿਛੋਕੜ"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"ਐਪ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"ਪਿਛੋਕੜ ਡੈਟਾ"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਮੋਬਾਈਲ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਨੂੰ ਯੋਗ ਬਣਾਓ"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ਇਸ ਐਪ ਲਈ ਪਿਛੋਕੜ ਡੈਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਮੋਬਾਈਲ ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ।"</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ਕੀ ਪਿਛੋਕੜ ਡੈਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਹੈ?"</string>
+    <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"ਪਿਛੋਕੜ  ਡਾਟਾ"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਮੋਬਾਈਲ ਡਾਟਾ ਦੀ ਵਰਤੋਂ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ਇਸ ਐਪ ਲਈ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਇੱਕ ਮੋਬਾਈਲ ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ।"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ਕੀ ਪਿਛੋਕੜ  ਡਾਟਾ  ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਹੈ?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇੱਕ ਅਜਿਹੇ ਐਪ ਦਾ ਕਾਰਨ ਬਣ ਸਕਦੀ ਹੈ ਜੋ ਕੰਮ ਕਰਨਾ ਬੰਦ ਕਰਨ ਲਈ ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਤੇ ਨਿਰਭਰ ਹੈ, ਕੇਵਲ ਉਦੋਂ ਜਦੋਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਹੋਣ।\n\nਤੁਸੀਂ ਐਪ ਵਿੱਚ ਉਪਲਬਧ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਹੋਰ ਉਚਿਤ ਡਾਟਾ ਵਰਤੋਂ ਨਿਯੰਤਰਣ ਲੱਭ ਸਕਦੇ ਹੋ।"</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"ਬੈਕਗ੍ਰਾਊਂਡ ਡੈਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਕੇਵਲ ਉਦੋਂ ਸੰਭਵ ਹੈ ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਮੋਬਾਈਲ ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕੀਤੀ ਹੋਵੇ।"</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ਕੀ ਆਟੋ-ਸਿੰਕ ਡੈਟਾ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ਤੁਸੀਂ ਵੈਬ ਤੇ ਆਪਣੇ ਖਾਤਿਆਂ ਵਿੱਚ ਜੋ ਕੋਈ ਵੀ ਬਦਲਾਵ ਕਰਦੇ ਹੋ, ਉਹ ਆਟੋਮੈਟਿਕਲੀ ਤੁਹਾਡੀ ਟੈਬਲੇਟ ਤੇ ਕਾਪੀ ਕੀਤੇ ਜਾਣਗੇ।\n\nਕੁਝ ਖਾਤੇ ਆਟੋਮੈਟਿਕਲੀ ਉਹ ਬਦਲਾਵ ਕਾਪੀ ਕਰ ਸਕਦੇ ਹਨ ਜੋ ਤੁਸੀਂ ਵੈਬ ਤੇ ਆਪਣੀ ਟੈਬਲੇਟ ਵਿੱਚ ਕਰਦੇ ਹੋ। ਇੱਕ Google ਖਾਤਾ ਇਸ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ਤੁਸੀਂ ਵੈਬ ਤੇ ਆਪਣੇ ਖਾਤਿਆਂ ਵਿੱਚ ਜੋ ਕੋਈ ਵੀ ਬਦਲਾਵ ਕਰਦੇ ਹੋ, ਉਹ ਆਟੋਮੈਟਿਕਲੀ ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਕਾਪੀ ਕੀਤੇ ਜਾਣਗੇ।\n\nਕੁਝ ਖਾਤੇ ਆਟੋਮੈਟਿਕਲੀ ਉਹ ਬਦਲਾਵ ਕਾਪੀ ਕਰ ਸਕਦੇ ਹਨ ਜੋ ਤੁਸੀਂ ਵੈਬ ਤੇ ਆਪਣੇ ਫੋਨ ਵਿੱਚ ਕਰਦੇ ਹੋ। ਇੱਕ Google ਖਾਤਾ ਇਸ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ਡੈਟੇ ਦਾ ਸਵੈ-ਸਮਕਾਲੀਕਰਨ ਬੰਦ ਕਰੀਏ?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ਇਹ ਡੈਟੇ ਅਤੇ ਬੈਟਰੀ ਦੀ ਬੱਚਤ ਕਰੇਗਾ, ਪਰ ਹਾਲੀਆ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਹਰੇਕ ਖਾਤੇ ਦਾ ਹੱਥੀਂ ਸਮਕਾਲੀਕਰਨ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਇਸਤੋਂ ਇਲਾਵਾ ਜਦੋਂ ਅੱਪਡੇਟ ਹੁੰਦੇ ਹਨ ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰੋਂਗੇ।"</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਸਿਰਫ਼ ਉਦੋਂ ਸੰਭਵ ਹੈ ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਮੋਬਾਈਲ ਡਾਟਾ ਸੀਮਾ ਸੈੱਟ ਕੀਤੀ ਹੋਵੇ।"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ਕੀ ਆਟੋ-ਸਿੰਕ  ਡਾਟਾ  ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"ਵੈੱਬ ਤੇ ਤੁਹਾਡੇ ਖਾਤਿਆਂ ਵਿੱਚ ਕੀਤੇ ਗਏ ਕੋਈ ਵੀ ਬਦਲਾਅ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਹੀ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਕਾਪੀ ਕੀਤੇ ਜਾਣਗੇ।\n\nਕੁਝ ਖਾਤੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਉਹ ਬਦਲਾਅ ਕਾਪੀ ਕਰ ਸਕਦੇ ਹਨ ਜੋ ਤੁਸੀਂ ਵੈੱਬ ਤੇ ਆਪਣੇ ਟੈਬਲੈੱਟ ਵਿੱਚ ਕਰਦੇ ਹੋ। ਇੱਕ Google ਖਾਤਾ ਇਸ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"ਤੁਸੀਂ ਵੈੱਬ ਤੇ ਆਪਣੇ ਖਾਤਿਆਂ ਵਿੱਚ ਜੋ ਕੋਈ ਵੀ ਬਦਲਾਵ ਕਰਦੇ ਹੋ, ਉਹ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਕਾਪੀ ਕੀਤੇ ਜਾਣਗੇ।\n\nਕੁਝ ਖਾਤੇ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਉਹ ਬਦਲਾਵ ਕਾਪੀ ਕਰ ਸਕਦੇ ਹਨ ਜੋ ਤੁਸੀਂ ਵੈੱਬ ਤੇ ਆਪਣੇ ਫ਼ੋਨ ਵਿੱਚ ਕਰਦੇ ਹੋ। ਇੱਕ Google ਖਾਤਾ ਇਸ ਤਰ੍ਹਾਂ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ਡਾਟੇ ਦਾ ਸਵੈ-ਸਮਕਾਲੀਕਰਨ ਬੰਦ ਕਰੀਏ?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ਇਹ ਡਾਟਾ ਅਤੇ ਬੈਟਰੀ ਦੀ ਬੱਚਤ ਕਰੇਗਾ, ਪਰ ਹਾਲੀਆ ਜਾਣਕਾਰੀ ਇਕੱਤਰ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਹਰੇਕ ਖਾਤੇ ਦਾ ਹੱਥੀਂ ਸਮਕਾਲੀਕਰਨ ਕਰਨ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਇਸਤੋਂ ਇਲਾਵਾ ਜਦੋਂ ਅੱਪਡੇਟ ਹੁੰਦੇ ਹਨ ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰੋਂਗੇ।"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"ਵਰਤੋਂ ਚੱਕਰ ਰੀਸੈੱਟ ਤਾਰੀਖ"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"ਹਰੇਕ ਮਹੀਨੇ ਦੀ ਤਾਰੀਖ:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"ਸੈੱਟ ਕਰੋ"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ਡਾਟਾ ਵਰਤੋਂ ਚਿਤਾਵਨੀ ਸੈੱਟ ਕਰੋ"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ਡਾਟਾ ਵਰਤੋਂ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ਡਾਟਾ ਵਰਤੋਂ ਸੀਮਤ ਕਰਨਾ"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਤੁਹਾਡੇ ਵੱਲੋਂ ਸੈੱਟ ਕੀਤੀ ਮੋਬਾਈਲ ਡਾਟੇ ਦੀ ਸੀਮਾ ਉੱਤੇ ਪਹੁੰਚਣ \'ਤੇ ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਕਰ ਦੇਵੇਗਾ।\n\nਕਿਉਂਕਿ ਡਾਟਾ ਵਰਤੋਂ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਵੱਲੋਂ ਮਾਪਿਆ ਜਾਂਦਾ ਹੈ ਅਤੇ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਡਾ ਕੈਰੀਅਰ ਵਰਤੋਂ ਦਾ ਹਿਸਾਬ ਵੱਖਰੇ ਢੰਗ ਨਾ ਲਗਾਵੇ, ਇਸ ਕਰਕੇ ਕੋਈ ਕੰਜੂਸੀਕਾਰੀ ਸੀਮਾ ਸੈੱਟ ਕਰਨ ਬਾਰੇ ਵਿਚਾਰ ਕਰੋ।"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਤੁਹਾਡੇ ਵੱਲੋਂ ਸੈੱਟ ਕੀਤੀ ਮੋਬਾਈਲ ਡਾਟੇ ਦੀ ਸੀਮਾ ਉੱਤੇ ਪਹੁੰਚਣ \'ਤੇ ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਕਰ ਦੇਵੇਗਾ।\n\nਕਿਉਂਕਿ ਡਾਟਾ ਵਰਤੋਂ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਵੱਲੋਂ ਮਾਪੀ ਜਾਂਦੀ ਹੈ ਅਤੇ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਡਾ ਕੈਰੀਅਰ ਵਰਤੋਂ ਦਾ ਹਿਸਾਬ ਵੱਖਰੇ ਢੰਗ ਨਾਲ ਲਗਾਵੇ, ਇਸ ਕਰਕੇ ਕੋਈ ਕੰਜੂਸੀਕਾਰੀ ਸੀਮਾ ਸੈੱਟ ਕਰਨ ਬਾਰੇ ਵਿਚਾਰ ਕਰੋ।"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਵੱਲੋਂ ਸੈੱਟ ਕੀਤੀ ਮੋਬਾਈਲ ਡਾਟੇ ਦੀ ਸੀਮਾ ਉੱਤੇ ਪਹੁੰਚਣ \'ਤੇ ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਕਰ ਦੇਵੇਗਾ।\n\nਕਿਉਂਕਿ ਡਾਟਾ ਵਰਤੋਂ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵੱਲੋਂ ਮਾਪਿਆ ਜਾਂਦਾ ਹੈ ਅਤੇ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਤੁਹਾਡਾ ਕੈਰੀਅਰ ਵਰਤੋਂ ਦਾ ਹਿਸਾਬ ਵੱਖਰੇ ਢੰਗ ਨਾਲ ਲਗਾਵੇ, ਇਸ ਕਰਕੇ ਕੋਈ ਕੰਜੂਸੀਕਾਰੀ ਸੀਮਾ ਸੈੱਟ ਕਰਨ ਬਾਰੇ ਵਿਚਾਰ ਕਰੋ।"</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ਕੀ ਪਿਛੋਕੜ ਡੈਟਾ ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਹੈ?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ Wi‑Fi ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਪ੍ਰਤੀਬੰਧ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ Wi‑Fi ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੈੱਟ \'ਤੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰਦੀ ਹੈ।"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡੈਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ Wi‑Fi ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਫ਼ੋਨ \'ਤੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰਦੀ ਹੈ।"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ਕੀ ਪਿਛੋਕੜ  ਡਾਟਾ  ਤੇ ਪ੍ਰਤਿਬੰਧ ਲਾਉਣਾ ਹੈ?"</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡਾਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਵਾਈ‑ਫਾਈ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡਾਟੇ \'ਤੇ ਪ੍ਰਤੀਬੰਧ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਵਾਈ‑ਫਾਈ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੈੱਟ \'ਤੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰਦੀ ਹੈ।"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"ਜੇਕਰ ਤੁਸੀਂ ਬੈਕਗ੍ਰਾਊਂਡ ਮੋਬਾਈਲ ਡਾਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਉਂਦੇ ਹੋ, ਤਾਂ ਕੁਝ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਉਦੋਂ ਤੱਕ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਵਾਈ-ਫਾਈ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੁੰਦੇ।\n\nਇਹ ਸੈਟਿੰਗ ਇਸ ਫ਼ੋਨ \'ਤੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰਦੀ ਹੈ।"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ਚਿਤਾਵਨੀ"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ਸੀਮਾ"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"ਹਟਾਏ ਗਏ ਐਪਸ"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"ਹਟਾਏ ਗਏ ਐਪਸ ਅਤੇ ਉਪਭੋਗਤਾ"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ਪ੍ਰਾਪਤ ਕੀਤਾ, <xliff:g id="SENT">%2$s</xliff:g> ਭੇਜਿਆ"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤਿਆ।"</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤੋਂ ਕੀਤੀ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡੇ ਟੈਬਲੇਟ ਵੱਲੋਂ ਹਿਸਾਬ ਲਗਾਇਆ ਗਿਆ ਹੈ। ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਵਰਤੋਂ ਹਿਸਾਬ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤੋਂ ਕੀਤੀ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡੇ ਫੋਨ ਵੱਲੋਂ ਹਿਸਾਬ ਲਗਾਇਆ ਗਿਆ ਹੈ। ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਵਰਤੋਂ ਹਿਸਾਬ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤੋਂ ਕੀਤੀ, ਜਿਵੇਂ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਵੱਲੋਂ ਹਿਸਾਬ ਲਗਾਇਆ। ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਵਰਤੋਂ ਹਿਸਾਬ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: ਲਗਭਗ <xliff:g id="TOTAL">%1$s</xliff:g> ਵਰਤੋਂ ਕੀਤੀ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡੇ ਫ਼ੋਨ ਵੱਲੋਂ ਹਿਸਾਬ ਲਗਾਇਆ ਗਿਆ ਹੈ। ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਵਰਤੋਂ ਹਿਸਾਬ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"ਨੈੱਟਵਰਕ ਪ੍ਰਤਿਬੰਧ"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"ਬੈਕਗ੍ਰਾਊਂਡ ਡੈਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਏ ਜਾਣ \'ਤੇ ਮੀਟਰ ਕੀਤੇ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕਾਂ ਵਰਗਾ ਵਿਹਾਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਐਪਾਂ ਵੱਡੇ ਡਾਊਨਲੋਡਾਂ ਲਈ ਇਹਨਾਂ ਨੈੱਟਵਰਕਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਚੇਤਾਵਨੀ ਦੇ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟੇ \'ਤੇ ਪਾਬੰਦੀ ਲਗਾਏ ਜਾਣ \'ਤੇ ਮੀਟਰ ਕੀਤੇ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕਾਂ ਵਰਗਾ ਵਿਹਾਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ। ਐਪਾਂ ਵੱਡੇ ਡਾਊਨਲੋਡਾਂ ਲਈ ਇਹਨਾਂ ਨੈੱਟਵਰਕਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਚਿਤਾਵਨੀ ਦੇ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ਮੀਟਰਡ Wi‑Fi ਨੈੱਟਵਰਕ"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ਮੀਟਰਡ ਨੈੱਟਵਰਕ ਚੁਣਨ ਲਈ, Wi‑Fi ਚਾਲੂ ਕਰੋ।"</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"ਮੀਟਰਬੱਧ ਕੀਤੇ ਗਏ ਵਾਈ‑ਫਾਈ ਨੈੱਟਵਰਕ"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"ਮੀਟਰਬੱਧ ਕੀਤੇ ਗਏ ਨੈੱਟਵਰਕ ਚੁਣਨ ਲਈ, ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਹਿਸਾਬ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
-    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ਐਮਰਜੈਂਸੀ ਕਾਲ ਕਰੋ"</string>
-    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ਕਾਲ ਤੇ ਵਾਪਸ ਜਾਓ"</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"ਸੰਕਟਕਾਲੀਨ ਕਾਲ"</string>
+    <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ਕਾਲ \'ਤੇ ਵਾਪਸ ਜਾਓ"</string>
     <string name="vpn_name" msgid="4689699885361002297">"ਨਾਮ"</string>
     <string name="vpn_type" msgid="5435733139514388070">"ਟਾਈਪ ਕਰੋ"</string>
     <string name="vpn_server" msgid="2123096727287421913">"ਸਰਵਰ ਦਾ ਪਤਾ"</string>
@@ -2372,18 +2453,18 @@
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP ਗੁਪਤ"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec ਪਛਾਣਕਰਤਾ"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec ਪ੍ਰੀ-ਸ਼ੇਅਰ ਕੀਤੀ ਕੁੰਜੀ"</string>
-    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec ਉਪਭੋਗਤਾ ਸਰਟੀਫਿਕੇਟ"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA ਸਰਟੀਫਿਕੇਟ"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec ਵਰਤੋਂਕਾਰ ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec ਸਰਵਰ ਸਰਟੀਫਿਕੇਟ"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"ਉੱਨਤ ਚੋਣਾਂ ਦਿਖਾਓ"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"ਵਿਕਸਿਤ ਚੋਣਾਂ ਦਿਖਾਓ"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS ਖੋਜ ਡੋਮੇਨ"</string>
-    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS ਸਰਵਰ (ਉਦਾਹਰਨ ਲਈ 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"ਫਾਰਵਰਡਿੰਗ ਰੂਟਸ (ਉਦਾਹਰਨ ਲਈ 10.0.0.0/8)"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS ਸਰਵਰ (ਉਦਾਹਰਨ ਵਜੋਂ 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"ਫਾਰਵਰਡਿੰਗ ਰੂਟਸ (ਉਦਾਹਰਨ ਵਜੋਂ 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"ਵਰਤੋਂਕਾਰ ਨਾਮ"</string>
     <string name="vpn_password" msgid="6756043647233596772">"ਪਾਸਵਰਡ"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"ਖਾਤਾ ਜਾਣਕਾਰੀ ਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(ਵਰਤਿਆ ਨਹੀਂ)"</string>
-    <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(ਸਰਵਰ ਪ੍ਰਮਾਣਿਤ ਨਾ ਕਰੋ)"</string>
+    <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(ਸਰਵਰ ਦੀ ਪੁਸ਼ਟੀ ਨਾ ਕਰੋ)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(ਸਰਵਰ ਤੋਂ ਪ੍ਰਾਪਤ ਕੀਤਾ)"</string>
     <string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"ਇਹ VPN ਕਿਸਮ ਹਰ ਸਮੇਂ ਕਨੈਕਟ ਹੋਈ ਨਹੀਂ ਰਹਿ ਸਕਦੀ"</string>
     <string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"\'ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN\' ਸਿਰਫ਼ ਸੰਖਿਆਤਮਿਕ ਸਰਵਰ ਪਤਿਆਂ ਦਾ ਸਮਰਥਨ ਕਰਦਾ ਹੈ"</string>
@@ -2395,12 +2476,12 @@
     <string name="vpn_save" msgid="4233484051644764510">"ਰੱਖਿਅਤ ਕਰੋ"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"ਤਬਦੀਲ ਕਰੋ"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"VPN ਪ੍ਰੋਫਾਈਲ ਸੰਪਾਦਿਤ ਕਰੋ"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"VPN ਪ੍ਰੋਫਾਈਲ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"ਭੁੱਲ ਜਾਓ"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ਇਹ VPN ਡਿਸਕਨੈਕਟ ਕਰੀਏ?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"ਸੰਸਕਰਨ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="1939804054179766249">"ਵਰਜਨ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPN ਨੂੰ ਛੱਡੋ"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ਕੀ ਮੌਜੂਦਾ VPN ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ਕੀ ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਹੈ?"</string>
@@ -2412,11 +2493,11 @@
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
     <string name="vpn_cant_connect_message" msgid="1352832123114214283">"ਇਹ ਐਪ \'ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN\' ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="5628219087569761496">"VPN ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"VPN ਪ੍ਰੋਫਾਈਲ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"ਪ੍ਰੋਫਾਈਲ ਦਾ ਸੰਪਾਦਨ ਕਰੋ"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"ਪ੍ਰੋਫਾਈਲ ਮਿਟਾਓ"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"ਕੋਈ VPNs ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੇ ਗਏ"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"ਕੋਈ VPN ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੇ ਗਏ"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"ਹਰ ਸਮੇਂ VPN ਨਾਲ ਕਨੈਕਟ ਰਹੋ"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"ਇਸ ਐਪ ਵੱਲੋਂ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"ਹਮੇਸ਼ਾ-ਚਾਲੂ ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
@@ -2424,7 +2505,7 @@
     <string name="vpn_require_connection_title" msgid="159053539340576331">"ਕੀ VPN ਕਨੈਕਸ਼ਨ ਦੀ ਲੋੜ ਹੈ?"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"ਹਮੇਸ਼ਾਂ ਉਸ ਨਾਲ ਕਨੈਕਟ ਰਹਿਣ ਲਈ ਇੱਕ VPN ਪ੍ਰੋਫਾਈਲ ਚੁਣੋ। ਨੈੱਟਵਰਕ ਟ੍ਰੈਫਿਕ ਦੀ ਆਗਿਆ ਕੇਵਲ ਇਸ VPN ਨਾਲ ਕਨੈਕਟ ਕੀਤੇ ਜਾਣ ਤੇ ਹੀ ਦਿੱਤੀ ਜਾਏਗੀ।"</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"ਕੋਈ ਨਹੀਂ"</string>
-    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ਸਰਵਰ ਅਤੇ DNS ਦੋਵਾਂ ਲਈ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN ਲਈ ਇੱਕ IP ਪਤਾ ਲੁੜੀਂਦਾ ਹੈ।"</string>
+    <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"ਸਰਵਰ ਅਤੇ DNS ਦੋਵਾਂ ਲਈ ਹਮੇਸ਼ਾਂ-ਚਾਲੂ VPN ਲਈ ਇੱਕ IP ਪਤਾ ਲੋੜੀਂਦਾ ਹੈ।"</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"ਕੋਈ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN ਤੋਂ ਡਿਸਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"ਕੋਈ ਨਹੀਂ"</string>
@@ -2432,25 +2513,25 @@
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"ਸਿਸਟਮ"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"ਵਰਤੋਂਕਾਰ"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"ਅਸਮਰੱਥ ਬਣਾਓ"</string>
-    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"ਚਾਲੂ ਕਰੋ"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"ਹਟਾਓ"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ਭਰੋਸਾ ਕਰੋ"</string>
-    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"ਕੀ CA ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"ਕੀ ਸਿਸਟਮ CA ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
-    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ਕੀ ਉਪਭੋਗਤਾ CA ਸਰਟੀਫਿਕੇਟ ਨੂੰ ਸਥਾਈ ਤੌਰ ਤੇ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="credential_contains" msgid="3984922924723974084">"ਇਸ ਇੰਦਰਾਜ਼ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:"</string>
+    <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"ਕੀ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨੂੰ ਚਾਲੂ ਕਰਦਾ ਹੈ?"</string>
+    <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"ਕੀ ਸਿਸਟਮ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨੂੰ ਬੰਦ ਕਰਦਾ ਹੈ?"</string>
+    <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"ਕੀ ਵਰਤੋਂਕਾਰ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨੂੰ ਸਥਾਈ ਤੌਰ ਤੇ ਹਟਾਉਣਾ ਹੈ?"</string>
+    <string name="credential_contains" msgid="3984922924723974084">"ਇਸ ਇੰਦਰਾਜ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:"</string>
     <string name="one_userkey" msgid="6034020579534914349">"ਇੱਕ ਉਪਭੋਗਤਾ ਕੁੰਜੀ"</string>
-    <string name="one_usercrt" msgid="2150319011101639509">"ਇੱਕ ਉਪਭੋਗਤਾ ਸਰਟੀਫਿਕੇਟ"</string>
-    <string name="one_cacrt" msgid="6844397037970164809">"ਇੱਕ CA ਸਰਟੀਫਿਕੇਟ"</string>
+    <string name="one_usercrt" msgid="2150319011101639509">"ਇੱਕ ਵਰਤੋਂਕਾਰ ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
+    <string name="one_cacrt" msgid="6844397037970164809">"ਇੱਕ CA ਪ੍ਰਮਾਣ-ਪੱਤਰ"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA ਸਰਟੀਫਿਕੇਟ"</string>
     <string name="user_credential_title" msgid="1954061209643070652">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਵੇਰਵੇ"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"ਹਟਾਇਆ ਗਿਆ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"ਕੋਈ ਵਰਤੋਂਕਾਰ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਥਾਪਤ ਨਹੀਂ ਹਨ"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"ਸਪੈੱਲ ਚੈਕਰ"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"ਆਪਣਾ ਮੌਜੂਦਾ ਪੂਰਾ ਬੈਕਅਪ ਪਾਸਵਰਡ ਇੱਥੇ ਟਾਈਪ ਕਰੋ"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"ਇੱਥੇ ਪੂਰੇ ਬੈਕਅਪ ਲਈ ਇੱਕ ਨਵਾਂ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ਆਪਣਾ ਨਵਾਂ ਪੂਰਾ ਬੈਕਅਪ ਪਾਸਵਰਡ ਇੱਥੇ ਦੁਬਾਰਾ ਟਾਈਪ ਕਰੋ"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ਬੈਕਅਪ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"ਆਪਣਾ ਮੌਜੂਦਾ ਪੂਰਾ ਬੈਕਅੱਪ ਪਾਸਵਰਡ ਇੱਥੇ ਟਾਈਪ ਕਰੋ"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"ਇੱਥੇ ਪੂਰੇ ਬੈਕਅੱਪ ਲਈ ਇੱਕ ਨਵਾਂ ਪਾਸਵਰਡ ਟਾਈਪ ਕਰੋ"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ਆਪਣਾ ਨਵਾਂ ਪੂਰਾ ਬੈਕਅੱਪ ਪਾਸਵਰਡ ਇੱਥੇ ਦੁਬਾਰਾ ਟਾਈਪ ਕਰੋ"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ਬੈਕਅੱਪ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ਰੱਦ ਕਰੋ"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ਵਾਧੂ ਸਿਸਟਮ ਅਪਡੇਟਾਂ"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"ਅਯੋਗ ਬਣਾਇਆ"</string>
@@ -2463,88 +2544,88 @@
       <item quantity="other">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ \'ਤੇ ਭਰੋਸਾ ਕਰੋ ਜਾਂ ਹਟਾਓ</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਹਨ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੈੱਟਰਵਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਹਨ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੈੱਟਰਵਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਹਨ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੈੱਟਰਵਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਸਥਾਪਤ ਕੀਤੀਆਂ ਹਨ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੈੱਟਰਵਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ ਹੈ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</item>
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ ਹੈ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ ਹੈ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> ਨੇ ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਲਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਅਥਾਰਿਟੀਆਂ ਨੂੰ ਸਥਾਪਤ ਕੀਤਾ ਹੈ, ਜੋ ਉਹਨਾਂ ਨੂੰ ਈਮੇਲਾਂ, ਐਪਾਂ, ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ ਕੰਮ ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ ਦੀ ਨਿਗਰਾਨੀ ਕਰਨ ਦੇ ਸਕਦੀਆਂ ਹਨ।\n\nਇਹਨਾਂ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"ਇੱਕ ਤੀਜੀ ਪਾਰਟੀ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਗਤੀਵਿਧੀ ਦਾ ਨਿਰੀਖਣ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੈ, ਈਮੇਲਾਂ, ਐਪਾਂ ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈਬਸਾਈਟਾਂ ਸਮੇਤ।\n\nਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੇ ਸਥਾਪਤ ਕੀਤਾ ਇੱਕ ਭਰੋਸੇਯੋਗ ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਇਸਨੂੰ ਸੰਭਵ ਬਣਾ ਰਿਹਾ ਹੈ।"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"ਇੱਕ ਤੀਜੀ ਪਾਰਟੀ ਤੁਹਾਡੀ ਨੈੱਟਵਰਕ ਗਤੀਵਿਧੀ ਦਾ ਨਿਰੀਖਣ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੈ, ਈਮੇਲਾਂ, ਐਪਾਂ ਅਤੇ ਸੁਰੱਖਿਅਤ ਵੈੱਬਸਾਈਟਾਂ ਸਮੇਤ।\n\nਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੇ ਸਥਾਪਤ ਕੀਤਾ ਇੱਕ ਭਰੋਸੇਯੋਗ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਇਸਨੂੰ ਸੰਭਵ ਬਣਾ ਰਿਹਾ ਹੈ।"</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
       <item quantity="one">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ ਕਰੋ</item>
       <item quantity="other">ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਜਾਂਚ ਕਰੋ</item>
     </plurals>
     <string name="user_settings_title" msgid="6151874007858148344">"ਵਰਤੋਂਕਾਰ"</string>
     <string name="user_list_title" msgid="7937158411137563543">"ਉਪਭੋਗਤਾ &amp; ਪ੍ਰੋਫਾਈਲਾਂ"</string>
-    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ਉਪਭੋਗਤਾ ਜਾਂ ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"ਵਰਤੋਂਕਾਰ ਜਾਂ ਪ੍ਰੋਫਾਈਲ ਜੋੜੋ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
-    <string name="user_need_lock_message" msgid="5879715064416886811">"ਇਸਤੋਂ ਪਹਿਲਾਂ ਕਿ ਤੁਸੀਂ ਇੱਕ ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ ਬਣਾ ਸਕੋ, ਤੁਹਾਨੂੰ ਆਪਣੇ ਐਪਸ ਅਤੇ ਨਿੱਜੀ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਇੱਕ ਸਕ੍ਰੀਨ ਲੌਕ ਸੈਟ ਅਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="user_set_lock_button" msgid="8311219392856626841">"ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="user_need_lock_message" msgid="5879715064416886811">"ਇਸਤੋਂ ਪਹਿਲਾਂ ਕਿ ਤੁਸੀਂ ਇੱਕ ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ ਬਣਾ ਸਕੋ, ਤੁਹਾਨੂੰ ਆਪਣੀਆਂ ਐਪਾਂ ਅਤੇ ਨਿੱਜੀ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਲਈ ਇੱਕ ਸਕ੍ਰੀਨ  ਲਾਕ  ਸੈੱਟ ਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">" ਲਾਕ  ਸੈੱਟ ਕਰੋ"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"ਸੈਟ ਅਪ ਨਹੀਂ ਕੀਤਾ"</string>
-    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"ਸੈਟ ਅਪ ਨਹੀਂ ਕੀਤੀ - ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
-    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"ਸੈਟ ਅਪ ਨਹੀਂ ਕੀਤਾ - ਕੰਮ ਪ੍ਰੋਫਾਈਲ"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"ਸੈੱਟ ਅੱਪ ਨਹੀਂ ਕੀਤੀ - ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
+    <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"ਸੈੱਟ ਅੱਪ ਨਹੀਂ ਕੀਤਾ - ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_admin" msgid="993402590002400782">"ਪ੍ਰਸ਼ਾਸਕ"</string>
     <string name="user_you" msgid="1639158809315025986">"ਤੁਸੀਂ (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ਉਪਨਾਮ"</string>
-    <string name="user_add_user_type_title" msgid="2146438670792322349">"ਜੋੜੋ"</string>
-    <string name="user_add_max_count" msgid="5405885348463433157">"ਤੁਸੀਂ <xliff:g id="USER_COUNT">%1$d</xliff:g> ਉਪਭੋਗਤਾ ਜੋਡ਼ ਸਕਦੇ ਹੋ"</string>
-    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ਉਪਭੋਗਤਾਵਾਂ ਕੋਲ ਉਹਨਾਂ ਦੇ ਆਪਣੇ ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਹੁੰਦੀ ਹੈ"</string>
-    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ ਤੋਂ ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਲਈ ਪਹੁੰਚ ਪ੍ਰਤਿਬੰਧ ਕਰ ਸਕਦੇ ਹੋ"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="user_add_max_count" msgid="5405885348463433157">"ਤੁਸੀਂ <xliff:g id="USER_COUNT">%1$d</xliff:g> ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ਉਪਭੋਗਤਾਵਾਂ ਕੋਲ ਉਹਨਾਂ ਦੀਆਂ ਆਪਣੀਆਂ ਐਪਾਂ ਅਤੇ ਸਮੱਗਰੀ ਹੁੰਦੀਆਂ ਹਨ"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"ਤੁਸੀਂ ਆਪਣੇ ਖਾਤੇ ਤੋਂ ਐਪਾਂ ਅਤੇ ਸਮੱਗਰੀ ਲਈ ਪਹੁੰਚ ਪ੍ਰਤਿਬੰਧ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"ਵਰਤੋਂਕਾਰ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"ਕੀ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰਨਾ ਹੈ?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"ਤੁਸੀਂ ਵਾਧੂ ਵਰਤੋਂਕਾਰ ਬਣਾ ਕੇ ਹੋਰਾਂ ਲੋਕਾਂ ਨਾਲ ਇਹ ਡੀਵਾਈਸ ਸਾਂਝਾ ਕਰ ਸਕਦੇ ਹੋ। ਹਰੇਕ ਵਰਤੋਂਕਾਰ ਦਾ ਆਪਣਾ ਖੁਦ ਦਾ ਸਪੇਸ ਹੁੰਦਾ ਹੈ, ਜਿਸਨੂੰ ਉਹ ਐਪਾਂ ਅਤੇ ਵਾਲਪੇਪਰ ਆਦਿ ਨਾਲ ਅਨੁਕੂਲ ਬਣਾ ਸਕਦੇ ਹਨ। ਵਰਤੋਂਕਾਰ ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ ਵੀ ਵਰਤ ਸਕਦੇ ਹਨ ਜਿਵੇਂ ਵਾਈ‑ਫਾਈ ਜੋ ਹਰੇਕ ਤੇ ਅਸਰ ਪਾਉਂਦਾ ਹੈ।\n\nਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਜੋੜਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣਾ ਸਪੇਸ ਸੈੱਟ ਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਰਤੋਂਕਾਰ ਹੋਰ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਦੇ ਐਪਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣੀ ਜਗ੍ਹਾ ਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਰਤੋਂਕਾਰ ਹੋਰ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀਆਂ ਐਪਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"ਤੁਸੀਂ ਵਾਧੂ ਵਰਤੋਂਕਾਰ ਬਣਾ ਕੇ ਹੋਰਾਂ ਲੋਕਾਂ ਨਾਲ ਇਹ ਡੀਵਾਈਸ ਸਾਂਝਾ ਕਰ ਸਕਦੇ ਹੋ। ਹਰੇਕ ਵਰਤੋਂਕਾਰ ਦੀ ਆਪਣੀ ਖੁਦ ਦਾ ਜਗ੍ਹਾ ਹੁੰਦੀ ਹੈ, ਜਿਸਨੂੰ ਉਹ ਐਪਾਂ ਅਤੇ ਵਾਲਪੇਪਰ ਆਦਿ ਨਾਲ ਵਿਉਂਤਬੱਧ ਕਰ ਸਕਦੇ ਹਨ। ਵਰਤੋਂਕਾਰ ਡੀਵਾਈਸ ਸੈਟਿੰਗਾਂ ਵੀ ਵਰਤ ਸਕਦੇ ਹਨ ਜਿਵੇਂ ਵਾਈ‑ਫਾਈ ਜੋ ਹਰੇਕ ਤੇ ਅਸਰ ਪਾਉਂਦਾ ਹੈ।\n\nਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਜੋੜਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣਾ ਸਪੇਸ ਸੈੱਟ ਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਰਤੋਂਕਾਰ ਹੋਰ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀਆਂ ਐਪਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰਦੇ ਹੋ, ਉਸ ਵਿਅਕਤੀ ਨੂੰ ਆਪਣੀ ਜਗ੍ਹਾ ਸੈੱਟਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।\n\nਕੋਈ ਵੀ ਵਰਤੋਂਕਾਰ ਹੋਰ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀਆਂ ਐਪਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ਕੀ ਹੁਣ ਵਰਤੋਂਕਾਰ ਸਥਾਪਤ ਕਰਨਾ ਹੈ?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਵਿਅਕਤੀ ਡੀਵਾਈਸ ਲੈਣ ਅਤੇ ਆਪਣੀ ਜਗ੍ਹਾ ਸਥਾਪਤ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹੈ"</string>
-    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"ਕੀ ਹੁਣ ਪ੍ਰੋਫਾਈਲ ਸੈਟ ਅਪ ਕਰਨੀ ਹੈ?"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"ਕੀ ਹੁਣ ਪ੍ਰੋਫਾਈਲ ਸੈੱਟ ਅੱਪ ਕਰਨੀ ਹੈ?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"ਹੁਣੇ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ਅਜੇ ਨਹੀਂ"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"ਕੇਵਲ ਟੈਬਲੇਟ ਦਾ ਮਾਲਕ ਹੀ ਉਪਭੋਗਤਾਵਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
-    <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"ਕੇਵਲ ਫੋਨ ਦਾ ਮਾਲਕ ਹੀ ਉਪਭੋਗਤਾਵਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
-    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲਾਂ ਖਾਤੇ ਨਹੀਂ ਜੋੜ ਸਕਦੀਆਂ"</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"ਕੇਵਲ ਟੈਬਲੈੱਟ ਦਾ ਮਾਲਕ ਹੀ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਬੰਧਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"ਕੇਵਲ ਫ਼ੋਨ ਦਾ ਮਾਲਕ ਹੀ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"ਪ੍ਰਤਿਬੰਧਿਤ ਪ੍ਰੋਫਾਈਲਾਂ ਖਾਤੇ ਸ਼ਾਮਲ ਨਹੀਂ ਕਰ ਸਕਦੇ"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਨੂੰ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਮਿਟਾਓ"</string>
-    <string name="user_lockscreen_settings" msgid="4965661345247084878">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ਲੌਕ ਸਕ੍ਰੀਨ ਤੋਂ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="user_lockscreen_settings" msgid="4965661345247084878">"ਲਾਕ ਸਕ੍ਰੀਨ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"ਲਾਕ ਸਕ੍ਰੀਨ ਤੋਂ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"ਨਵਾਂ ਵਰਤੋਂਕਾਰ"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"ਨਵੀਂ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"ਕੀ ਖੁਦ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"ਕੀ ਇਹ ਵਰਤੋਂਕਾਰ ਹਟਾਉਣਾ ਹੈ?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"ਕੀ ਇਹ ਪ੍ਰੋਫਾਈਲ ਹਟਾਉਣੀ ਹੈ?"</string>
-    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"ਕੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਹਟਾਉਣੀ ਹੈ?"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"ਇਸ ਟੈਬਲੈੱਟ ’ਤੇ ਤੁਹਾਡੀ ਜਗ੍ਹਾ ਅਤੇ ਡੈਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਤੁਸੀਂ ਇਸ ਕਿਰਿਆ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"ਇਸ ਫੋਨ ’ਤੇ ਤੁਹਾਡੀ ਜਗ੍ਹਾ ਅਤੇ ਡੈਟਾ ਨਸ਼ਟ ਹੋ ਜਾਏਗਾ। ਤੁਸੀਂ ਇਸ ਕਿਰਿਆ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="user_confirm_remove_message" msgid="1020629390993095037">"ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡੈਟਾ ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
-    <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਦੇ ਹੋ ਤਾਂ ਇਸ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਸਾਰੇ ਐਪਸ ਅਤੇ ਡੈਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
-    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡੈਟਾ ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
+    <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"ਕੀ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਹਟਾਉਣੀ ਹੈ?"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"ਇਸ ਟੈਬਲੈੱਟ ’ਤੇ ਤੁਹਾਡੀ ਜਗ੍ਹਾ ਅਤੇ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"ਇਸ ਫ਼ੋਨ ’ਤੇ ਤੁਹਾਡੀ ਜਗ੍ਹਾ ਅਤੇ ਡਾਟਾ ਨਸ਼ਟ ਹੋ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="user_confirm_remove_message" msgid="1020629390993095037">"ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ  ਡਾਟਾ  ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
+    <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"ਜੇਕਰ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਦੇ ਹੋ ਤਾਂ ਇਸ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡਾਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
+    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ  ਡਾਟਾ  ਮਿਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"ਨਵਾਂ ਉਪਭੋਗਤਾ ਜੋੜ ਰਿਹਾ ਹੈ…"</string>
-    <string name="user_delete_user_description" msgid="3158592592118767056">"ਉਪਭੋਗਤਾ ਨੂੰ ਮਿਟਾਓ"</string>
+    <string name="user_delete_user_description" msgid="3158592592118767056">"ਵਰਤੋਂਕਾਰ ਨੂੰ ਮਿਟਾਓ"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"ਮਿਟਾਓ"</string>
     <string name="user_guest" msgid="8475274842845401871">"ਮਹਿਮਾਨ"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"ਮਹਿਮਾਨ ਹਟਾਓ"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"ਕੀ ਮਹਿਮਾਨ ਹਟਾਉਣਾ ਹੈ?"</string>
-    <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ਇਸ ਸੈਸ਼ਨ ਵਿੱਚ ਸਾਰੇ ਐਪਸ ਅਤੇ ਡੈਟਾ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
+    <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ਇਸ ਸੈਸ਼ਨ ਵਿੱਚ ਸਾਰੀਆਂ ਐਪਾਂ ਅਤੇ ਡਾਟਾ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"ਹਟਾਓ"</string>
-    <string name="user_enable_calling" msgid="5128605672081602348">"ਫੋਨ ਕਾਲਾਂ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ਫੋਨ ਕਾਲਾਂ ਅਤੇ SMS ਚਾਲੂ ਕਰੋ"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"ਫ਼ੋਨ ਕਾਲਾਂ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ਫ਼ੋਨ ਕਾਲਾਂ &amp; SMS ਚਾਲੂ ਕਰੋ"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"ਵਰਤੋਂਕਾਰ ਹਟਾਓ"</string>
-    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"ਕੀ ਫੋਨ ਕਾਲਾਂ ਚਾਲੂ ਕਰਨੀਆਂ ਹਨ?"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"ਕੀ ਫ਼ੋਨ ਕਾਲਾਂ ਚਾਲੂ ਕਰਨੀਆਂ ਹਨ?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"ਕਾਲ ਇਤਿਹਾਸ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ਕੀ ਫੋਨ ਕਾਲਾਂ ਅਤੇ SMS ਚਾਲੂ ਕਰਨੇ ਹਨ?"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"ਕੀ ਫ਼ੋਨ ਕਾਲਾਂ &amp; SMS ਚਾਲੂ ਕਰਨੇ ਹਨ?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ਕਾਲ ਅਤੇ SMS ਇਤਿਹਾਸ ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾਏਗਾ।"</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"ਸੰਕਟਕਾਲ ਜਾਣਕਾਰੀ"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"ਸੰਕਟਕਾਲੀਨ ਜਾਣਕਾਰੀ"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਦੀ ਜਾਣਕਾਰੀ ਅਤੇ ਸੰਪਰਕ"</string>
-    <string name="application_restrictions" msgid="8207332020898004394">"ਐਪਸ ਅਤੇ ਸਮੱਗਰੀ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"ਐਪਾਂ ਅਤੇ ਸਮੱਗਰੀ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ਪ੍ਰਤਿਬੰਧਾਂ ਵਾਲੇ ਐਪਲੀਕੇਸ਼ਨ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਸੈਟਿੰਗਾਂ ਦਾ ਵਿਸਤਾਰ ਕਰੋ"</string>
-    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੇਟ ਦੇ ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
-    <string name="global_change_warning" product="default" msgid="2461264421590324675">"ਇਹ ਸੈਟਿੰਗ ਇਸ ਫੋਨ ਦੇ ਸਾਰੇ ਉਪਭੋਗਤਾਵਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ਇਹ ਸੈਟਿੰਗ ਇਸ ਟੈਬਲੈੱਟ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
+    <string name="global_change_warning" product="default" msgid="2461264421590324675">"ਇਹ ਸੈਟਿੰਗ ਇਸ ਫ਼ੋਨ ਦੇ ਸਾਰੇ ਵਰਤੋਂਕਾਰਾਂ ਤੇ ਅਸਰ ਪਾਉਂਦੀ ਹੈ।"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ਭਾਸ਼ਾ ਬਦਲੋ"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ਟੈਪ ਕਰਕੇ ਭੁਗਤਾਨ ਕਰੋ"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"ਇਹ ਕਿਵੇਂ ਕੰਮ ਕਰਦਾ ਹੈ"</string>
-    <string name="nfc_payment_no_apps" msgid="5477904979148086424">"ਸਟੋਰਾਂ ਵਿੱਚ ਆਪਣੇ ਫੋਨ ਨਾਲ ਭੁਗਤਾਨ ਕਰੋ"</string>
+    <string name="nfc_payment_no_apps" msgid="5477904979148086424">"ਸਟੋਰਾਂ ਵਿੱਚ ਆਪਣੇ ਫ਼ੋਨ ਨਾਲ ਭੁਗਤਾਨ ਕਰੋ"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"ਭੁਗਤਾਨ ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"ਸੈੱਟ ਨਹੀਂ ਕੀਤਾ"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
@@ -2553,7 +2634,7 @@
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"ਸਿਵਾਏ ਇਸਦੇ ਜਦੋਂ ਦੂਜਾ ਭੁਗਤਾਨ ਐਪ ਖੁੱਲ੍ਹਾ ਹੋਵੇ"</string>
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"ਟੈਪ ਕਰੋ ਅਤੇ ਭੁਗਤਾਨ ਕਰੋ ਟਰਮੀਨਲ ਵਿਖੇ, ਇਸਦੇ ਨਾਲ ਭੁਗਤਾਨ ਕਰੋ:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"ਟਰਮੀਨਲ ਤੇ ਭੁਗਤਾਨ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"ਇੱਕ ਭੁਗਤਾਨ ਐਪ ਸੈਟ ਅਪ ਕਰੋ। ਫਿਰ ਕੰਟੈਕਟਲੈਸ ਚਿੰਨ੍ਹ ਨਾਲ ਕਿਸੇ ਵੀ ਟਰਮੀਨਲ ਤੱਕ ਆਪਣੇ ਫੋਨ ਦੇ ਪਿੱਛੇ ਕੇਵਲ ਹੋਲਡ ਕਰੋ।"</string>
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"ਇੱਕ ਭੁਗਤਾਨ ਐਪ ਸੈੱਟ ਅੱਪ ਕਰੋ। ਫਿਰ ਕੰਟੈਕਟਲੈਸ ਚਿੰਨ੍ਹ ਨਾਲ ਕਿਸੇ ਵੀ ਟਰਮੀਨਲ ਤੱਕ ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਪਿੱਛੇ ਕੇਵਲ ਹੋਲਡ ਕਰੋ।"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"ਸਮਝ ਲਿਆ"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"ਹੋਰ..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"ਕੀ ਆਪਣੀ ਤਰਜੀਹਾਂ ਦੇ ਤੌਰ ਤੇ ਸੈਟ ਕਰਨਾ ਹੈ?"</string>
@@ -2563,10 +2644,10 @@
     <string name="restriction_menu_reset" msgid="2067644523489568173">"ਪ੍ਰਤਿਬੰਧ ਹਟਾਓ"</string>
     <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="help_label" msgid="6886837949306318591">"ਮਦਦ &amp; ਫੀਡਬੈਕ"</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="user_picture_title" msgid="7297782792000291692">"ਫ਼ੋਟੋ ਆਈ.ਡੀ."</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"ਐਕਸਟ੍ਰੀਮ ਖਤਰੇ"</string>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"ਜੀਵਨ ਅਤੇ ਜਾਇਦਾਦ ਲਈ ਐਕਸਟ੍ਰੀਮ ਖਤਰਿਆਂ ਦੀਆਂ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"ਗੰਭੀਰ ਖਤਰੇ"</string>
@@ -2574,18 +2655,18 @@
     <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER ਚਿਤਾਵਨੀਆਂ"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"ਬਾਲ ਅਗਵਾ ਬਾਰੇ ਬੁਲੇਟਿਨ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="repeat_title" msgid="6473587828597786996">"ਦੁਹਰਾਓ"</string>
-    <string name="call_manager_enable_title" msgid="7718226115535784017">"ਕਾਲ ਮੈਨੇਜਰ ਨੂੰ ਸਮਰੱਥ ਬਣਾਓ"</string>
+    <string name="call_manager_enable_title" msgid="7718226115535784017">"ਕਾਲ ਮੈਨੇਜਰ ਨੂੰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="call_manager_enable_summary" msgid="8458447798019519240">"ਇਸ ਸੇਵਾ ਨੂੰ ਇਹ ਵਿਵਸਥਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ ਕਿ ਤੁਹਾਡੀਆਂ ਕਾਲਾਂ ਕਿਵੇਂ ਕੀਤੀਆਂ ਜਾਣ।"</string>
     <string name="call_manager_title" msgid="4479949569744516457">"ਕਾਲ ਮੈਨੇਜਰ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"ਐਮਰਜੈਂਸੀ ਪ੍ਰਸਾਰਨ"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"ਨੈੱਟਵਰਕ ਓਪਰੇਟਰ"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"ਪਹੁੰਚ ਬਿੰਦੂ ਨਾਮ"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਨਾਮ"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"ਵਿਸਤ੍ਰਿਤ 4G LTE ਮੋਡ"</string>
-    <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ਵੌਇਸ ਅਤੇ ਸੰਚਾਰ ਵਧਾਉਣ ਲਈ LTE ਡੈਟਾ ਵਰਤੋ (ਸਿਫ਼ਾਰਿਸ਼ ਕੀਤਾ)"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ਵੌਇਸ ਅਤੇ ਸੰਚਾਰ ਵਧਾਉਣ ਲਈ LTE  ਡਾਟਾ  ਵਰਤੋ (ਸਿਫ਼ਾਰਿਸ਼ ਕੀਤਾ)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਪ੍ਰਕਾਰ"</string>
-    <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (ਸਿਫਾਰਿਸ਼ ਕੀਤਾ)"</string>
+    <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE ( ਸਿਫ਼ਾਰਸ਼  ਕੀਤਾ)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"ਦਫ਼ਤਰ SIM"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"ਐਪ &amp; ਸਮੱਗਰੀ ਪਹੁੰਚ"</string>
     <string name="user_rename" msgid="8523499513614655279">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string>
@@ -2593,13 +2674,13 @@
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"<xliff:g id="APP">%1$s</xliff:g> ਵੱਲੋਂ ਨਿਯੰਤਰਿਤ"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਖਾਤਿਆਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਖਾਤਿਆਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦਾ ਹੈ। <xliff:g id="APP">%1$s</xliff:g> ਵੱਲੋਂ ਨਿਯੰਤਰਿਤ"</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi ਅਤੇ ਮੋਬਾਈਲ"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi ਅਤੇ ਮੋਬਾਈਲ ਸੈਟਿੰਗਾਂ ਦੇ ਸੰਸ਼ੋਧਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
-    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth ਪੇਅਰਿੰਗ ਅਤੇ ਸੈਟਿੰਗਾਂ ਦੇ ਸੰਸ਼ੋਧਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"ਵਾਈ‑ਫਾਈ ਅਤੇ ਮੋਬਾਈਲ"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"ਵਾਈ-ਫਾਈ ਅਤੇ ਮੋਬਾਈਲ ਸੈਟਿੰਗਾਂ ਦੇ ਸੰਸ਼ੋਧਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"ਬਲੂਟੁੱਥ"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"ਬਲੂਟੁੱਥ ਜੋੜਾਬੱਧ ਕਰਨ ਅਤੇ ਸੈਟਿੰਗਾਂ ਦੇ ਸੰਸ਼ੋਧਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
-    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"ਜਦੋਂ ਇਹ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਦੂਜੇ NFC ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦਾ ਹੈ ਤਾਂ ਡਾਟਾ ਵਟਾਂਦਰੇ ਦੀ ਆਗਿਆ ਜਿਓ"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ਜਦੋਂ ਟੈਬਲੇਟ ਦੂਜੇ ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦਾ ਹੈ ਤਾਂ ਡਾਟਾ ਵਟਾਂਦਰੇ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"ਜਦੋਂ ਇਹ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਦੂਜੇ NFC ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦਾ ਹੈ ਤਾਂ ਡਾਟਾ ਵਟਾਂਦਰੇ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ਜਦੋਂ ਟੈਬਲੈੱਟ ਦੂਜੇ ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦਾ ਹੈ ਤਾਂ ਡਾਟਾ ਵਟਾਂਦਰੇ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"ਜਦੋਂ ਫ਼ੋਨ ਦੂਜੇ ਡੀਵਾਈਸ ਨੂੰ ਛੋਂਹਦਾ ਹੈ ਤਾਂ ਡਾਟਾ ਵਟਾਂਦਰੇ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"ਟਿਕਾਣਾ"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ਐਪਸ ਨੂੰ ਆਪਣੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਜਾਣਕਾਰੀ ਵਰਤਣ ਦਿਓ"</string>
@@ -2615,11 +2696,11 @@
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"SIM ਕਾਰਡ ਬਦਲੇ ਗਏ ਹਨ"</string>
     <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"ਸਰਗਰਮੀਆਂ ਸੈੱਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
-    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"ਮੋਬਾਈਲ ਡੈਟਾ ਅਣਉਪਲਬਧ ਹੈ"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"ਇੱਕ ਡੈਟਾ SIM ਚੁਣਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"ਮੋਬਾਈਲ ਡਾਟਾ ਅਣਉਪਲਬਧ ਹੈ"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"ਇੱਕ  ਡਾਟਾ  SIM ਚੁਣਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"ਕਾਲਾਂ ਲਈ ਹਮੇਸ਼ਾਂ ਇਹ ਵਰਤੋ"</string>
-    <string name="select_sim_for_data" msgid="2366081042162853044">"ਡੈਟਾ ਲਈ ਇੱਕ SIM ਚੁਣੋ"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"ਡੈਟਾ SIM ਸਵਿਚ ਕਰਦੇ ਹੋਏ, ਇਸ ਵਿੱਚ ਇੱਕ ਮਿੰਟ ਲੱਗ ਸਕਦਾ ਹੈ..."</string>
+    <string name="select_sim_for_data" msgid="2366081042162853044">" ਡਾਟਾ  ਲਈ ਇੱਕ SIM ਚੁਣੋ"</string>
+    <string name="data_switch_started" msgid="2040761479817166311">" ਡਾਟਾ  SIM ਸਵਿਚ ਕਰਦੇ ਹੋਏ, ਇਸ ਵਿੱਚ ਇੱਕ ਮਿੰਟ ਲੱਗ ਸਕਦਾ ਹੈ..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"ਇਸਦੇ ਨਾਲ ਕਾਲ ਕਰੋ"</string>
     <string name="sim_select_card" msgid="211285163525563293">"ਇੱਕ SIM ਕਾਰਡ ਚੁਣੋ"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -2635,7 +2716,7 @@
     <string name="color_purple" msgid="3888532466427762504">"ਜਾਮਨੀ"</string>
     <string name="sim_no_inserted_msg" msgid="210316755353227087">"ਕੋਈ SIM ਕਾਰਡ ਨਹੀਂ ਪਾਏ"</string>
     <string name="sim_status_title" msgid="6744870675182447160">"SIM ਸਥਿਤੀ"</string>
-    <string name="sim_call_back_title" msgid="5181549885999280334">"ਪੂਰਵ-ਨਿਰਧਾਰਤ SIM ਤੋਂ ਕਾਲ ਬੈਕ ਕਰੋ"</string>
+    <string name="sim_call_back_title" msgid="5181549885999280334">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਿਮ ਤੋਂ ਕਾਲ ਬੈਕ ਕਰੋ"</string>
     <string name="sim_outgoing_call_title" msgid="1019763076116874255">"ਆਉਟਗੋਇੰਗ ਕਾਲਾਂ ਲਈ SIM"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ਹੋਰ ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਔਫਲੋਡ"</string>
@@ -2650,13 +2731,16 @@
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"ਚੋਣ ਲੁੜੀਂਦੀ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ਸੈਟਿੰਗਾਂ"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
-      <item quantity="one">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ ਵਿਖਾਓ</item>
-      <item quantity="other">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ ਵਿਖਾਓ</item>
+      <item quantity="one">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ  ਦਿਖਾਓ </item>
+      <item quantity="other">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ  ਦਿਖਾਓ </item>
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ਨੈੱਟਵਰਕ ਅਤੇ ਇੰਟਰਨੈੱਟ"</string>
-    <string name="network_dashboard_summary" msgid="3274556191585905652">"ਵਾਈ-ਫਾਈ, ਮੋਬਾਈਲ, ਡਾਟਾ ਵਰਤੋਂ, ਹੌਟਸਪੌਟ"</string>
-    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"ਕਨੈਕਟ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂ"</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>
@@ -2665,23 +2749,23 @@
     <string name="search_results_title" msgid="1796252422574886932">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="search_menu" msgid="6283419262313758339">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਖੋਜੋ"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਖੋਜੋ"</string>
-    <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"</string>
-    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ਲਿਖਤ ਸੁਨੇਹਾ, ਟੈਕਸਟਿੰਗ, ਸੁਨੇਹੇ, ਮੈਸੇਜਿੰਗ"</string>
-    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, ਵਾਇਰਲੈੱਸ, ਡੈਟਾ, 4g,3g, 2g, lte"</string>
-    <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, ਕਾਲ, ਕਾਲਿੰਗ"</string>
+    <string name="keywords_wifi" msgid="1395786161993828719">"ਵਾਈ-ਫਾਈ, ਵਾਈ-ਫਾਈ, ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"ਲਿਖਤ ਸੁਨੇਹਾ, ਲਿਖਤ ਭੇਜਣਾ, ਸੁਨੇਹੇ, ਸੁਨੇਹਾ ਭੇਜਣਾ"</string>
+    <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, 4g,3g, 2g, lte"</string>
+    <string name="keywords_wifi_calling" msgid="1784064367330122679">"ਵਾਈਫਾਈ, ਵਾਈ-ਫਾਈ, ਕਾਲ, ਕਾਲਿੰਗ"</string>
     <string name="keywords_home" msgid="3626170808219458848">"ਲੌਂਚਰ"</string>
-    <string name="keywords_display" msgid="8910345814565493016">"ਸਕਰੀਨ, ਟੱਚਸਕਰੀਨ"</string>
-    <string name="keywords_display_brightness_level" msgid="3891383826236015854">"ਡਿਮ ਸਕਰੀਨ, ਟੱਚਸਕਰੀਨ, ਬੈਟਰੀ"</string>
-    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ਡਿਮ ਸਕਰੀਨ, ਟੱਚਸਕਰੀਨ, ਬੈਟਰੀ"</string>
+    <string name="keywords_display" msgid="8910345814565493016">"ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ"</string>
+    <string name="keywords_display_brightness_level" msgid="3891383826236015854">"ਡਿਮ ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ, ਬੈਟਰੀ"</string>
+    <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"ਡਿਮ ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ, ਬੈਟਰੀ"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"ਡਿਮ ਸਕ੍ਰੀਨ, ਰਾਤ, ਭਾਹ"</string>
-    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ਬੈਕਗ੍ਰਾਊਂਡ, ਨਿੱਜੀਕਰਨ, ਡਿਸਪਲੇ ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਕਰੋ"</string>
+    <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ਬੈਕਗ੍ਰਾਊਂਡ, ਵਿਅਕਤੀਗਤ, ਵਿਉਂਤਬੱਧ ਡਿਸਪਲੇ"</string>
     <string name="keywords_display_font_size" msgid="3404655440064726124">"ਟੈਕਸਟ ਆਕਾਰ"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"ਪ੍ਰੋਜੈਕਟ, ਕਾਸਟ"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"ਸਪੇਸ, ਡਿਸਕ, ਹਾਰਡ ਡਰਾਈਵ, ਡੀਵਾਈਸ ਵਰਤੋਂ"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"ਪਾਵਰ ਵਰਤੋਂ, ਚਾਰਜ"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"ਸ਼ਬਦਜੋੜ, ਸ਼ਬਦਕੋਸ਼, ਸ਼ਬਦਜੋੜ ਜਾਂਚ, ਸਵੈ-ਸੁਧਾਈ ਕਰੋ"</string>
-    <string name="keywords_voice_input" msgid="769778245192531102">"ਪਛਾਣਕਰਤਾ, ਇਨਪੁੱਟ, ਬੋਲੀ, ਬੋਲੋ, ਭਾਸ਼ਾ, ਹੈਂਡ-ਸਫ਼ਰੀ, ਹੈਂਡ ਸਫ਼ਰੀ, ਪਛਾਣ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਔਡੀਓ, ਇਤਿਹਾਸ, ਬਲਿਊਟੁੱਥ ਹੈੱਡਸੈੱਟ"</string>
-    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"ਰੇਟ, ਭਾਸ਼ਾ, ਪੂਰਵ-ਨਿਰਧਾਰਤ, ਬੋਲੋ, ਬੋਲਣਾ, tts, ਪਹੁੰਚਯੋਗਤਾ, ਸਕਰੀਨ ਰੀਡਰ, ਨੇਤਰਹੀਣ"</string>
+    <string name="keywords_voice_input" msgid="769778245192531102">"ਪਛਾਣਕਰਤਾ, ਇਨਪੁੱਟ, ਬੋਲੀ, ਬੋਲੋ, ਭਾਸ਼ਾ, ਹੈਂਡਸ-ਫ਼ਰੀ, ਹੈਂਡ ਫ਼ਰੀ, ਪਛਾਣ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਔਡੀਓ, ਇਤਿਹਾਸ, ਬਲੂਟੁੱਥ ਹੈੱਡਸੈੱਟ"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"ਰੇਟ, ਭਾਸ਼ਾ, ਪੂਰਵ-ਨਿਰਧਾਰਤ, ਬੋਲੋ, ਬੋਲਣਾ, tts, ਪਹੁੰਚਯੋਗਤਾ, ਸਕ੍ਰੀਨ ਰੀਡਰ, ਨੇਤਰਹੀਣ"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ਘੜੀ, ਫੌਜ"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"ਮੁੜ-ਸੈੱਟ ਕਰੋ, ਮੁੜ-ਸਟੋਰ ਕਰੋ, ਫੈਕਟਰੀ"</string>
     <string name="keywords_factory_data_reset" msgid="5894970373671252165">"ਸਾਫ਼ ਕਰੋ, ਮਿਟਾਓ, ਮੁੜ-ਸਟੋਰ ਕਰੋ, ਸਾਫ਼ ਕਰੋ, ਹਟਾਓ"</string>
@@ -2693,40 +2777,41 @@
     <string name="keywords_location_mode" msgid="8584992704568356084">"ਸ਼ੁੱਧਤਾ"</string>
     <string name="keywords_accounts" msgid="1957925565953357627">"ਖਾਤਾ"</string>
     <string name="keywords_users" msgid="3434190133131387942">"ਪਾਬੰਦੀ, ਪਾਬੰਦੀ ਲਗਾਓ, ਪਾਬੰਦੀ ਲਗਾਈ"</string>
-    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ਪਾਠ ਸੁਧਾਈ, ਸਹੀ, ਆਵਾਜ਼, ਕੰਬਣਾ, ਸਵੈ, ਭਾਸ਼ਾ, ਸੰਕੇਤ, ਸੁਝਾਓ, ਸੁਝਾਅ, ਥੀਮ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਕਿਸਮ, ਇਮੋਜੀ, ਅੰਤਰਰਾਸ਼ਟਰੀ"</string>
+    <string name="keywords_keyboard_and_ime" msgid="9143339015329957107">"ਲਿਖਤ ਸੁਧਾਈ, ਸਹੀ, ਧੁਨੀ, ਕੰਬਣਾ, ਸਵੈ, ਭਾਸ਼ਾ, ਸੰਕੇਤ, ਸੁਝਾਓ, ਸੁਝਾਅ, ਥੀਮ, ਅਪਮਾਨਜਨਕ, ਸ਼ਬਦ, ਕਿਸਮ, ਇਮੋਜੀ, ਅੰਤਰਰਾਸ਼ਟਰੀ"</string>
     <string name="keywords_reset_apps" msgid="5293291209613191845">"ਮੁੜ-ਸੈੱਟ ਕਰੋ, ਤਰਜੀਹਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="keywords_emergency_app" msgid="3143078441279044780">"ਐਮਰਜੈਂਸੀ, ਬਰਫ, ਐਪ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="keywords_default_phone_app" msgid="4213090563141778486">"ਫੋਨ, ਡਾਇਲਰ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
+    <string name="keywords_default_phone_app" msgid="4213090563141778486">"ਫ਼ੋਨ, ਡਾਇਲਰ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="keywords_all_apps" msgid="7814015440655563156">"ਐਪਾਂ, ਡਾਊਨਲੋਡ ਕਰੋ, ਐਪਲੀਕੇਸ਼ਨਾਂ, ਸਿਸਟਮ"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"ਐਪ, ਇਜਾਜ਼ਤਾਂ, ਸੁਰੱਖਿਆ"</string>
     <string name="keywords_default_apps" msgid="223872637509160136">"ਐਪਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ਅਨੁਕੂਲਨ ਅਣਡਿੱਠ ਕਰੋ, doze, ਐਪ ਸਟੈਂਡਬਾਇ"</string>
+    <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ਅਨੁਕੂਲਨ ਅਣਡਿੱਠ ਕਰੋ, doze, ਐਪ ਸਟੈਂਡਬਾਏ"</string>
     <string name="keywords_color_mode" msgid="6362744316886077510">"ਚਮਕੀਲਾ, rgb, srgb, ਰੰਗ, ਕੁਦਰਤੀ, ਸਧਾਰਨ"</string>
     <string name="keywords_color_temperature" msgid="2688947724153266364">"ਰੰਗ ਤਾਪਮਾਨ D65 D73 ਚਿੱਟਾ ਪੀਲਾ ਨੀਲਾ ਨਿੱਘਾ ਠੰਡਾ"</string>
-    <string name="keywords_lockscreen" msgid="5746561909668570047">"ਅਨਲੌਕ ਕਰਨ ਲਈ ਸਲਾਈਡ ਕਰੋ, ਪਾਸਵਰਡ, ਪੈਟਰਨ, ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
-    <string name="keywords_profile_challenge" msgid="789611397846512845">"ਕੰਮ ਚੁਣੌਤੀ, ਕੰਮ, ਪ੍ਰੋਫਾਈਲ"</string>
-    <string name="keywords_unification" msgid="1922900767659821025">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ, ਪ੍ਰਬੰਧਿਤ ਕੀਤੀ ਗਈ ਪ੍ਰੋਫਾਈਲ, ਇਕਰੂਪ ਕਰਨਾ, ਏਕੀਕਰਨ, ਕੰਮ, ਪ੍ਰੋਫਾਈਲ"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ਸੰਕੇਤ"</string>
+    <string name="keywords_lockscreen" msgid="5746561909668570047">"ਅਣਲਾਕ ਕਰਨ ਲਈ ਸਲਾਈਡ ਕਰੋ, ਪਾਸਵਰਡ, ਪੈਟਰਨ, ਪਿੰਨ ਦਾਖਲ ਕਰੋ"</string>
+    <string name="keywords_profile_challenge" msgid="789611397846512845">"ਕਾਰਜ ਚੁਣੌਤੀ, ਕਾਰਜ, ਪ੍ਰੋਫਾਈਲ"</string>
+    <string name="keywords_unification" msgid="1922900767659821025">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ, ਪ੍ਰਬੰਧਿਤ ਕੀਤੀ ਗਈ ਪ੍ਰੋਫਾਈਲ, ਇਕਰੂਪ ਕਰਨਾ, ਏਕੀਕਰਨ, ਕੰਮ, ਪ੍ਰੋਫਾਈਲ"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ਸੰਕੇਤ"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ਭੁਗਤਾਨ ਕਰੋ, ਟੈਪ ਕਰੋ, ਭੁਗਤਾਨ"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ਬੈਕਅੱਪ, ਬੈਕ ਅੱਪ"</string>
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC ਟੈਗ ਸੈਟ ਅਪ ਕਰੋ"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ਸੰਕੇਤ"</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>
-    <string name="status_invalid_password" msgid="2575271864572897406">"ਗ਼ਲਤ ਪਾਸਵਰਡ, ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+    <string name="status_invalid_password" msgid="2575271864572897406">"ਅਵੈਧ ਪਾਸਵਰਡ, ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="status_write_success" msgid="5228419086308251169">"ਸਫਲਤਾ!"</string>
-    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC ਟੈਗ ਤੇ ਡੈਟਾ ਲਿਖਣ ਵਿੱਚ ਅਸਮਰੱਥ। ਜੇਕਰ ਸਮੱਸਿਆ ਬਣੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਇੱਕ ਵੱਖਰੇ ਟੈਗ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
+    <string name="status_failed_to_write" msgid="8072752734686294718">"NFC ਟੈਗ ਤੇ  ਡਾਟਾ  ਲਿਖਣ ਵਿੱਚ ਅਸਮਰੱਥ। ਜੇਕਰ ਸਮੱਸਿਆ ਬਣੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਇੱਕ ਵੱਖਰੇ ਟੈਗ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ਟੈਗ ਲਿਖਣਯੋਗ ਨਹੀਂ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਇੱਕ ਵੱਖਰਾ ਟੈਗ ਵਰਤੋ।"</string>
     <string name="default_sound" msgid="8821684447333687810">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਧੁਨੀ"</string>
-    <string name="sound_settings_summary" msgid="4100853606668287965">"ਰਿੰਗ ਵੌਲਯੂਮ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ਹੈ"</string>
+    <string name="sound_settings_summary" msgid="4100853606668287965">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ਹੈ"</string>
     <string name="sound_dashboard_summary" msgid="3402435125958012986">"ਅਵਾਜ਼, ਥਰਥਰਾਹਟ, \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\'"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ਰਿੰਗਰ ਥਰਥਰਾਹਟ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
-    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ਰਿੰਗਰ ਖਾਮੋਸ਼ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
-    <string name="sound_settings_example_summary" msgid="2404914514266523165">"ਰਿੰਗ ਵੌਲਯੂਮ 80% ਹੈ"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"ਮੀਡੀਆ ਵੌਲਿਊਮ"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"ਅਲਾਰਮ ਵੌਲਿਊਮ"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"ਰਿੰਗ ਵੌਲਿਊਮ"</string>
+    <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ਰਿੰਗਰ ਸ਼ਾਂਤ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
+    <string name="sound_settings_example_summary" msgid="2404914514266523165">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼ 80% ਹੈ"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"ਮੀਡੀਆ ਦੀ ਅਵਾਜ਼"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"ਅਲਾਰਮ ਦੀ ਅਵਾਜ਼"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"ਰਿੰਗ ਦੀ ਅਵਾਜ਼"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"ਫੋਨ ਰਿੰਗਟੋਨ"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"ਫ਼ੋਨ ਰਿੰਗਟੋਨ"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ਐਪ ਵੱਲੋਂ ਮੁਹੱਈਆ ਕਰਵਾਈ ਧੁਨੀ"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
@@ -2734,15 +2819,15 @@
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ਕਾਲਾਂ ਲਈ ਥਰਥਰਾਹਟ ਵੀ ਕਰੋ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ਹੋਰ ਅਵਾਜ਼ਾਂ"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ਡਾਇਲ ਪੈਡ ਟੋਨਾਂ"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"ਸਕ੍ਰੀਨ ਲੌਕ ਕਰਨ ਦੀਆਂ ਧੁਨੀਆਂ"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"ਸਕ੍ਰੀਨ ਲਾਕ ਕਰਨ ਦੀਆਂ ਧੁਨੀਆਂ"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"ਚਾਰਜ ਕਰਨ ਦੀਆਂ ਧੁਨੀਆਂ"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"ਡੌਕ ਕਰਨ ਦੀਆਂ ਅਵਾਜ਼ਾਂ"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"ਸਪੱਰਸ਼ ਧੁਨੀਆਂ"</string>
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"ਟੈਪ \'ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"ਡੌਕ ਸਪੀਕਰ ਪਲੇ ਕਰਦਾ ਹੈ"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ਸਾਰੇ ਔਡੀਓ"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"ਕੇਵਲ ਮੀਡੀਆ ਔਡੀਓ"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ਖਾਮੋਸ਼"</string>
+    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ਸਾਰੇ  ਆਡੀਓ"</string>
+    <string name="dock_audio_media_enabled" msgid="667849382924908673">"ਕੇਵਲ ਮੀਡੀਆ  ਆਡੀਓ"</string>
+    <string name="emergency_tone_silent" msgid="1067515631635824291">"ਸ਼ਾਂਤ"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"ਚਿਤਾਵਨੀ"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"ਚਾਲੂ ਹੋਣ \'ਤੇ ਵੱਜਣ ਵਾਲੀਆਂ ਧੁਨੀਆਂ"</string>
@@ -2758,7 +2843,7 @@
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ਕੁਝ ਵਿਸ਼ੇਸ਼ ਸਮਿਆਂ \'ਤੇ ਧੁਨੀ ਅਤੇ ਥਰਥਰਾਹਟਾਂ ਸੀਮਤ ਕਰੋ"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"ਕੇਵਲ ਤਰਜੀਹੀ"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"ਕੇਵਲ ਅਲਾਰਮ"</string>
-    <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"ਸੰਪੂਰਨ ਖਾਮੋਸ਼ੀ"</string>
+    <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"ਪੂਰਾ ਸ਼ਾਂਤ"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"ਦ੍ਰਿਸ਼ਟੀਗਤ ਗੜਬੜੀਆਂ ਬਲਾਕ ਕਰੋ"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ"</string>
@@ -2771,44 +2856,49 @@
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"ਧੁਨੀਆਂ ਬਦਲੀਏ?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"ਬਦਲੋ"</string>
     <string name="work_sync_dialog_message" msgid="7841728953710863208">"ਤੁਹਾਡੀਆਂ ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਧੁਨੀਆਂ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਵਰਤੀਆਂ ਜਾਣਗੀਆਂ"</string>
-    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਧੁਨੀ ਸ਼ਾਮਲ ਕਰੀਏ?"</string>
+    <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"ਵਿਉਂਤੀ ਧੁਨੀ ਸ਼ਾਮਲ ਕਰਨੀ ਹੈ?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"ਇਹ ਫ਼ਾਈਲ <xliff:g id="FOLDER_NAME">%s</xliff:g> ਫੋਲਡਰ ਵਿੱਚ ਕਾਪੀ ਕੀਤੀ ਜਾਵੇਗੀ"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ਰਿੰਗਟੋਨਾਂ"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ਹੋਰ ਧੁਨੀਆਂ ਅਤੇ ਥਰਥਰਾਹਟਾਂ"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"ਸੂਚਨਾਵਾਂ"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"ਉੱਨਤ"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"ਵਿਕਸਿਤ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ਕੰਮ ਸਬੰਧੀ ਸੂਚਨਾਵਾਂ"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"ਸੂਚਨਾ ਬਿੰਦੂਆਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"ਸੂਚਨਾ ਬਿੰਦੂਆਂ ਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ਲਾਈਟ ਨੂੰ ਟਿਮ-ਟਿਮਾਓ"</string>
-    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਦਿਖਾਓ"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ਸੰਵੇਦਨਸ਼ੀਲ ਸੂਚਨਾ ਸਮੱਗਰੀ ਲੁਕਾਓ"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"ਬਿਲਕੁਲ ਵੀ ਸੂਚਨਾਵਾਂ ਨਾ ਦਿਖਾਓ"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"ਜਦੋਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਲੌਕ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਕਿਵੇਂ ਦਿਖਾਉਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"ਜਦੋਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਲਾਕ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਸੂਚਨਾਵਾਂ ਕਿਵੇਂ ਦਿਖਾਉਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"ਸੂਚਨਾਵਾਂ"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"ਕੰਮ ਸਬੰਧੀ ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਵਿਖਾਓ"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"ਕੰਮ ਸਬੰਧੀ ਸਾਰੀ ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਦਿਖਾਓ"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"ਕੰਮ ਸਬੰਧੀ ਸੰਵੇਦਨਸ਼ੀਲ ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਲੁਕਾਓ"</string>
-    <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_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>
-    <string name="notification_importance_blocked" msgid="7938180808339386300">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਨਾ ਵਿਖਾਓ"</string>
+    <string name="notification_importance_blocked" msgid="7938180808339386300">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਨਾ  ਦਿਖਾਓ"</string>
     <string name="notification_importance_min" msgid="5455049524984686275">"ਕੋਈ ਧੁਨੀ ਜਾਂ ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਰੁਕਾਵਟ ਨਹੀਂ"</string>
     <string name="notification_importance_low" msgid="8881468429453766553">"ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"ਧੁਨੀ ਵਜਾਓ"</string>
-    <string name="notification_importance_high" msgid="2082429479238228527">"ਧੁਨੀ ਵਜਾਓ ਅਤੇ ਸਕ੍ਰੀਨ \'ਤੇ ਵਿਖਾਓ"</string>
+    <string name="notification_importance_high" msgid="2082429479238228527">"ਧੁਨੀ ਵਜਾਓ ਅਤੇ ਸਕ੍ਰੀਨ \'ਤੇ  ਦਿਖਾਓ"</string>
     <string name="notification_importance_min_title" msgid="6974673091137544803">"ਘੱਟ"</string>
     <string name="notification_importance_low_title" msgid="8131254047772814309">"ਔਸਤ"</string>
     <string name="notification_importance_default_title" msgid="9120383978536089489">"ਉੱਚ"</string>
     <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="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>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੂਚਨਾਵਾਂ \'ਤੇ ਪਹੁੰਚ ਨੂੰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ਐਪ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਪੜ੍ਹ ਸਕਦੇ"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d ਐਪਸ ਸੂਚਨਾਵਾਂ ਪੜ੍ਹ ਸਕਦੇ ਹਨ</item>
@@ -2816,27 +2906,25 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਨੇ ਸੂਚਨਾ ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ।"</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਲਈ ਸੂਚਨਾ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ਲਈ ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਪੜ੍ਹਨ ਯੋਗ ਹੋ ਜਾਣਗੀਆਂ, ਜਿਸ ਵਿੱਚ ਸੰਪਰਕ ਨਾਮ, ਅਤੇ ਤੁਹਾਨੂੰ ਪ੍ਰਾਪਤ ਹੋਣ ਵਾਲੇ ਲਿਖਤ ਸੁਨੇਹਿਆਂ ਵਰਗੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੈ। ਉਹ ਸੂਚਨਾਵਾਂ ਨੂੰ ਬਰਖ਼ਾਸਤ ਅਤੇ ਉਸ ਵਿੱਚ ਸ਼ਾਮਲ ਕਾਰਵਾਈ ਬਟਨਾਂ ਨੂੰ ਟ੍ਰਿਗਰ ਵੀ ਕਰ ਸਕੇਗਾ/ਸਕੇਗੀ। \n\nਇਹ ਐਪ ਨੂੰ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਬੰਦ ਜਾਂ ਚਾਲੂ ਕਰਨ ਅਤੇ ਸਬੰਧਿਤ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲਣ ਦੀ ਵੀ ਯੋਗਤਾ ਦੇਵੇਗਾ।"</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ਲਈ ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਪੜ੍ਹਨ ਯੋਗ ਹੋ ਜਾਣਗੀਆਂ, ਜਿਸ ਵਿੱਚ ਸੰਪਰਕ ਨਾਮ, ਅਤੇ ਤੁਹਾਨੂੰ ਪ੍ਰਾਪਤ ਹੋਣ ਵਾਲੇ ਲਿਖਤ ਸੁਨੇਹਿਆਂ ਵਰਗੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸ਼ਾਮਲ ਹੈ। ਉਹ ਸੂਚਨਾਵਾਂ ਨੂੰ ਖਾਰਜ ਅਤੇ ਉਸ ਵਿੱਚ ਸ਼ਾਮਲ ਕਾਰਵਾਈ ਬਟਨਾਂ ਨੂੰ ਟ੍ਰਿਗਰ ਵੀ ਕਰ ਸਕੇਗਾ/ਸਕੇਗੀ। \n\nਇਹ ਐਪ ਨੂੰ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਬੰਦ ਜਾਂ ਚਾਲੂ ਕਰਨ ਅਤੇ ਸਬੰਧਿਤ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲਣ ਦੀ ਵੀ ਯੋਗਤਾ ਦੇਵੇਗਾ।"</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"ਜੇਕਰ ਤੁਸੀਂ <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ਲਈ ਸੂਚਨਾ ਪਹੁੰਚ ਨੂੰ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਪਹੁੰਚ ਵੀ ਬੰਦ ਹੋ ਸਕਦੀ ਹੈ।"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"ਬੰਦ ਕਰੋ"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"ਰੱਦ ਕਰੋ"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR ਸਹਾਇਕ ਸੇਵਾਵਾਂ"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"ਕੋਈ ਵੀ ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਵੱਲੋਂ VR ਸਹਾਇਕ ਸੇਵਾਵਾਂ ਵਜੋਂ ਚਲਾਉਣ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਗਈ।"</string>
-    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਲਈ VR ਸੇਵਾ ਪਹੁੰਚ ਨੂੰ ਮਨਜ਼ੂਰੀ ਦੇਣੀ ਹੈ?"</string>
+    <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"ਕੀ <xliff:g id="SERVICE">%1$s</xliff:g> ਲਈ VR ਸੇਵਾ ਪਹੁੰਚ ਨੂੰ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"ਜਦੋਂ ਤੁਸੀਂ ਆਭਾਸੀ ਵਾਸਤਵਿਕਤਾ ਮੋਡ ਵਿੱਚ ਐਪਲੀਕੇਸ਼ਨਾਂ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਹੋ ਤਾਂ <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> ਚੱਲਣ ਦੇ ਯੋਗ ਹੋ ਜਾਵੇਗਾ।"</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"ਜਦੋਂ ਡੀਵਾਈਸ VR ਮੋਡ ਵਿੱਚ ਹੁੰਦਾ ਹੈ"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"ਧੁੰਦਲਾਪਣ ਘਟਾਓ (ਸਿਫ਼ਾਰਸ਼ ਕੀਤਾ ਗਿਆ)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"ਝਿਲਮਿਲ ਘਟਾਓ"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਮੋਡ"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ"</string>
     <string name="picture_in_picture_empty_text" msgid="685224245260197779">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਹੋਈਆਂ ਐਪਾਂ ਵਿੱਚੋਂ ਕੋਈ ਵੀ ਐਪ ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਮੋਡ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੀ"</string>
     <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip ਤਸਵੀਰ ਵਿੱਚ"</string>
-    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"ਤਸਵੀਰ-ਵਿੱਚ-ਤਸਵੀਰ ਮੋਡ"</string>
+    <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="zen_access_empty_text" msgid="8772967285742259540">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪਾਂ ਨੇ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ਐਪਸ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ਵੱਲੋਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੀ ਇਸ ਸ਼੍ਰੇਣੀ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
@@ -2856,14 +2944,14 @@
     <string name="notification_toggle_on" msgid="650145396718191048">"ਚਾਲੂ"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"ਬੰਦ"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"ਸਾਰੇ ਬਲਾਕ ਕਰੋ"</string>
-    <string name="app_notification_block_summary" msgid="4744020456943215352">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕਦੇ ਨਾ ਵਿਖਾਓ"</string>
-    <string name="notification_content_block_title" msgid="5854232570963006360">"ਸੂਚਨਾਵਾਂ ਵਿਖਾਓ"</string>
-    <string name="notification_content_block_summary" msgid="7746185794438882389">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਪਰਛਾਵੇਂ ਵਿੱਚ ਜਾਂ ਪੈਰੀਫਿਰਲ ਡੀਵਾਈਸਾਂ \'ਤੇ ਨਾ ਵਿਖਾਓ"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"ਸੂਚਨਾ ਬਿੰਦੂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="app_notification_block_summary" msgid="4744020456943215352">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕਦੇ ਨਾ  ਦਿਖਾਓ"</string>
+    <string name="notification_content_block_title" msgid="5854232570963006360">"ਸੂਚਨਾਵਾਂ  ਦਿਖਾਓ"</string>
+    <string name="notification_content_block_summary" msgid="7746185794438882389">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਪਰਛਾਵੇਂ ਵਿੱਚ ਜਾਂ ਪੈਰੀਫਿਰਲ ਡੀਵਾਈਸਾਂ \'ਤੇ ਨਾ  ਦਿਖਾਓ"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"ਸੂਚਨਾ ਬਿੰਦੂ ਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"ਸੂਚਨਾ ਬਿੰਦੂ ਦਿਖਾਓ"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਓਵਰਰਾਈਡ ਕਰੋ"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਰੋਕੇ ਰਹਿਣਾ ਜਾਰੀ ਰਹਿਣ ਦਿਓ ਜਦੋਂ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ \'ਸਿਰਫ਼ ਤਰਜੀਹ\' \'ਤੇ ਸੈੱਟ ਕੀਤਾ ਹੋਵੇ।"</string>
-    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
+    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"ਲਾਕ ਸਕ੍ਰੀਨ \'ਤੇ"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"ਬਲੌਕ ਕੀਤੀਆਂ"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ਤਰਜੀਹ"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"ਸੰਵੇਦਨਸ਼ੀਲ"</string>
@@ -2875,7 +2963,7 @@
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"ਮਿਟਾਓ"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"ਨਾਮ ਬਦਲੋ"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"ਨਿਯਮ ਦਾ ਨਾਮ"</string>
-    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"ਨਿਯਮ ਦਾ ਨਾਂ ਦਾਖ਼ਲ ਕਰੋ"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"ਨਿਯਮ ਦਾ ਨਾਮ ਲਿਖੋ"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"ਨਿਯਮ ਦਾ ਨਾਂ ਪਹਿਲਾਂ ਤੋਂ ਹੀ ਉਪਯੋਗ ਵਿੱਚ ਹੈ"</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"ਹੋਰ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"ਨਿਯਮ ਮਿਟਾਓ"</string>
@@ -2884,17 +2972,17 @@
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"ਮਿਟਾਓ"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"ਨਿਯਮ ਦਾ ਪ੍ਰਕਾਰ"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"ਅਗਿਆਤ"</string>
-    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"ਨਿਯਮ ਕੌਂਫਿਗਰ ਕਰੋ"</string>
+    <string name="zen_mode_configure_rule" msgid="8865785428056490305">"ਨਿਯਮ ਦੀ ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
     <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"ਸਮਾਂ ਨਿਯਮ"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"ਨਿਰਧਾਰਿਤ ਸਮੇਂ ਦੇ ਦੌਰਾਨ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕਰਨ ਲਈ ਸਵੈਚਾਲਿਤ ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"ਵਰਤਾਰਾ ਨਿਯਮ"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"ਇਵੈਂਟ ਨਿਯਮ"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"ਨਿਰਧਾਰਿਤ ਇਵੈਂਟਸ ਦੇ ਦੌਰਾਨ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਚਾਲੂ ਕਰਨ ਲਈ ਸਵੈਚਾਲਿਤ ਨਿਯਮ ਸੈੱਟ ਕਰੋ"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"ਇਸ ਲਈ ਇਵੈਂਟ ਦੇ ਦੌਰਾਨ"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"<xliff:g id="CALENDAR">%1$s</xliff:g> ਲਈ ਇਵੈਂਟ ਦੇ ਦੌਰਾਨ"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"ਕੋਈ ਵੀ ਕੈਲੰਡਰ"</string>
-    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"ਜਵਾਬ <xliff:g id="REPLY">%1$s</xliff:g> ਕਿੱਥੇ ਹੈ"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"ਜਿੱਥੇ ਜਵਾਬ <xliff:g id="REPLY">%1$s</xliff:g> ਹੈ"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"ਕੋਈ ਵੀ ਕੈਲੰਡਰ"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"ਜਵਾਬ ਕਿੱਥੇ ਹੈ"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"ਜਿੱਥੇ ਜਵਾਬ ਇਹ ਹੈ"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"ਹਾਂ, ਸ਼ਾਇਦ, ਜਾਂ ਜਵਾਬ ਨਹੀਂ ਦਿੱਤਾ ਗਿਆ"</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"ਹਾਂ ਜਾਂ ਸ਼ਾਇਦ"</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"ਹਾਂ"</string>
@@ -2904,8 +2992,8 @@
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"ਦਿਨ"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"ਰੋਜ਼ਾਨਾ"</string>
-    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"ਅਲਾਰਮ ਸਮਾਪਤੀ ਸਮੇਂ ਨੂੰ ਓਵਰਰਾਈਡ ਕਰ ਸਕਦਾ ਹੈ"</string>
-    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"ਸਮਾਪਤੀ ਸਮਾਂ ਜਾਂ ਅਗਲਾ ਅਲਾਰਮ ਜੋ ਵੀ ਪਹਿਲੇ ਆਵੇ, ਉਸ \'ਤੇ ਰੁਕ ਜਾਓ"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"ਅਲਾਰਮ ਸਮਾਪਤੀ ਦੇ ਸਮੇਂ ਨੂੰ ਓਵਰਰਾਈਡ ਕਰ ਸਕਦਾ ਹੈ"</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"ਸਮਾਪਤੀ ਦਾ ਸਮਾਂ ਜਾਂ ਅਗਲਾ ਅਲਾਰਮ ਜੋ ਵੀ ਪਹਿਲੇ ਆਵੇ, ਉਸ \'ਤੇ ਰੁਕ ਜਾਓ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ਤੋਂ <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -2915,35 +3003,36 @@
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"ਚੁਣੇ ਗਏ ਸੁਨੇਹੇ"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ਕਿਸੇ ਵੀ ਵਿਅਕਤੀ ਤੋਂ"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ਸਿਰਫ਼ ਸੰਪਰਕਾਂ ਤੋਂ"</string>
-    <string name="zen_mode_from_starred" msgid="2678345811950997027">"ਸਿਰਫ਼ ਸਿਤਾਰੇ ਵਾਲੇ ਸੰਪਰਕਾਂ ਤੋਂ"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"ਸਿਰਫ਼ ਤਾਰਾਬੱਧ ਸੰਪਰਕਾਂ ਤੋਂ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ਅਲਾਰਮ"</string>
-    <string name="zen_mode_reminders" msgid="5458502056440485730">"ਯਾਦ-ਦਹਾਨੀਆਂ"</string>
-    <string name="zen_mode_events" msgid="7914446030988618264">"ਵਰਤਾਰੇ"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"ਅਲਾਰਮ ਸਦਾ ਤਰਜੀਹ ਰੱਖਦੇ ਹਨ ਅਤੇ ਧੁਨੀ ਵਜਾਉਂਦੇ ਹਨ"</string>
+    <string name="zen_mode_reminders" msgid="5458502056440485730">"ਯਾਦ-ਸੂਚਨਾਵਾਂ"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"ਇਵੈਂਟ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ਸਾਰੇ ਕਾਲਰ"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ਚੁਣੇ ਗਏ ਕਾਲਰ"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ਦੁਬਾਰਾ ਕਾਲ ਕਰਨ ਵਾਲੇ"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ਜੇਕਰ ਉਹੀ ਵਿਅਕਤੀ ਇੱਕ <xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟ ਦੀ ਮਿਆਦ ਦੇ ਅੰਦਰ ਦੂਜੀ ਵਾਰ ਕਾਲ ਕਰਦਾ ਹੈ, ਤਾਂ ਇਸਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ਜੇਕਰ ਇੱਕੋ ਵਿਅਕਤੀ <xliff:g id="MINUTES">%d</xliff:g> ਮਿੰਟ ਦੇ ਅੰਦਰ ਦੂਜੀ ਵਾਰ ਕਾਲ ਕਰਦਾ ਹੈ, ਤਾਂ ਉਸਨੂੰ ਆਗਿਆ ਦਿਓ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ਆਟੋਮੈਟਿਕਲੀ ਚਾਲੂ ਕਰੋ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ਹਰੇਕ ਰਾਤ ਨੂੰ"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"ਵੀਕਨਾਈਟਸ"</string>
-    <string name="zen_mode_start_time" msgid="8102602297273744441">"ਸ਼ੁਰੂਆਤੀ ਸਮਾਂ"</string>
-    <string name="zen_mode_end_time" msgid="8774327885892705505">"ਸਮਾਪਤੀ ਸਮਾਂ"</string>
+    <string name="zen_mode_start_time" msgid="8102602297273744441">"ਸ਼ੁਰੂੂਆਤ ਦਾ ਸਮਾਂ"</string>
+    <string name="zen_mode_end_time" msgid="8774327885892705505">"ਸਮਾਪਤੀ ਦਾ ਸਮਾਂ"</string>
     <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ਅਗਲੇ ਦਿਨ"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲਾਵ ਕੇਵਲ ਅਨਿਸ਼ਚਿਤ ਤੌਰ ਤੇ"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
-      <item quantity="one">ਅਲਾਰਮਾਂ ਵਿੱਚ ਕੇਵਲ <xliff:g id="DURATION">%1$d</xliff:g> ਮਿੰਟਾਂ ਲਈ ਬਦਲਾਵ (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ)</item>
-      <item quantity="other">ਅਲਾਰਮਾਂ ਵਿੱਚ ਕੇਵਲ <xliff:g id="DURATION">%1$d</xliff:g> ਮਿੰਟਾਂ ਲਈ ਬਦਲਾਵ (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ)</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ <xliff:g id="DURATION">%1$d</xliff:g> ਮਿੰਟਾਂ ਲਈ ਸਿਰਫ਼ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ <xliff:g id="DURATION">%1$d</xliff:g> ਮਿੰਟਾਂ ਲਈ ਸਿਰਫ਼ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ</item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="2407703455581767748">
-      <item quantity="one">ਅਲਾਰਮਾਂ ਵਿੱਚ ਕੇਵਲ <xliff:g id="DURATION">%1$d</xliff:g> ਘੰਟਿਆਂ ਲਈ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ ਬਦਲਾਵ</item>
-      <item quantity="other">ਅਲਾਰਮਾਂ ਵਿੱਚ ਕੇਵਲ<xliff:g id="DURATION">%1$d</xliff:g> ਘੰਟਿਆਂ ਲਈ <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ ਬਦਲਾਵ</item>
+      <item quantity="one"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ <xliff:g id="DURATION">%1$d</xliff:g> ਘੰਟਿਆਂ ਲਈ ਸਿਰਫ਼ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ</item>
+      <item quantity="other"><xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> ਤੱਕ <xliff:g id="DURATION">%1$d</xliff:g> ਘੰਟਿਆਂ ਲਈ ਸਿਰਫ਼ ਅਲਾਰਮਾਂ ਵਿੱਚ ਬਦਲੋ</item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"ਅਲਾਰਮ ਨੂੰ ਸਿਰਫ਼ <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ਤੱਕ ਬਦਲੋ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ਹਮੇਸ਼ਾਂ ਵਿਘਨ ਪਾਓ ਵਿੱਚ ਬਦਲੋ"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"ਸਕ੍ਰੀਨ ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ ਬਲਾਕ ਕਰੋ"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਦੁਆਰਾ ਖਾਮੋਸ਼ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਕ੍ਰੀਨ \'ਤੇ ਝਲਕਣ ਜਾਂ ਦਿਖਾਈ ਦੇਣ ਤੋਂ ਰੋਕੋ"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਦੁਆਰਾ ਸ਼ਾਂਤ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਕ੍ਰੀਨ \'ਤੇ ਝਲਕਣ ਜਾਂ ਦਿਖਾਈ ਦੇਣ ਤੋਂ ਰੋਕੋ"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"ਸਕ੍ਰੀਨ ਦੇ ਬੰਦ ਹੋਣ \'ਤੇ ਬਲਾਕ ਕਰੋ"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਦੁਆਰਾ ਖਾਮੋਸ਼ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਕ੍ਰੀਨ ਨੂੰ ਚਾਲੂ ਕਰਨ ਜਾਂ ਸੂਚਨਾ ਬੱਤੀ ਨੂੰ ਜਗਮਗਾਉਣ ਤੋਂ ਰੋਕੋ"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਦੁਆਰਾ ਚੁੱਪ ਕਰਵਾਈਆਂ ਗਈਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਕ੍ਰੀਨ ਨੂੰ ਚਾਲੂ ਕਰਨ ਤੋਂ ਰੋਕੋ"</string>
@@ -2957,27 +3046,22 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ਚਾਲੂ"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ਬੰਦ"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"ਜਦੋਂ ਇਹ ਸੈਟਿੰਗ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਤਦ ਤੱਕ ਵਰਤਮਾਨ ਸਕ੍ਰੀਨ ਨੂੰ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰੱਖਣ ਲਈ ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸ ਨੂੰ ਅਨਪਿੰਨ ਨਹੀਂ ਕਰਦੇ।\n\nਸਕ੍ਰੀਨ ਪਿਨਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ:\n\n1. ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ ਚਾਲੂ ਕੀਤੀ ਹੋਵੇ।\n\n2. ਉਸ ਸਕ੍ਰੀਨ ਨੂੰ ਖੋਲ੍ਹੋ ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਪਿੰਨ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।\n\n3. ਰੂਪ-ਰੇਖਾ \'ਤੇ ਟੈਪ ਕਰੋ।\n\n4. ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ ਅਤੇ ਫਿਰ ਪਿੰਨ ਚਿੰਨ੍ਹ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
-    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਅਨਲੌਕ ਪੈਟਰਨ ਵਾਸਤੇ ਪੁੱਛੋ"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"ਜਦੋਂ ਇਹ ਸੈਟਿੰਗ ਚਾਲੂ ਹੋਵੇ, ਤਾਂ ਤੁਸੀਂ ਤਦ ਤੱਕ ਵਰਤਮਾਨ ਸਕ੍ਰੀਨ ਨੂੰ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰੱਖਣ ਲਈ ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸ ਨੂੰ ਅਨਪਿੰਨ ਨਹੀਂ ਕਰਦੇ।\n\nਸਕ੍ਰੀਨ ਪਿਨਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰਨ \n\n1. ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ ਚਾਲੂ ਕੀਤੀ ਹੋਵੇ।\n\n2. ਉਸ ਸਕ੍ਰੀਨ ਨੂੰ ਖੋਲ੍ਹੋ ਜਿਸ ਨੂੰ ਤੁਸੀਂ ਪਿੰਨ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।\n\n3. ਰੂਪ-ਰੇਖਾ \'ਤੇ ਟੈਪ ਕਰੋ।\n\n4. ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ ਅਤੇ ਫਿਰ ਪਿੰਨ ਪ੍ਰਤੀਕ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ਅਨਪਿੰਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਅਣਲਾਕ ਪੈਟਰਨ ਵਾਸਤੇ ਪੁੱਛੋ"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ਅਨਪਿੰਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਿੰਨ ਮੰਗੋ"</string>
-    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਮੰਗੋ"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ਅਨਪਿੰਨ ਕਰਨ ਵੇਲੇ ਡੀਵਾਈਸ ਲੌਕ ਕਰੋ"</string>
-    <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ਇਹ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਇਸ ਵੱਲੋਂ ਵਿਵਸਥਿਤ ਕੀਤੀ ਗਈ ਹੈ:"</string>
+    <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ਅਨਪਿੰਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਮੰਗੋ"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ਅਨਪਿੰਨ ਕਰਨ ਵੇਲੇ ਡੀਵਾਈਸ ਲਾਕ ਕਰੋ"</string>
+    <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>
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
     <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_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="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>
@@ -2985,8 +3069,8 @@
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ਕੀ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ?"</string>
     <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਿੰਨ ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪੈਟਰਨ ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
-    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਾਸਵਰਡ ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
-    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ਨੋਟ ਕਰੋ: ਰੀਬੂਟ ਤੋਂ ਬਾਅਦ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਅਨਲੌਕ ਨਹੀਂ ਕਰਦੇ ਤਦ ਤੱਕ ਇਹ ਐਪ ਚਾਲੂ ਨਹੀਂ ਹੋ ਸਕਦੀ"</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
+    <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ਨੋਟ ਕਰੋ: ਰੀਬੂਟ ਤੋਂ ਬਾਅਦ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਨਹੀਂ ਕਰਦੇ ਤਦ ਤੱਕ ਇਹ ਐਪ ਚਾਲੂ ਨਹੀਂ ਹੋ ਸਕਦੀ"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI ਜਾਣਕਾਰੀ"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ਸੰਬੰਧਿਤ ਜਾਣਕਾਰੀ"</string>
     <string name="slot_number" msgid="3762676044904653577">"(ਸਲੌਟ<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3009,8 +3093,8 @@
     <string name="notifications_disabled" msgid="334416731283131597">"ਸਭ ਕੁਝ ਬੰਦ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="COUNT_0">%1$d</xliff:g> ਸ਼੍ਰੇਣੀਆਂ ਬੰਦ ਹਨ"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"ਚੁੱਪ ਕਰਵਾਈਆਂ ਗਈਆਂ"</string>
-    <string name="notifications_redacted" msgid="4493588975742803160">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਨਹੀਂ"</string>
-    <string name="notifications_hidden" msgid="3619610536038757468">"ਲੌਕ ਸਕ੍ਰੀਨ \'ਤੇ ਨਹੀਂ"</string>
+    <string name="notifications_redacted" msgid="4493588975742803160">" ਲਾਕ  ਸਕ੍ਰੀਨ \'ਤੇ ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ ਨਹੀਂ"</string>
+    <string name="notifications_hidden" msgid="3619610536038757468">" ਲਾਕ  ਸਕ੍ਰੀਨ \'ਤੇ ਨਹੀਂ"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਓਵਰਰਾਈਡ ਕੀਤਾ ਗਿਆ"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
     <string name="notification_summary_level" msgid="2726571692704140826">"ਪੱਧਰ %d"</string>
@@ -3040,13 +3124,13 @@
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"ਸ਼੍ਰੇਣੀਆਂ: ਘੱਟ ਮਹੱਤਵ"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ਸ਼੍ਰੇਣੀਆਂ: ਬੰਦ ਹਨ"</string>
     <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"ਸ਼੍ਰੇਣੀਆਂ: \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਓਵਰਰਾਈਡ ਕਰਦੀਆਂ ਹਨ"</string>
-    <string name="advanced_apps" msgid="4812975097124803873">"ਉੱਨਤ"</string>
-    <string name="configure_apps" msgid="6685680790825882528">"ਐਪਸ ਕੌਂਫਿਗਰ ਕਰੋ"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"ਵਿਕਸਿਤ"</string>
+    <string name="configure_apps" msgid="6685680790825882528">"ਐਪਾਂ ਦੀ ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ਅਗਿਆਤ ਐਪ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ਐਪ ਇਜਾਜ਼ਤਾਂ"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀਆਂ ਐਪਾਂ"</string>
-    <string name="tap_to_wake" msgid="7211944147196888807">"ਜਗਾਉਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"ਡੀਵਾਈਸ ਨੂੰ ਜਗਾਉਣ ਲਈ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿੱਥੇ ਵੀ ਦੋਹਰਾ ਟੈਪ ਕਰੋ"</string>
+    <string name="tap_to_wake" msgid="7211944147196888807">"ਕਿਰਿਆਸ਼ੀਲ ਲਈ ਟੈਪ ਕਰੋ"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਲਈ ਸਕ੍ਰੀਨ \'ਤੇ ਕਿੱਥੇ ਵੀ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"ਖੁੱਲ੍ਹਣ ਵਾਲੇ ਲਿੰਕ"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"ਸਮਰਥਿਤ ਲਿੰਕਾਂ ਨੂੰ ਨਾ ਖੋਲ੍ਹੋ"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> ਨੂੰ ਖੋਲ੍ਹੋ"</string>
@@ -3062,7 +3146,7 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"ਪਛਾਣ ਨਹੀਂ ਹੋਈ"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="default_for_work" msgid="9152194239366247932">"ਕੰਮ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"ਸਹਾਇਤਾ ਅਤੇ ਵੌਇਸ ਇਨਪੁਟ"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"ਸਹਾਇਕ ਅਤੇ ਅਵਾਜ਼ੀ ਇਨਪੁੱਟ"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"ਸਹਾਇਕ ਐਪ"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"ਕੀ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> ਨੂੰ ਆਪਣਾ ਸਹਾਇਕ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ਸਹਾਇਕ ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਮੌਜੂਦ ਵਰਤੋਂ ਵਿੱਚ ਹੋਣ ਵਾਲੇ ਐਪਸ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪੜ੍ਹਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗਾ, ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਤੇ ਦ੍ਰਿਸ਼ਮਾਨ ਜਾਂ ਐਪਸ ਵਿੱਚ ਪਹੁੰਚਯੋਗ ਜਾਣਕਾਰੀ ਸਮੇਤ।"</string>
@@ -3075,11 +3159,11 @@
     <string name="default_app" msgid="6864503001385843060">"(ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</string>
     <string name="system_app" msgid="9068313769550747372">"(ਸਿਸਟਮ)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(ਸਿਸਟਮ ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"ਐਪਾਂ ਸਟੋਰੇਜ"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ਐਪਾਂ ਦੀ ਸਟੋਰੇਜ"</string>
     <string name="usage_access" msgid="5479504953931038165">"ਉਪਯੋਗ ਪਹੁੰਚ"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"ਪਰਮਿਟ ਉਪਭੋਗਤਾ ਐਕਸੈਸ"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"ਪਰਮਿਟ ਵਰਤੋਂਕਾਰ ਪਹੁੰਚ"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"ਐਪ ਉਪਯੋਗਤਾ ਪਸੰਦ"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"ਉਪਯੋਗਤਾ ਐਕਸੈਸ ਤੁਸੀਂ ਕਿਹੜੀਆਂ ਐਪਸ ਦਾ ਉਪਯੋਗ ਕਰ ਰਹੇ ਹੋ ਅਤੇ ਕਿੰਨੀ ਵਾਰੀ, ਇਸਦੇ ਨਾਲ-ਨਾਲ ਆਪਣੇ ਕੈਰੀਅਰ, ਭਾਸ਼ਾ ਸੈੱਟਿੰਗਜ਼, ਅਤੇ ਹੋਰ ਵੇਰਵੇ ਨੂੰ ਟ੍ਰੈਕ ਕਰਨ ਲਈ ਕਿਸੇ ਐਪ ਨੂੰ ਅਨੁਮਤੀ ਦਿੰਦਾ ਹੈ।"</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"ਵਰਤੋਂ ਪਹੁੰਚ ਤੁਸੀਂ ਕਿਹੜੀਆਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੇ ਹੋ ਅਤੇ ਕਿੰਨੀ ਵਾਰੀ, ਇਸਦੇ ਨਾਲ-ਨਾਲ ਆਪਣੇ ਕੈਰੀਅਰ, ਭਾਸ਼ਾ ਸੈਟਿੰਗਾਂ, ਅਤੇ ਹੋਰ ਵੇਰਵੇ ਨੂੰ ਟਰੈਕ ਕਰਨ ਲਈ ਕਿਸੇ ਐਪ ਨੂੰ ਆਗਿਆ ਦਿੰਦਾ ਹੈ।"</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"ਮੈਮਰੀ"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"ਮੈਮਰੀ ਵੇਰਵੇ"</string>
     <string name="always_running" msgid="6042448320077429656">"ਹਮੇਸ਼ਾਂ ਚੱਲਦਾ ਹੈ (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3095,6 +3179,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>
@@ -3119,15 +3212,15 @@
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"ਕੇਵਲ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰੋ"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"ਪਾਵਰ ਸਪਲਾਈ ਕਰੋ"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰੋ। ਸਿਰਫ਼ USB ਚਾਰਜਿੰਗ ਦਾ ਸਮਰਥਨ ਕਰਨ ਵਾਲੇ ਡੀਵਾਈਸਾਂ \'ਤੇ ਕੰਮ ਕਰਦਾ ਹੈ।"</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ਫ਼ਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰੋ"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"ਫ਼ਾਈਲਾਂ ਦਾ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ \'ਤੇ ਤਬਾਦਲਾ ਕਰੋ"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ਫ਼ੋਟੋਆਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ (PTP)"</string>
-    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ਫ਼ੋਟੋਆਂ ਜਾਂ ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰੋ ਜੇਕਰ MTP ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ਫ਼ੋਟੋਆਂ ਟ੍ਰਾਂਸਫਰ ਕਰੋ (PTP)"</string>
+    <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"ਫ਼ੋਟੋਆਂ ਜਾਂ ਫ਼ਾਈਲਾਂ ਟ੍ਰਾਂਸਫਰ ਕਰੋ ਜੇਕਰ MTP ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ MIDI ਵਜੋਂ ਕਰੋ"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ਇਸ ਡੀਵਾਈਸ ਦੀ MIDI ਵਜੋਂ ਵਰਤੋਂ ਕਰੋ"</string>
-    <string name="usb_use" msgid="3256040963685055320">"ਇਹਨਾਂ ਲਈ USB ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="usb_use" msgid="3256040963685055320">"ਇਸ ਲਈ USB ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰ ਰਹੀ ਹੈ"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"ਪਾਵਰ ਸਪਲਾਈ ਕਰਨ ਲਈ"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰਨ ਲਈ"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ਫ਼ੋਟੋਆਂ ਦਾ ਤਬਾਦਲਾ ਕਰਨ ਲਈ (PTP)"</string>
@@ -3136,11 +3229,11 @@
     <string name="background_check_title" msgid="4534254315824525593">"ਪੂਰੀ ਬੈਕਗ੍ਰਾਊਂਡ ਪਹੁੰਚ"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"ਸਕ੍ਰੀਨ ਤੋਂ ਲਿਖਤ ਵਰਤੋ"</string>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"ਸਹਾਇਕ ਐਪ ਨੂੰ ਲਿਖਤ ਵਜੋਂ ਸਕ੍ਰੀਨ ਸਮੱਗਰੀ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"ਸਕ੍ਰੀਨਸ਼ੌਟ ਵਰਤੋ"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਵਰਤੋ"</string>
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"ਸਹਾਇਕ ਐਪ ਨੂੰ ਸਕ੍ਰੀਨ ਦੇ ਇੱਕ ਚਿੱਤਰ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"ਸਕ੍ਰੀਨ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"ਸਹਾਇਕ ਐਪ ਵੱਲੋਂ ਸਕ੍ਰੀਨ ਜਾਂ ਸਕ੍ਰੀਨਸ਼ਾਟ ਤੋਂ ਲਿਖਤ \'ਤੇ ਪਹੁੰਚ ਕਰਨ \'ਤੇ ਸਕ੍ਰੀਨ ਦੇ ਕਿਨਾਰਿਆਂ ਨੂੰ ਫਲੈਸ਼ ਕਰੋ"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"ਸਹਾਇਕ ਐਪ ਤੁਹਾਡੇ ਵੱਲੋਂ ਦੇਖੀ ਜਾ ਰਹੀ ਸਕ੍ਰੀਨ ਤੋਂ ਪ੍ਰਾਪਤ ਜਾਣਕਾਰੀ ਦੇ ਆਧਾਰ ਤੇ ਤੁਹਾਡੀ ਸਹਾਇਤਾ ਕਰ ਸਕਦਾ ਹੈ। ਕੁਝ ਐਪਸ ਤੁਹਾਨੂੰ ਏਕੀਕ੍ਰਿਤ ਸਹਾਇਤਾ ਦੇਣ ਲਈ ਲੌਂਚਰ ਅਤੇ ਵੌਇਸ ਇਨਪੁਟ ਸੇਵਾਵਾਂ ਦੋਵਾਂ ਦਾ ਸਮਰਥਨ ਕਰਦੇ ਹਨ।"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"ਸਹਾਇਕ ਐਪਾਂ ਤੁਹਾਡੇ ਵੱਲੋਂ ਦੇਖੀ ਜਾ ਰਹੀ ਸਕ੍ਰੀਨ ਤੋਂ ਪ੍ਰਾਪਤ ਜਾਣਕਾਰੀ ਦੇ ਆਧਾਰ ਤੇ ਤੁਹਾਡੀ ਮਦਦ ਕਰ ਸਕਦੀਆਂ ਹਨ। ਕੁਝ ਐਪਾਂ ਤੁਹਾਨੂੰ ਏਕੀਕ੍ਰਿਤ ਸਹਾਇਤਾ ਦੇਣ ਲਈ ਲਾਂਚਰ ਅਤੇ ਵੌਇਸ ਇਨਪੁੱਟ ਸੇਵਾਵਾਂ ਦੋਵਾਂ ਦਾ ਸਮਰਥਨ ਕਰਦੇ ਹਨ।"</string>
     <string name="average_memory_use" msgid="829566450150198512">"ਔਸਤ ਮੈਮਰੀ ਵਰਤੋਂ"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"ਅਧਿਕਤਮ ਮੈਮਰੀ ਵਰਤੋਂ"</string>
     <string name="memory_usage" msgid="1781358557214390033">"ਮੈਮਰੀ ਉਪਯੋਗਤਾ"</string>
@@ -3161,7 +3254,7 @@
     </plurals>
     <string name="running_frequency" msgid="6622624669948277693">"ਬਾਰੰਬਾਰਤਾ"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"ਅਧਿਕਤਮ ਵਰਤੋਂ"</string>
-    <string name="no_data_usage" msgid="9131454024293628063">"ਕੋਈ ਡੈਟਾ ਨਹੀਂ ਵਰਤਿਆ"</string>
+    <string name="no_data_usage" msgid="9131454024293628063">"ਕੋਈ  ਡਾਟਾ  ਨਹੀਂ ਵਰਤਿਆ"</string>
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"ਕੀ <xliff:g id="APP">%1$s</xliff:g> ਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"ਐਪ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਨੂੰ ਚਾਲੂ/ਬੰਦ ਕਰਨ ਅਤੇ ਸੰਬੰਧਿਤ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲਾਵ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗਾ।"</string>
     <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"ਸੂਚਨਾ ਪਹੁੰਚ ਦੇ ਚਾਲੂ ਹੋਣ ਕਾਰਨ ਇਸ ਦਾ ਚਾਲੂ ਰਹਿਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
@@ -3173,7 +3266,7 @@
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"ਬਿਹਤਰ ਬੈਟਰੀ ਸਮਰੱਥਾ ਲਈ ਸਿਫ਼ਾਰਿਸ਼ ਕੀਤਾ"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"ਕੀ <xliff:g id="APP">%s</xliff:g> ਨੂੰ ਬੈਟਰੀ ਅਨੁਕੂਲਤਾ ਦੀ ਉਪੇਖਿਆ ਕਰਨ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"ਕੋਈ ਨਹੀਂ"</string>
-    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"ਇਸ ਐਪ ਲਈ ਵਰਤੋਂ ਸਬੰਧੀ ਪਹੁੰਚ ਨੂੰ ਬੰਦ ਕਰਨਾ ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿਚਲੀਆਂ ਐਪਾਂ ਲਈ ਡੈਟਾ ਵਰਤੋਂ ਟਰੈਕ ਕਰਨ ਤੋਂ ਨਹੀਂ ਰੋਕ ਸਕਦਾ।"</string>
+    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"ਇਸ ਐਪ ਲਈ ਵਰਤੋਂ ਸਬੰਧੀ ਪਹੁੰਚ ਨੂੰ ਬੰਦ ਕਰਨਾ ਤੁਹਾਡੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਤੁਹਾਡੇ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿਚਲੀਆਂ ਐਪਾਂ ਲਈ ਡਾਟਾ ਵਰਤੋਂ ਟਰੈਕ ਕਰਨ ਤੋਂ ਨਹੀਂ ਰੋਕ ਸਕਦਾ।"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="COUNT_0">%1$d</xliff:g> ਅੱਖਰ ਵਰਤੇ ਗਏ"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
@@ -3181,37 +3274,37 @@
     <string name="system_alert_window_access_title" msgid="6297115362542361241">"ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"ਦੂਜੀਆਂ ਐਪਾਂ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋਣ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"ਉੱਪਰ ਐਪ ਡਿਸਪਲੇ ਲਈ ਇਜਾਜ਼ਤ"</string>
-    <string name="allow_overlay_description" msgid="8961670023925421358">"ਇਸ ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹੋਰ ਐਪਾਂ \'ਤੇ ਦਿਖਾਈ ਦੇਣ ਦਿਓ। ਇਹ ਤੁਹਾਡੇ ਦੁਆਰਾ ਉਹਨਾਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਵਿੱਚ ਦਖ਼ਲ ਦੇ ਸਕਦੀ ਹੈ ਜਾਂ ਉਹਨਾਂ ਦੇ ਦਿਖਾਈ ਦੇਣ ਜਾਂ ਕੰਮ ਕਰਨ ਦੇ ਤਰੀਕੇ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string>
+    <string name="allow_overlay_description" msgid="8961670023925421358">"ਇਸ ਐਪ ਨੂੰ ਤੁਹਾਡੇ ਵੱਲੋਂ ਵਰਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹੋਰ ਐਪਾਂ \'ਤੇ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਨ ਦਿਓ। ਇਹ ਤੁਹਾਡੇ ਦੁਆਰਾ ਉਹਨਾਂ ਐਪਾਂ ਦੀ ਵਰਤੋਂ ਵਿੱਚ ਦਖ਼ਲ ਦੇ ਸਕਦੀ ਹੈ ਜਾਂ ਉਹਨਾਂ ਦੇ ਦਿਖਾਈ ਦੇਣ ਜਾਂ ਕੰਮ ਕਰਨ ਦੇ ਤਰੀਕੇ ਨੂੰ ਬਦਲ ਸਕਦੀ ਹੈ।"</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"VR ਆਭਾਸੀ ਵਾਸਤਵਿਕਤਾ ਸਰੋਤਾ ਸਟੀਰੀਓ ਸਹਾਇਕ ਸੇਵਾ"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"ਸਿਸਟਮ ਚਿਤਾਵਨੀ ਵਿੰਡੋ ਡਾਇਲੌਗ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
     <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="keywords_install_other_apps" msgid="761078076051006558">"ਅਗਿਆਤ ਸਰੋਤ ਐਪਾਂ ਸਥਾਪਿਤ ਕਰੋ"</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>
+    <string name="keywords_write_settings" msgid="6415597272561105138">"ਸੰਸ਼ੋਧਿਤ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਲਿਖੋ"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_1">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="COUNT_0">%1$d</xliff:g> ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੱਤੀ"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"ਹੋਰ ਐਪਾਂ ਸਥਾਪਤ ਕਰ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="write_settings_title" msgid="4232152481902542284">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="write_system_settings" msgid="3482913590601096763">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰੋ"</string>
-    <string name="write_settings_preference" msgid="3407383041273067448">"ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਅਨੁਮਤੀ"</string>
+    <string name="write_settings_preference" msgid="3407383041273067448">"ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
-    <string name="write_settings_description" msgid="6868293938839954623">"ਇਹ ਅਨੁਮਤੀ ਇੱਕ ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string>
+    <string name="write_settings_description" msgid="6868293938839954623">"ਇਹ ਇਜਾਜ਼ਤ ਇੱਕ ਐਪ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰਨ ਲਈ ਆਗਿਆ ਦਿੰਦੀ ਹੈ।"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"ਹਾਂ"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"ਨਹੀਂ"</string>
     <string name="external_source_switch_title" msgid="3621381992793251070">"ਇਸ ਸਰੋਤ ਤੋਂ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"ਕੈਮਰੇ ਲਈ ਦੋ ਵਾਰ ਮੋੜੋ"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"ਆਪਣੇ ਗੁੱਟ ਨੂੰ ਦੋ ਵਾਰ ਮੋੜਕੇ ਕੈਮਰਾ ਐਪ ਖੋਲ੍ਹੋ"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ਕੈਮਰੇ ਲਈ ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰੀ ਦਬਾਓ"</string>
-    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਅਨਲੌਕ ਕੀਤੇ ਬਗੈਰ ਤੁਰੰਤ ਕੈਮਰਾ ਖੋਲ੍ਹੋ"</string>
+    <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ਆਪਣੀ ਸਕ੍ਰੀਨ ਨੂੰ ਅਣਲਾਕ ਕੀਤੇ ਬਗੈਰ ਤੁਰੰਤ ਕੈਮਰਾ ਖੋਲ੍ਹੋ"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"ਡਿਸਪਲੇ ਆਕਾਰ"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"ਸਕ੍ਰੀਨ \'ਤੇ ਪਈਆਂ ਆਈਟਮਾਂ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ"</string>
-    <string name="screen_zoom_keywords" msgid="9176477565403352552">"ਡਿਸਪਲੇ ਘਣਤਾ, ਸਕਰੀਨ ਜ਼ੂਮ, ਪੈਮਾਨਾ, ਸਕੇਲਿੰਗ"</string>
+    <string name="screen_zoom_keywords" msgid="9176477565403352552">"ਡਿਸਪਲੇ ਘਣਤਾ, ਸਕ੍ਰੀਨ ਜ਼ੂਮ, ਪੈਮਾਨਾ, ਸਕੇਲਿੰਗ"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਪਈਆਂ ਆਈਟਮਾਂ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ। ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਪਈਆਂ ਕੁਝ ਐਪਾਂ ਦੀ ਸਥਿਤੀ ਬਦਲ ਸਕਦੀ ਹੈ।"</string>
-    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"ਝਲਕ"</string>
+    <string name="screen_zoom_preview_title" msgid="4680671508172336572">"ਪੂਰਵ-ਝਲਕ"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"ਛੋਟਾ ਕਰੋ"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"ਵੱਡਾ ਕਰੋ"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
@@ -3225,7 +3318,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"ਮੰਗਲ 6:02PM"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"ਮੰਗਲ 6:03PM"</string>
     <string name="disconnected" msgid="4836600637485526329">"ਕਨੈਕਟ ਨਹੀਂ ਹੈ"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ਡੈਟਾ ਵਰਤਿਆ ਗਿਆ"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ਡਾਟਾ ਵਰਤਿਆ ਗਿਆ"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਐਪ ਲਈ ਬੰਦ</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਐਪਾਂ ਲਈ ਬੰਦ</item>
@@ -3244,12 +3337,12 @@
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਪੂਰਵ-ਨਿਰਧਾਰਤ ਹੈ"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"ਚਾਲੂ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"ਬੰਦ"</string>
-    <string name="backup_disabled" msgid="485189128759595412">"ਬੈਕ ਅੱਪ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
+    <string name="backup_disabled" msgid="485189128759595412">"ਬੈਕ ਅੱਪ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
     <string name="about_summary" msgid="924181828102801010">"ਅੱਪਡੇਟ ਕਰਕੇ Android <xliff:g id="VERSION">%1$s</xliff:g> ਕੀਤਾ ਗਿਆ"</string>
-    <string name="disabled_by_policy_title" msgid="627023216027648534">"ਕਾਰਵਾਈ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ"</string>
+    <string name="disabled_by_policy_title" msgid="627023216027648534">"ਕਾਰਵਾਈ ਦੀ ਆਗਿਆ ਨਹੀਂ"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"ਤੁਸੀਂ ਵੌਲਿਊਮ ਨੂੰ ਬਦਲ ਨਹੀਂ ਸਕਦੇ"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"ਕਾਲ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
-    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
+    <string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ"</string>
     <string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="default_admin_support_msg" msgid="2853684309779513863">"ਇਹ ਕਾਰਵਾਈ ਅਯੋਗ ਹੈ। ਹੋਰ ਜਾਣਨ ਲਈ, ਆਪਣੀ ਸੰਸਥਾ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
@@ -3259,25 +3352,34 @@
     <string name="admin_device_owner_message" msgid="6232893638259790789">"ਤੁਹਾਡਾ ਪ੍ਰਸ਼ਾਸਕ ਸੈਟਿੰਗਾਂ, ਇਜਾਜ਼ਤਾਂ, ਕਾਰਪੋਰੇਟ ਪਹੁੰਚ, ਨੈੱਟਵਰਕ ਸਰਗਰਮੀ, ਅਤੇ ਡੀਵਾਈਸ ਦੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ ਸਮੇਤ ਇਸ ਡੀਵਾਈਸ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ ਅਤੇ ਡਾਟੇ ਦੀ ਨਿਗਰਾਨੀ ਅਤੇ ਪ੍ਰਬੰਧਨ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"ਬੰਦ ਕਰੋ"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"ਚਾਲੂ ਕਰੋ"</string>
-    <string name="condition_expand_show" msgid="608202020023489939">"ਵਿਖਾਓ"</string>
+    <string name="condition_expand_show" msgid="608202020023489939">" ਦਿਖਾਓ"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"ਲੁਕਾਓ"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"ਹੌਟਸਪੌਟ ਚਾਲੂ ਹੈ"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"ਪੋਰਟੇਬਲ ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ <xliff:g id="ID_1">%1$s</xliff:g> ਸਰਗਰਮ ਹੈ, ਇਸ ਡੀਵਾਈਸ ਲਈ ਵਾਈ-ਫਾਈ ਬੰਦ ਹੈ।"</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"ਜਹਾਜ਼ ਮੋਡ ਚਾਲੂ ਹੈ"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, ਬਲੂਟੁੱਥ, ਅਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਬੰਦ ਹਨ। ਤੁਸੀਂ ਫ਼ੋਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਜਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੋ ਸਕਦੇ।"</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"ਵਾਈ-ਫਾਈ, ਬਲੂਟੁੱਥ, ਅਤੇ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਬੰਦ ਹਨ। ਤੁਸੀਂ ਫ਼ੋਨ ਕਾਲਾਂ ਨਹੀਂ ਕਰ ਸਕਦੇ ਜਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੋ ਸਕਦੇ।"</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੈ (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"ਬੈਟਰੀ ਸੇਵਰ ਚਾਲੂ ਹੈ"</string>
-    <string name="condition_battery_summary" msgid="4418839236027977450">"ਕਾਰਗੁਜ਼ਾਰੀ ਘਟਾਈ ਗਈ ਹੈ। ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਅਤੇ ਪਿਛੋਕੜ ਡੈਟਾ ਬੰਦ ਹਨ।"</string>
-    <string name="condition_cellular_title" msgid="1327317003797575735">"ਮੋਬਾਈਲ ਡੈਟਾ ਬੰਦ ਹੈ"</string>
-    <string name="condition_cellular_summary" msgid="1818046558419658463">"ਇੰਟਰਨੈੱਟ ਸਿਰਫ਼ Wi-Fi ਰਾਹੀਂ ਹੀ ਉਪਲਬਧ ਹੈ"</string>
+    <string name="condition_battery_summary" msgid="4418839236027977450">"ਕਾਰਗੁਜ਼ਾਰੀ ਘਟਾਈ ਗਈ ਹੈ। ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਅਤੇ ਪਿਛੋਕੜ ਡਾਟਾ ਬੰਦ ਹਨ।"</string>
+    <string name="condition_cellular_title" msgid="1327317003797575735">"ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਹੈ"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"ਇੰਟਰਨੈੱਟ ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ ਰਾਹੀਂ ਹੀ ਉਪਲਬਧ ਹੈ"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"ਡਾਟਾ ਸੇਵਰ ਚਾਲੂ ਹੈ"</string>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"ਪਿਛੋਕੜ ਡੈਟਾ ਸਿਰਫ਼ Wi-Fi ਰਾਹੀਂ ਉਪਲਬਧ ਹੈ। Wi-Fi ਉਪਲਬਧ ਨਾ ਹੋਣ \'ਤੇ ਇਹ ਕੁਝ ਐਪਾਂ ਜਾਂ ਸੇਵਾਵਾਂ \'ਤੇ ਅਸਰ ਪਾ ਸਕਦਾ ਹੈ।"</string>
-    <string name="condition_work_title" msgid="7293722361184366648">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਬੰਦ ਹੈ"</string>
-    <string name="condition_work_summary" msgid="7543202177571590378">"ਤੁਹਾਡੀ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹਨ।"</string>
+    <string name="condition_bg_data_summary" msgid="656957852895282228">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਸਿਰਫ਼ ਵਾਈ-ਫਾਈ ਰਾਹੀਂ ਉਪਲਬਧ ਹੈ। ਵਾਈ-ਫਾਈ ਉਪਲਬਧ ਨਾ ਹੋਣ \'ਤੇ ਇਹ ਕੁਝ ਐਪਾਂ ਜਾਂ ਸੇਵਾਵਾਂ \'ਤੇ ਅਸਰ ਪਾ ਸਕਦਾ ਹੈ।"</string>
+    <string name="condition_work_title" msgid="7293722361184366648">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਬੰਦ ਹੈ"</string>
+    <string name="condition_work_summary" msgid="7543202177571590378">"ਤੁਹਾਡੀ ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨਾਲ ਸਬੰਧਿਤ ਐਪਾਂ, ਬੈਕਗ੍ਰਾਊਂਡ ਸਮਕਾਲੀਕਰਨ, ਅਤੇ ਹੋਰ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਬੰਦ ਹਨ।"</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"ਰਾਤਰੀ ਲਾਈਟ ਚਾਲੂ ਹੈ"</string>
     <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>
@@ -3288,16 +3390,15 @@
     <string name="cellular_data_usage" msgid="2155683719898158203">"ਮੋਬਾਈਲ ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"ਵਾਈ-ਫਾਈ ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ਈਥਰਨੈੱਟ ਡਾਟਾ ਵਰਤੋਂ"</string>
-    <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
+    <string name="wifi" msgid="1081550856200013637">"ਵਾਈ-ਫਾਈ"</string>
     <string name="ethernet" msgid="6600095783781389720">"ਈਥਰਨੈੱਟ"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> ਮੋਬਾਈਲ ਡੈਟਾ"</string>
-    <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi ਡੈਟਾ"</string>
-    <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ਈਥਰਨੈੱਟ ਡੈਟਾ"</string>
-    <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="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> ਮੋਬਾਈਲ ਡਾਟਾ"</string>
+    <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> ਵਾਈ-ਫਾਈ ਡਾਟਾ"</string>
+    <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ਈਥਰਨੈੱਟ  ਡਾਟਾ"</string>
+    <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>
@@ -3305,24 +3406,24 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"ਕੈਰੀਅਰ ਵੱਲੋਂ ਡਾਟੇ ਦਾ ਹਿਸਾਬ ਡੀਵਾਈਸ ਦੇ ਹਿਸਾਬ ਨਾਲੋਂ ਵੱਖਰਾ ਹੋ ਸਕਦਾ ਹੈ"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤਿਆ"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"ਡੈਟਾ ਚੇਤਾਵਨੀ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_warning" msgid="209133958008062117">"ਡੈਟਾ ਚੇਤਾਵਨੀ"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"ਡੈਟਾ ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="data_limit" msgid="1885406964934590552">"ਡੈਟਾ ਸੀਮਾ"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">" ਡਾਟਾ   ਚਿਤਾਵਨੀ  ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_warning" msgid="209133958008062117">" ਡਾਟਾ   ਚਿਤਾਵਨੀ"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">" ਡਾਟਾ  ਸੀਮਾ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="data_limit" msgid="1885406964934590552">" ਡਾਟਾ  ਸੀਮਾ"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> ਦੌਰਾਨ <xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤਿਆ ਗਿਆ"</string>
-    <string name="configure" msgid="1029654422228677273">"ਸੰਰੂਪਣ ਕਰੋ"</string>
+    <string name="configure" msgid="1029654422228677273">"ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"ਵਰਤੋਂ ਵਿੱਚ ਹੋਰ ਐਪਾਂ ਸ਼ਾਮਲ ਹਨ"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
       <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="data_saver_title" msgid="398458827917495765">"ਡਾਟਾ ਸੇਵਰ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡੈਟਾ ਪਹੁੰਚ"</string>
-    <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ਪਿਛੋਕੜ ਡੈਟਾ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"</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>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡਾਟਾ ਵਰਤੋਂ"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"ਜਦੋਂ ਡਾਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਗੈਰ-ਪ੍ਰਤੀਬੰਧਿਤ ਪਹੁੰਚ ਦੀ ਮਨਜ਼ੂਰੀ ਦਿਓ"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"ਜਦੋਂ ਡਾਟਾ ਸੇਵਰ ਚਾਲੂ ਹੋਵੇ ਤਾਂ ਗੈਰ-ਪ੍ਰਤੀਬੰਧਿਤ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string>
     <string name="home_app" msgid="4066188520886810030">"ਹੋਮ ਐਪ"</string>
     <string name="no_default_home" msgid="7184117487704520238">"ਕੋਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਹੋਮ ਨਹੀਂ"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"ਸੁਰੱਖਿਅਤ ਸ਼ੁਰੂਆਤ"</string>
@@ -3330,14 +3431,14 @@
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਪਿੰਨ ਦੀ ਮੰਗ ਨੂੰ ਲਾਜ਼ਮੀ ਬਣਾਓ। ਬੰਦ ਹੋਣ \'ਤੇ, ਇਹ ਡੀਵਾਈਸ ਕਾਲਾਂ, ਸੁਨੇਹਿਆਂ, ਸੂਚਨਾਵਾਂ, ਜਾਂ ਅਲਾਰਮਾਂ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਦੀ ਮੰਗ ਨੂੰ ਲਾਜ਼ਮੀ ਬਣਾਓ। ਬੰਦ ਹੋਣ \'ਤੇ, ਇਹ ਡੀਵਾਈਸ ਕਾਲਾਂ, ਸੁਨੇਹਿਆਂ, ਸੂਚਨਾਵਾਂ, ਜਾਂ ਅਲਾਰਮਾਂ ਨੂੰ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"ਕੋਈ ਹੋਰ ਫਿੰਗਰਪ੍ਰਿਟ ਸ਼ਾਮਲ ਕਰੋ"</string>
-    <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"ਕਿਸੇ ਹੋਰ ਉਂਗਲ ਨਾਲ ਅਨਲੌਕ ਕਰੋ"</string>
+    <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"ਕਿਸੇ ਹੋਰ ਉਂਗਲ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"ਚਾਲੂ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"ਬੰਦ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ਕਦੇ ਵੀ ਸਵੈਚਾਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਨਾ ਕਰੋ"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s ਬੈਟਰੀ ਬਾਕੀ ਰਹਿਣ \'ਤੇ ਸਵੈਚਾਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਕਰੋ"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"ਬੈਟਰੀ ਔਪਟੀਮਾਈਜੇਸ਼ਨ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਰਹੀ"</string>
-    <string name="lockscreen_remote_input" msgid="969871538778211843">"ਜੇਕਰ ਡੀਵਾਈਸ ਲੌਕ ਹੈ, ਤਾਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਵਾਬਾਂ ਜਾਂ ਹੋਰ ਲਿਖਤੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਟਾਈਪ ਕਰਨ ਤੋਂ ਰੋਕੋ"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਪੈੱਲ ਚੈਕਰ"</string>
+    <string name="lockscreen_remote_input" msgid="969871538778211843">"ਜੇਕਰ ਡੀਵਾਈਸ ਲਾਕ ਹੈ, ਤਾਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਵਾਬਾਂ ਜਾਂ ਹੋਰ ਲਿਖਤੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਟਾਈਪ ਕਰਨ ਤੋਂ ਰੋਕੋ"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਪੈੱਲ-ਚੈਕਰ"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"ਸਪੈੱਲ ਚੈਕਰ ਚੁਣੋ"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(ਕੋਈ ਨਹੀਂ)"</string>
@@ -3358,9 +3459,9 @@
     <string name="notification_log_details_actions" msgid="242523930165118066">"ਕਾਰਵਾਈਆਂ"</string>
     <string name="notification_log_details_title" msgid="7177091647508863295">"ਸਿਰਲੇਖ"</string>
     <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"ਰਿਮੋਟ ਇਨਪੁੱਟ"</string>
-    <string name="notification_log_details_content_view" msgid="6638731378278561786">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਝਲਕ"</string>
+    <string name="notification_log_details_content_view" msgid="6638731378278561786">"ਵਿਉਂਂਤੀ ਝਲਕ"</string>
     <string name="notification_log_details_extras" msgid="4188418723779942047">"ਵਾਧੂ"</string>
-    <string name="notification_log_details_icon" msgid="8939114059726188218">"ਚਿੰਨ੍ਹ"</string>
+    <string name="notification_log_details_icon" msgid="8939114059726188218">"ਪ੍ਰਤੀਕ"</string>
     <string name="notification_log_details_parcel" msgid="243148037601903212">"ਪਾਰਸਲ ਦਾ ਆਕਾਰ"</string>
     <string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
     <string name="notification_log_details_sound" msgid="5506232879598808099">"ਧੁਨੀ"</string>
@@ -3371,28 +3472,27 @@
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ਰੈਕਿੰਗ ਔਬਜੈਕਟ ਵਿੱਚ ਇਹ ਕੁੰਜੀ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ।"</string>
     <string name="special_access" msgid="3458780842491881155">"ਵਿਸ਼ੇਸ਼ ਐਪ ਪਹੁੰਚ"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਐਪ ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀ ਹੈ</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਐਪਾਂ ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡੈਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀਆਂ ਹਨ</item>
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਐਪ ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡਾਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀ ਹੈ</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ਐਪਾਂ ਗੈਰ-ਪਾਬੰਦੀਸ਼ੁਦਾ ਡਾਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀਆਂ ਹਨ</item>
     </plurals>
-    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"ਕੀ ਸੱਚਮੁੱਚ ਵਰਤੋਂਕਾਰ ਡੈਟੇ ਨੂੰ ਮਿਟਾਉਣਾ ਅਤੇ ਫ਼ਾਈਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
+    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"ਕੀ ਸੱਚਮੁੱਚ ਵਰਤੋਂਕਾਰ  ਡਾਟੇ  ਨੂੰ ਮਿਟਾਉਣਾ ਅਤੇ ਫ਼ਾਈਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ਮਿਟਾਓ ਅਤੇ ਰੁਪਾਂਤਰਣ ਕਰੋ"</string>
     <string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"ShortcutManager ਰੇਟ-ਲਿਮਟਿੰਗ ਰੀਸੈੱਟ ਕੀਤੀ ਜਾ ਚੁੱਕੀ ਹੈ"</string>
-    <string name="notification_suggestion_title" msgid="4506524937307816475">"ਲੌਕ ਸਕ੍ਰੀਨ ਸੂਚਨਾਵਾਂ ਨੂੰ ਕੰਟਰੋਲ ਕਰੋ"</string>
-    <string name="notification_suggestion_summary" msgid="8521159741445416875">"ਸੂਚਨਾ ਸਮੱਗਰੀ ਨੂੰ ਵਿਖਾਓ ਜਾਂ ਲੁਕਾਓ"</string>
+    <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>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"ਪ੍ਰੀਮੀਅਮ SMS ਦਾ ਤੁਹਾਡੇ ਤੋਂ ਖਰਚਾ ਲਿਆ ਜਾ ਸਕਦਾ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਬਿੱਲਾਂ ਵਿੱਚ ਵਾਧਾ ਹੋ ਜਾਵੇਗਾ। ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਲਈ ਇਜਾਜ਼ਤ ਨੂੰ ਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਤੁਸੀਂ ਉਸ ਐਪ ਦੀ ਵਰਤੋਂ ਨਾਲ ਪ੍ਰੀਮੀਅਮ SMS ਭੇਜਣ ਦੇ ਯੋਗ ਹੋ ਜਾਵੋਗੇ।"</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"ਪ੍ਰੀਮੀਅਮ SMS ਪਹੁੰਚ"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"ਦੂਜੀਆਂ ਡੀਵਾਈਸਾਂ ਲਈ ਦਿਖਣਯੋਗ ਨਹੀਂ"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ਇੱਕ ਤੋਂ ਜ਼ਿਆਦਾ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
     <string name="demo_mode" msgid="2798762752209330277">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਦੀਆਂ ਵਿਕਾਸਕਾਰ ਟਾਇਲਾਂ"</string>
-    <string name="support_escalation_title" msgid="4111071371281023145">"ਅਸੀਂ ਸਹਾਇਤਾ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹਾਂ"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"ਅਸੀਂ ਮਦਦ ਕਰਨ ਲਈ ਉਪਲਬਧ ਹਾਂ"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"ਅਸੀਂ ਤੁਹਾਡੇ ਲਈ 24/7 ਉਪਲਬਧ ਹਾਂ"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"ਅਸੀਂ ਤੁਹਾਡੇ ਲਈ 24 7 ਉਪਲਬਧ ਹਾਂ"</string>
     <string name="support_escalation_summary" msgid="8473084168776014405">"ਸਾਡੀ ਸਹਾਇਤਾ ਟੀਮ ਕਿਸੇ ਵੀ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ ਉਪਲਬਧ ਹੈ"</string>
@@ -3400,24 +3500,24 @@
     <string name="support_escalation_closed_summary" msgid="2240967274380168303">"ਮਦਦ ਖੋਜੋ ਜਾਂ ਸਹਾਇਤਾ ਸਮੇਂ ਦੌਰਾਨ ਵਾਪਸ ਆਓ (ਸਥਾਨਕ ਸਮਾਂ):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"ਫ਼ੋਨ ਰਾਹੀਂ ਸਹਾਇਤਾ ਦਾ ਸਮਾਂ (ਸਥਾਨਕ ਸਮਾਂ)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"ਮਦਦ ਖੋਜੋ ਜਾਂ ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
-    <string name="support_country_list_title" msgid="823853371280534111">"ਇਸ ਲਈ ਸਮਰਥਨ:"</string>
+    <string name="support_country_list_title" msgid="823853371280534111">"ਇਸ ਲਈ ਸਹਾਇਤਾ:"</string>
     <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
     <string name="support_phone_international_format" msgid="2143528744844720829">"<xliff:g id="LANGUAGE">%1$s</xliff:g> (<xliff:g id="PHONE">%2$s</xliff:g>)"</string>
     <string name="support_international_phone_title" msgid="1308334014138718455">"ਕੀ ਵਿਦੇਸ਼ ਯਾਤਰਾ ਕਰ ਰਹੇ ਹੋ?"</string>
     <string name="support_international_phone_summary" msgid="208231793637026927">"ਅੰਤਰਰਾਸ਼ਟਰੀ ਖਰਚੇ ਲਾਗੂ ਹੋ ਸਕਦੇ ਹਨ।"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ਫੋਨ"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"ਫ਼ੋਨ ਕਰੋ"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"ਚੈਟ ਕਰੋ"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ਨੁਕਤਿਆਂ ਅਤੇ ਜੁਗਤਾਂਂ ਦੀ ਪੜਚੋਲ ਕਰੋ"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"ਮਦਦ ਖੋਜੋ ਅਤੇ ਪ੍ਰਤੀਕਰਮ ਭੇਜੋ"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"ਮਦਦ ਖੋਜੋ ਅਤੇ ਵਿਚਾਰ ਭੇਜੋ"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"ਸਹਾਇਤਾ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ਸਾਈਨ ਇਨ ਕਰੋ"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"ਕੀ ਸਾਈਨ ਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ?"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ਸਾਈਨ-ਇਨ ਕਰੋ"</string>
+    <string name="support_sign_in_required_help" msgid="5200654782405538114">"ਕੀ ਸਾਈਨ-ਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ?"</string>
     <string name="support_disclaimer_title" msgid="4825302018208770031">"ਸਿਸਟਮ ਜਾਣਕਾਰੀ ਭੇਜੋ"</string>
-    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ਦੁਬਾਰਾ ਨਾ ਵਿਖਾਓ"</string>
+    <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ਦੁਬਾਰਾ ਨਾ  ਦਿਖਾਓ"</string>
     <string name="support_account_request_prefix" msgid="6387847874661861650">"ਇਸ ਵਜੋਂ ਬੇਨਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
     <string name="support_account_picker_add_account" msgid="5076277544846506214">"ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="support_system_information_title" msgid="3439905790018934773">"ਸਿਸਟਮ ਜਾਣਕਾਰੀ"</string>
-    <string name="managed_profile_settings_title" msgid="2729481936758125054">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="managed_profile_settings_title" msgid="2729481936758125054">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ਸੰਪਰਕ ਖੋਜ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ਕਾਲ ਕਰਨ ਵਾਲਿਆਂ ਅਤੇ ਸੰਪਰਕਾਂ ਦੀ ਪਛਾਣ ਕਰਨ ਲਈ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵਿੱੱਚ ਸੰਪਰਕ ਖੋਜਾਂ ਕਰਨ ਦਿਓ"</string>
     <plurals name="hours" formatted="false" msgid="7020844602875333472">
@@ -3435,14 +3535,14 @@
     <string name="support_estimated_wait_time" msgid="6523081420029378051">"~<xliff:g id="ESTIMATE">%1$s</xliff:g> ਉਡੀਕ ਕਰੋ"</string>
     <string name="bluetooth_talkback_computer" msgid="4875089335641234463">"ਕੰਪਿਊਟਰ"</string>
     <string name="bluetooth_talkback_headset" msgid="5140152177885220949">"ਹੈੱਡਸੈੱਟ"</string>
-    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ਫੋਨ"</string>
+    <string name="bluetooth_talkback_phone" msgid="4260255181240622896">"ਫ਼ੋਨ ਕਰੋ"</string>
     <string name="bluetooth_talkback_imaging" msgid="551146170554589119">"ਇਮੇਜਿੰਗ"</string>
     <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"ਹੈੱਡਫੋਨ"</string>
     <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"ਇਨਪੁੱਟ ਪੈਰਿਫੈਰਲ"</string>
     <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"ਬਲੂਟੁੱਥ"</string>
     <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ"</string>
-    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ਸਟੋਰੇਜ ਥਾਂ ਖਾਲੀ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ, ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਬੈਕਅੱਪ ਲਈਆਂ ਗਈਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਨੂੰ ਹਟਾਉਂਦਾ ਹੈ।"</string>
-    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਓ"</string>
+    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ, ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਬੈਕਅੱਪ ਲਈਆਂ ਗਈਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਉਂਦਾ ਹੈ।"</string>
+    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"ਫੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਓ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ"</string>
     <string name="deletion_helper_automatic_title" msgid="6605660435498272520">"ਸਵੈਚਾਲਿਤ"</string>
     <string name="deletion_helper_manual_title" msgid="7947432164411214029">"ਦਸਤੀ"</string>
@@ -3453,55 +3553,65 @@
     <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="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_pickup_title" product="default" msgid="818688002837687268">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਫ਼ੋਨ ਨੂੰ ਚੁੱਕੋ"</string>
-    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ਸੂਚਨਾਵਾਂ ਵੇਖਣ ਲਈ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ"</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="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="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="assist_gesture_title" msgid="7746563137898655539">"\"ਸਹਾਇਤਾ\" ਸੰਕੇਤ"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ਸੰਵੇਦਨਸ਼ੀਲਤਾ"</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="gesture_setting_on" msgid="3455094265233870280">"ਚਾਲੂ"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ਬੰਦ"</string>
-    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ਬੂਟਲੋਡਰ ਪਹਿਲਾਂ ਹੀ ਅਨਲੌਕ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
+    <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ਬੂਟਲੋਡਰ ਪਹਿਲਾਂ ਹੀ ਅਣਲਾਕ ਕੀਤਾ ਹੋਇਆ ਹੈ"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"ਪਹਿਲਾਂ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਜਾਂ ਆਪਣੇ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
-    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ਕੈਰੀਅਰ-ਲੌਕ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂਂ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"ਕੈਰੀਅਰ- ਲਾਕ  ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂਂ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"<xliff:g id="SIZE">%1$s</xliff:g> ਕੁੱਲ ਉਪਲਬਧ ਕਰਵਾਈ ਗਈ\n\nਪਿਛਲੀ ਵਾਰ <xliff:g id="DATE">%2$s</xliff:g> ਨੂੰ ਚਲਾਈ ਗਈ"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"ਤਤਕਾਲ ਐਪਾਂ"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"ਐਪਾਂ ਸਥਾਪਤ ਨਾ ਹੋਈਆਂ ਹੋਣ \'ਤੇ ਵੀ ਉਹਨਾਂ ਵਿਚਲੇ ਲਿੰਕਾਂ ਨੂੰ ਖੋਲ੍ਹੋ"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"ਤਤਕਾਲ ਐਪਾਂ"</string>
     <string name="instant_apps_account" msgid="1433620209791992528">"\'ਤਤਕਾਲ ਐਪਾਂ\' ਖਾਤਾ"</string>
     <string name="domain_url_section_title" msgid="7046835219056428883">"ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ"</string>
-    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ਤੁਹਾਡੀ ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਹੁਣ ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਦੁਆਰਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"ਤੁਹਾਡੀ ਸਟੋਰੇਜ ਦਾ ਪ੍ਰਬੰਧਨ ਹੁਣ ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਵੱਲੋਂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਦੇ ਖਾਤੇ"</string>
-    <string name="configure_section_header" msgid="7391183586410814450">"ਸੰਰੂਪਣ ਕਰੋ"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"ਡੈਟੇ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"ਨਿੱਜੀ ਡੈਟੇ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ਕਾਰਜ ਡੈਟੇ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"ਐਪਾਂ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਡੈਟੇ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਦਿਓ"</string>
+    <string name="configure_section_header" msgid="7391183586410814450">"ਰੂਪ-ਰੇਖਾ ਬਦਲੋ"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">" ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"ਨਿੱਜੀ  ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ਕਾਰਜ  ਡਾਟੇ  ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਕਾਲੀਕਿਰਤ ਕਰੋ"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"ਐਪਾਂ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ  ਡਾਟੇ  ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਦਿਓ"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"ਖਾਤਾ ਸਮਕਾਲੀਕਰਨ"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> ਵਿੱਚੋਂ <xliff:g id="ID_1">%1$d</xliff:g> ਆਈਟਮਾਂ ਲਈ ਸਮਕਾਲੀਕਰਨ ਚਾਲੂ ਹੈ"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"ਸਾਰੀਆਂ ਆਈਟਮਾਂ ਲਈ ਸਮਕਾਲੀਕਰਨ ਚਾਲੂ ਹੈ"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"ਸਾਰੀਆਂ ਆਈਟਮਾਂ ਲਈ ਸਮਕਾਲੀਕਰਨ ਬੰਦ ਹੈ"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"ਪ੍ਰਬੰਧਿਤ ਕੀਤੇ ਡੀਵਾਈਸ ਬਾਰੇ ਜਾਣਕਾਰੀ"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"ਤਬਦੀਲੀਆਂ ਅਤੇ ਸੈਟਿੰਗਾਂ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਸੰਗਠਨ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"ਤਬਦੀਲੀਆਂ ਅਤੇ ਸੈਟਿੰਗਾਂ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string>
-    <string name="enterprise_privacy_header" msgid="7402406406883832509">"ਤੁਹਾਡੇ ਕਾਰਜ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ, ਤੁਹਾਡਾ ਸੰਗਠਨ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲ ਅਤੇ ਸਾਫਟਵੇਅਰ ਸਥਾਪਤ ਕਰ ਸਕਦਾ ਹੈ।\n\nਹੋਰ ਵੇਰਵਿਆਂ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
-    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"ਜਾਣਕਾਰੀ ਦੀਆਂ ਉਹ ਕਿਸਮਾਂ ਜੋ ਤੁਹਾਡਾ ਸੰਗਠਨ ਵੇਖ ਸਕਦਾ ਹੈ"</string>
+    <string name="enterprise_privacy_header" msgid="7402406406883832509">"ਤੁਹਾਡੇ ਕਾਰਜ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ, ਤੁਹਾਡਾ ਸੰਗਠਨ ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਬਦਲ ਅਤੇ ਸਾਫ਼ਟਵੇਅਰ ਸਥਾਪਤ ਕਰ ਸਕਦਾ ਹੈ।\n\nਹੋਰ ਵੇਰਵਿਆਂ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
+    <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"ਜਾਣਕਾਰੀ ਦੀਆਂ ਉਹ ਕਿਸਮਾਂ ਜੋ ਤੁਹਾਡਾ ਸੰਗਠਨ  ਦੇਖ  ਸਕਦਾ ਹੈ"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"ਤੁਹਾਡੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਕੀਤੀਆਂ ਗਈਆਂ ਤਬਦੀਲੀਆਂ"</string>
     <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਤੁਹਾਡੀ ਪਹੁੰਚ"</string>
-    <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"ਤੁਹਾਡੇ ਕਾਰਜ ਖਾਤੇ ਨਾਲ ਸਬੰਧਿਤ ਡੈਟਾ, ਜਿਵੇਂ ਕਿ ਈਮੇਲ ਅਤੇ ਕੈਲੰਡਰ"</string>
+    <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"ਤੁਹਾਡੇ ਕਾਰਜ ਖਾਤੇ ਨਾਲ ਸਬੰਧਿਤ ਡਾਟਾ, ਜਿਵੇਂ ਕਿ ਈਮੇਲ ਅਤੇ ਕੈਲੰਡਰ"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ \'ਤੇ ਸਥਾਪਤ ਕੀਤੀਆਂ ਐਪਾਂ ਦੀ ਸੂਚੀ"</string>
-    <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"ਹਰੇਕ ਐਪ ਵਿੱਚ ਲਗਾਇਆ ਸਮਾਂ ਅਤੇ ਵਰਤਿਆ ਗਿਆ ਡੈਟਾ"</string>
+    <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"ਹਰੇਕ ਐਪ ਵਿੱਚ ਲਗਾਇਆ ਸਮਾਂ ਅਤੇ ਵਰਤਿਆ ਗਿਆ  ਡਾਟਾ"</string>
     <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"ਸਭ ਤੋਂ ਹਾਲੀਆ ਨੈੱਟਵਰਕ ਟਰੈਫਿਕ ਲੌਗ"</string>
     <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"ਸਭ ਤੋਂ ਹਾਲੀਆ ਬੱਗ ਰਿਪੋਰਟ"</string>
     <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"ਸਭ ਤੋਂ ਹਾਲੀਆ ਸੁਰੱਖਿਆ ਲੌਗ"</string>
@@ -3531,10 +3641,10 @@
       <item quantity="one">ਨਿਊਨਤਮ <xliff:g id="COUNT_1">%d</xliff:g> CA ਪ੍ਰਮਾਣ-ਪੱਤਰ</item>
       <item quantity="other">ਨਿਊਨਤਮ <xliff:g id="COUNT_1">%d</xliff:g> CA ਪ੍ਰਮਾਣ-ਪੱਤਰ</item>
     </plurals>
-    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਨੂੰ ਲੌਕ ਅਤੇ ਪਾਸਵਰਡ ਨੂੰ ਰੀਸੈੱਟ ਕਰ ਸਕਦਾ ਹੈ"</string>
+    <string name="enterprise_privacy_lock_device" msgid="8791656477097208540">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਨੂੰ ਲਾਕ ਅਤੇ ਪਾਸਵਰਡ ਨੂੰ ਰੀਸੈੱਟ ਕਰ ਸਕਦਾ ਹੈ"</string>
     <string name="enterprise_privacy_wipe_device" msgid="2821960015797241790">"ਪ੍ਰਸ਼ਾਸਕ ਡੀਵਾਈਸ ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਸਕਦਾ ਹੈ"</string>
     <string name="enterprise_privacy_failed_password_wipe_device" msgid="1001255609345002878">"ਸਾਰਾ ਡੀਵਾਈਸ ਡਾਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਗਿਣਤੀ"</string>
-    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਡੈਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਗਿਣਤੀ"</string>
+    <string name="enterprise_privacy_failed_password_wipe_work" msgid="4040565826652951057">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਡਾਟਾ ਮਿਟਾਏ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨ ਦੀਆਂ ਅਸਫਲ ਕੋਸ਼ਿਸ਼ਾਂ ਦੀ ਗਿਣਤੀ"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="5279099270351036696">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ਾਂ</item>
@@ -3551,17 +3661,17 @@
     <string name="default_contacts_app_title" msgid="3497370557378660098">"ਸੰਪਰਕ ਐਪ"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
       <item quantity="one">ਈਮੇਲ ਕਲਾਇੰਟ ਐਪ</item>
-      <item quantity="other">ਈਮੇਲ ਕਲਾਇੰਟ ਐਪਾਂ</item>
+      <item quantity="other">ਈਮੇਲ ਕਲਾਇੰਟ ਐਪ</item>
     </plurals>
     <string name="default_map_app_title" msgid="7560143381633608567">"ਨਕਸ਼ਾ ਐਪ"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
       <item quantity="one">ਫ਼ੋਨ ਐਪ</item>
-      <item quantity="other">ਫ਼ੋਨ ਐਪਾਂ</item>
+      <item quantity="other">ਫ਼ੋਨ ਐਪ</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ"</string>
-    <string name="storage_music_audio" msgid="789779084825206838">"ਸੰਗੀਤ ਅਤੇ ਔਡੀਓ"</string>
+    <string name="storage_music_audio" msgid="789779084825206838">"ਸੰਗੀਤ ਅਤੇ ਆਡੀਓ"</string>
     <string name="storage_games" msgid="7703159201697117621">"ਗੇਮਾਂ"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ਹੋਰ ਐਪਾਂ"</string>
     <string name="storage_files" msgid="8581083146777364063">"ਫ਼ਾਈਲਾਂ"</string>
@@ -3571,7 +3681,8 @@
     <string name="clear_instant_app_data" msgid="2004222610585890909">"ਐਪ ਕਲੀਅਰ ਕਰੋ"</string>
     <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="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>
@@ -3583,7 +3694,13 @@
     <string name="storage_manager_indicator_off" msgid="7488057587180724388">"ਬੰਦ"</string>
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ਚਾਲੂ"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"ਤਤਕਾਲ ਐਪ"</string>
-    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ਸਟੋਰੇਜ ਮੈਨੇਜਰ ਨੂੰ ਬੰਦ ਕਰੀਏ?"</string>
+    <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
     <string name="storage_movies_tv" msgid="5498394447562086890">"ਮੂਵੀ ਅਤੇ ਟੀਵੀ ਐਪਾਂ"</string>
-    <string name="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="698847081680980774">"ਕੀ ਕੁਝ ਨਵਾਂ ਅਤੇ ਦਿਲਚਸਪ ਹੈ?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ਪ੍ਰਮੁੱਖ 5 ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਦੇਖੋ"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS ਰਜਿਸਟਰੇਸ਼ਨ ਸਥਿਤੀ"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"ਰਜਿਸਟਰ ਕੀਤੀ ਗਈ"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ਰਜਿਸਟਰ ਨਹੀਂ ਕੀਤੀ ਗਈ"</string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index db6284c1b6133b3ecd631f5ffa226f8d3699dc7e..ad48481ccd39b792ae6f0aa3b4feb6a0e79ae438 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 006b3ff29bd720223dd67be9dfc1bd268a04523f..16cbaec0c25cce721026e32e24ba2ec7cbf0a898 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) -->
@@ -283,7 +295,7 @@
     <string name="calls_title" msgid="3544471959217176768">"Połączenia"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS-y"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"Zezwalaj na mobilną transmisję danych"</string>
-    <string name="allow_data_usage_title" msgid="2238205944729213062">"Transmisja danych w roamingu"</string>
+    <string name="allow_data_usage_title" msgid="2238205944729213062">"Użycie danych w roamingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming danych"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Połącz z usługami transmisji danych w roamingu"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Połącz z usługami transmisji danych w roamingu"</string>
@@ -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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Później"</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 +466,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 +538,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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>
@@ -586,7 +607,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Anuluj"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Dalej"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Konfiguracja została ukończona."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacje do administrowania urządzeniem"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacje do zarządzania urządzeniem"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Brak aktywnych aplikacji"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> aktywne aplikacje</item>
@@ -648,6 +669,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>
@@ -713,11 +742,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Włącz Wi-Fi automatycznie"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi włączy się w pobliżu zapisanych sieci wysokiej jakości, takich jak Twoja sieć domowa"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Niedostępna, bo skanowanie Wi-Fi jest wyłączone"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Aby użyć tej funkcji, wybierz dostawcę ocen jakości sieci"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unikaj słabych połączeń"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nie używaj sieci Wi-Fi, jeśli połączenie jest słabe"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Używaj tylko sieci z dobrym połączeniem internetowym"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Łącz się z otwartymi sieciami"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automatycznie łącz się z publicznymi sieciami wysokiej jakości"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Aby użyć tej funkcji, wybierz dostawcę ocen jakości sieci"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Aby użyć tej funkcji, wybierz zgodnego dostawcę ocen jakości sieci"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaluj certyfikaty"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Aplikacje i usługi systemowe mogą nadal skanować w poszukiwaniu sieci Wi-Fi, 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Aby poprawić dokładność lokalizacji, włącz skanowanie Wi-Fi w <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ustawieniach skanowania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -731,7 +763,7 @@
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Limit użycia baterii dla Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Przełącz na mobilną transmisję danych, jeśli Wi-Fi utraci dostęp do internetu."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Automatycznie przełączaj na mobilną transmisję danych"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Używaj mobilnej transmisji danych, gdy sieć Wi-Fi nie ma dostępu do internetu. Mogą obowiązywać opłaty za transmisję danych."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Używaj mobilnej transmisji danych, gdy sieć Wi-Fi nie ma dostępu do internetu. Mogą obowiązywać opłaty za użycie danych."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj sieć"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Ustawienia Wi‑Fi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi włączy się automatycznie"</string>
@@ -801,6 +833,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>
@@ -815,7 +848,7 @@
     <string name="no_internet_access_text" msgid="7133561752896706392">"Ta sieć nie ma dostępu do internetu. Nadal chcesz się z nią łączyć?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Nie pytaj ponownie o tę sieć"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Sieć Wi-Fi nie jest połączona z internetem"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"Gdy połączenie sieci Wi-Fi z internetem jest słabe, możesz przełączać się na sieć komórkową. Mogą być naliczane opłaty za transmisję danych."</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"Gdy połączenie sieci Wi-Fi z internetem jest słabe, możesz przełączać się na sieć komórkową. Mogą być naliczane opłaty za użycie danych."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Przełącz na sieć komórkową"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Pozostań przy Wi-Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Nie pokazuj już nigdy"</string>
@@ -834,7 +867,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>
@@ -871,9 +903,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>
@@ -920,6 +960,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>
@@ -977,6 +1018,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>
@@ -1004,23 +1046,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>
@@ -1044,8 +1085,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 zgodny z otoczeniem"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ekran zgodny z otoczeniem"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Zawsze włączony/ Zwiększone zużycie baterii"</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="6978257596231155345">"Pokazuj godzinę, ikony powiadomień i inne informacje. Zwiększone zużycie baterii."</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>
@@ -1299,6 +1346,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>
@@ -1321,15 +1369,20 @@
     <string name="master_clear_summary" msgid="6902443944660426951">"Pamięć wewnętrzna i wszystkie dane zostaną zresetowane"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" tabletu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Zostaną usunięte wszystkie dane z "<b>"wewnętrznej pamięci"</b>" telefonu, w tym:\n\n"<li>"Dane konta Google"</li>\n<li>"Dane i ustawienia systemu oraz aplikacji"</li>\n<li>"Pobrane aplikacje"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na konta:\n"</string>
+    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"W tej chwili używasz kont:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Z tego urządzenia korzystają inni użytkownicy.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzyka"</li>\n<li>"Zdjęcia"</li>\n<li>"Inne dane użytkownika"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatorzy na karcie eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Nie spowoduje to anulowania Twojego abonamentu w sieci komórkowej."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Wyczyść nośnik USB"</string>
     <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>
@@ -1352,26 +1405,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ępnianie połączenia internetowego 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ępnianie połączenia internetowego 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>
@@ -1404,7 +1446,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>
@@ -1449,8 +1491,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>
@@ -1519,6 +1564,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>
@@ -1689,6 +1737,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>
@@ -1787,6 +1839,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Czytniki, wyświetlacz, sterowanie interakcją"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Dla niedowidzących"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Możesz dostosować urządzenie do swoich potrzeb. Ułatwienia dostępu możesz zawsze zmienić w Ustawieniach."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Zwiększ rozmiar czcionki"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Czytniki ekranu"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Dźwięk i tekst na ekranie"</string>
     <string name="display_category_title" msgid="685461049938269166">"Wyświetlacz"</string>
@@ -1915,6 +1968,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>
@@ -1981,6 +2040,29 @@
     <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="4006631636646776488">"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 zatrzymać aplikację.\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="2369957934555162428">"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 zatrzymać aplikację.\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="6195430620406365292">"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 zatrzymać aplikację.\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_wakeup_alarm" product="default" msgid="1638726742782558262">"Twój telefon nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP_0">%1$s</xliff:g> nieustannie go wybudza.\n\nAby spróbować rozwiązać ten problem, możesz zatrzymać aplikację <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Twój tablet nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP_0">%1$s</xliff:g> nieustannie go wybudza.\n\nAby spróbować rozwiązać ten problem, możesz zatrzymać aplikację <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="device" msgid="2854944538238649520">"Twoje urządzenie nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP_0">%1$s</xliff:g> nieustannie je wybudza.\n\nAby spróbować rozwiązać ten problem, możesz zatrzymać aplikację <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Wyłączyć możliwość działania w tle i zatrzymać aplikację?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Twój telefon nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP_0">%1$s</xliff:g> nieustannie go wybudza.\n\nAby rozwiązać ten problem, możesz zatrzymać aplikację <xliff:g id="APP_1">%1$s</xliff:g> i uniemożliwić jej uruchamianie w tle."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Twój tablet nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP_0">%1$s</xliff:g> nieustannie go wybudza.\n\nAby rozwiązać ten problem, możesz zatrzymać aplikację <xliff:g id="APP_1">%1$s</xliff:g> i uniemożliwić jej uruchamianie w tle."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Twoje urządzenie nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP_0">%1$s</xliff:g> nieustannie je wybudza.\n\nAby rozwiązać ten problem, możesz zatrzymać aplikację <xliff:g id="APP_1">%1$s</xliff:g> i uniemożliwić jej uruchamianie 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="7774807745601479888">"Twój telefon nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nieustannie prosi o lokalizację, nawet gdy nie używasz 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="118745801732181618">"Twój tablet nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nieustannie prosi o lokalizację, nawet gdy nie używasz 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="6783678153382298295">"Twoje urządzenie nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nieustannie prosi o lokalizację, nawet gdy nie używasz 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>
@@ -1995,7 +2077,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>
@@ -2047,12 +2129,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Zestawienie od ostatniego pełnego naładowania"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Ostatnie naładowanie"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Pozostały czas pracy na baterii jest przybliżony i może się zmienić w zależności od wykorzystania"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Dane o wykorzystaniu baterii są przybliżone i mogą się zmienić w zależności od wykorzystania"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Podczas aktywnej pracy"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"W tle"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Wykorzystanie baterii"</string>
@@ -2073,9 +2156,7 @@
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Włącz automatycznie"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nigdy"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"przy <xliff:g id="PERCENT">%1$s</xliff:g> baterii"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_percentage (723291197508049369) -->
-    <skip />
+    <string name="battery_percentage" msgid="723291197508049369">"Poziom naładowania baterii w %%"</string>
     <string name="battery_percentage_description" msgid="8511658577507384014">"Pokazuj procentowy poziom naładowania baterii na pasku stanu"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Statystyki procesów"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Rozbudowane statystyki uruchomionych procesów"</string>
@@ -2210,7 +2291,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Dezaktywuj tę aplikację do administrowania urządzeniem"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Odinstaluj aplikację"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Dezaktywuj i odinstaluj"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacje do administrowania urządzeniem"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacje do zarządzania urządzeniem"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Brak dostępnych aplikacji do administrowania urządzeniem"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Osobiste"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Praca"</string>
@@ -2322,13 +2403,13 @@
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Wybierz wszystkie"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
-    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Przesył danych w aplikacji"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Użycie danych w aplikacji"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Operator sieci komórkowej może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Transmisja danych w aplikacjach"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACJE O APLIKACJI"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilna transmisja danych"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Ustaw limit transmisji danych"</string>
-    <string name="data_usage_cycle" msgid="5652529796195787949">"Cykl transmisji danych"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Cykl użycie danych"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Transmisja danych w aplikacjach"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming danych"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ogranicz dane w tle"</string>
@@ -2347,7 +2428,7 @@
     <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Autosynchronizacja: osobiste"</string>
     <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"Autosynchronizacja: do pracy"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Zmień cykl"</string>
-    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Resetowanie cyklu transmisji danych – dzień miesiąca:"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Resetowanie cyklu użycia danych – dzień miesiąca:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"W tym okresie aplikacje nie pobierały danych."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Pierwszy plan"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Tło"</string>
@@ -2374,19 +2455,19 @@
     <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Włącz mobilną transmisję danych w tle"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Transmisję danych w tle możesz ograniczyć po ustawieniu limitu."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ograniczyć dane w tle?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle.\n\nSzczegółowe ustawienia transmisji danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Gdy będą dostępne tylko sieci komórkowe, funkcja ta może zakłócić działanie aplikacji, które korzystają z przesyłu danych w tle.\n\nSzczegółowe ustawienia użycia danych są zazwyczaj dostępne bezpośrednio w poszczególnych aplikacjach."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ograniczenie transmisji danych w tle jest możliwe tylko po ustawieniu limitu mobilnej transmisji danych."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Włączyć autosynchronizację?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Wszystkie zmiany, które wprowadzisz na swoich kontach w internecie, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też automatycznie kopiować do wersji internetowej wszystkie zmiany, wszystkie zmiany, które wprowadzisz na telefonie.  W ten sposób działa właśnie konto Google."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Wszystkie zmiany, które wprowadzisz na swoich kontach w internecie, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też automatycznie kopiować do wersji internetowej wszystkie zmiany, wszystkie zmiany, które wprowadzisz na telefonie.  W ten sposób działa właśnie konto Google."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Wszystkie zmiany, które wprowadzisz na swoich kontach w internecie, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też automatycznie kopiować do wersji internetowej wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa właśnie konto Google."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Wszystkie zmiany, które wprowadzisz na swoich kontach w internecie, będą automatycznie kopiowane na Twój telefon.\n\nNiektóre konta mogą też automatycznie kopiować do wersji internetowej wszystkie zmiany, które wprowadzisz na telefonie. W ten sposób działa właśnie konto Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Wyłączyć autosynchronizację?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Powoduje przesyłanie mniejszej ilości danych oraz zmniejsza użycie baterii, ale pobranie najnowszych informacji będzie wymagało ręcznej synchronizacji każdego konta. Poza tym nie będziesz otrzymywać powiadomień o aktualizacjach."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data resetowania cyklu transmisji danych"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data w każdym miesiącu:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Zapisz"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ustaw ostrzeżenie o transmisji danych"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ustaw limit danych"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie transmisji danych"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ustaw ostrzeżenie o użyciu danych"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ustaw limit użycia danych"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograniczanie użycia danych"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablet wyłączy mobilną transmisję danych po osiągnięciu ustawionego limitu.\n\nTablet może obliczać ilość przesłanych danych inaczej niż operator sieci komórkowej, więc najlepiej ustaw zaniżony limit."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon wyłączy mobilną transmisję danych po osiągnięciu ustawionego limitu.\n\nTelefon może obliczać ilość przesłanych danych inaczej niż operator sieci komórkowej, więc najlepiej ustaw zaniżony limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograniczyć dane w tle?"</string>
@@ -2616,7 +2697,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, 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>
@@ -2708,9 +2789,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">"użycie 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,9 +2844,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"przesuń, by odblokować, hasło, wzór, kod PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"zadanie służbowe, praca, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil do pracy, profil zarządzany, ujednolicić, ujednolicenie, praca, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gesty"</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_assist_gesture_launch" msgid="813968759791342591">"gest"</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>
@@ -2847,7 +2932,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>
@@ -2862,6 +2948,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>
@@ -2891,8 +2981,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>
@@ -2980,6 +3068,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Tylko od kontaktów z gwiazdką"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Żadne"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmy"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmy mają zawsze priorytet i są sygnalizowane dźwiękiem"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Przypomnienia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Wydarzenia"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Wszyscy rozmówcy"</string>
@@ -3031,11 +3120,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>
@@ -3043,7 +3127,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>
@@ -3150,7 +3234,7 @@
     <string name="system_app" msgid="9068313769550747372">"(Systemowa)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Domyślna aplikacja systemu)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Magazyn aplikacji"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Dostęp do użytkowania"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Dostęp do danych o użyciu"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Zezwól na dostęp do użytkowania"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Ustawienia użycia aplikacji"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Dostęp do użytkowania umożliwia aplikacji śledzenie tego, jakich innych aplikacji i jak często używasz, oraz odczytywanie m.in. informacji o operatorze i ustawień językowych."</string>
@@ -3169,6 +3253,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 aplikacje"</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>
@@ -3195,7 +3292,7 @@
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Ładuje podłączone urządzenie. Działa tylko z urządzeniami obsługującymi ładowanie przez USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Przesłać pliki"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Przesyłaj pliki do innego urządzenia"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Przesyłać zdjęcia (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Przesłać zdjęcia (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Przesyłanie zdjęć lub plików, jeśli MTP nie jest obsługiwane (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Użyć urządzenia jako MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Użyj tego urządzenia jako MIDI"</string>
@@ -3263,8 +3360,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>
@@ -3356,6 +3453,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>
@@ -3364,8 +3474,8 @@
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatyczne aktualizacje systemu"</string>
     <string name="usage" msgid="2977875522080448986">"Wykorzystanie danych"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Mobilna transmisja danych"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Transmisja danych przez Wi-Fi"</string>
-    <string name="ethernet_data_usage" msgid="5108764537574354616">"Transmisja danych w sieci Ethernet"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Użycie danych przez Wi-Fi"</string>
+    <string name="ethernet_data_usage" msgid="5108764537574354616">"Użycie danych w sieci Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> danych mobilnych"</string>
@@ -3374,8 +3484,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>
@@ -3399,7 +3508,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>
@@ -3465,8 +3574,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>
@@ -3543,25 +3651,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Włączone"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Wyłączone"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Program rozruchowy jest już odblokowany"</string>
@@ -3582,6 +3697,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatycznie synchronizuj dane do pracy"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Pozwala aplikacjom automatycznie odświeżać dane"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Synchronizacja konta"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Włącz synchronizację <xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$d</xliff:g> elementów"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Włącz synchronizację wszystkich elementów"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Wyłącz synchronizację wszystkich elementów"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informacje o urządzeniu zarządzanym"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Zmiany i ustawienia, którymi zarządza Twoja organizacja"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Zmiany i ustawienia, którymi zarządza organizacja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3676,6 +3794,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>
@@ -3689,5 +3808,11 @@
     <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="698847081680980774">"Co nowego i fajnego?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Zobacz 5 najlepszych funkcji"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Stan rejestracji IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Zarejestrowane"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Niezarejestrowane"</string>
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 5619fb9cebde14a9227737d114af5f5a968a6d3e..b5d97900cb6ffd75b2020002a944b8a45be967ad 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 37b2767b5ea915eff0a5de1bb7e49dabf72d251f..12e0172fc76e19c2b0755ae8500a6883e6f98887 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) -->
@@ -317,7 +329,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Imediatamente após a suspensão, exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após suspensão, exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar informações do proprietário na tela de bloqueio"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Msg na tela de bloqueio"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Mensagem na tela de bloqueio"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativada pelo administrador"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhuma"</string>
@@ -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>
@@ -347,50 +359,49 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Adicionar impressão digital"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueio de tela"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressão digital configurada</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar"</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">"Pular mesmo assim"</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">"Ele fica na parte traseira do seu smartphone. Use o 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_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_start_title" msgid="2068961812439460133">"Toque no sensor"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Encoste o dedo no sensor e levante após sentir uma vibração"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Mais tarde"</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 traseira 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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro da impressão digital não funcionou. Tente novamente ou use um dedo diferente."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próxima"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Além de desbloquear seu smartphone, também é possível usar sua impressão digital para autorizar compras e acesso a apps. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -449,6 +460,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>
@@ -502,30 +515,38 @@
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Os recursos de proteção de perfil não funcionam sem seu padrão."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Os recursos de proteção de perfil não funcionam sem seu padrão.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais salvas também são removidas deste perfil e não é possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Os recursos de proteção de perfil não funcionam sem seu PIN."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Os recursos de proteção de perfil não funcionam sem seu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais salvas também são removidas deste perfil e não é possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Os recursos de proteção de perfil não funcionam sem sua senha."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Os recursos de proteção de perfil não funcionam sem sua senha.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais salvas também são removidas deste perfil e não é possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Os recursos de proteção de perfil não funcionam sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais salvas também são removidas deste perfil e não é possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sim, remover"</string>
     <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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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>
@@ -624,8 +645,16 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opções…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançado"</string>
     <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="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar com dispositivos próximos"</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>
@@ -671,9 +700,9 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Pronto para transmitir conteúdo de apps via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque o NFC está desativado"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque a NFC está desativada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Quando esse recurso está ativado, é possível enviar o conteúdo do app para outro dispositivo compatível com NFC, mantendo os dispositivos próximos, Por exemplo, é possível enviar páginas da Web, vídeos do YouTube, contatos e muito mais.\n\nBasta posicionar os dispositivos próximos (normalmente de costas um para o outro) e tocar na tela. O app determina o que é enviado."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Quando esse recurso está ativado, é possível enviar o conteúdo do app para outro dispositivo compatível com NFC, mantendo os dispositivos próximos. Por exemplo, é possível enviar páginas da Web, vídeos do YouTube, contatos e muito mais.\n\nBasta aproximar os dispositivos (normalmente de costas um para o outro) e tocar na tela. O app determina o que é enviado."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Ativar o Wi‑Fi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Reativar o Wi‑Fi automaticamente perto de redes salvas de alta qualidade como sua rede doméstica"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Indisponível porque a verificação Wi‑Fi está desativada"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Para usar, selecione um provedor de avaliação de rede"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexões ruins"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Não usar uma rede Wi-Fi a menos que tenha uma boa conexão com a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Use somente redes que têm uma boa conexão com a Internet"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Conectar-se a redes abertas"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Conectar-se automaticamente a redes públicas de alta qualidade"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Para usar, selecione um provedor de avaliação de rede"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para usar, selecione um provedor de avaliação de rede compatível"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Para aumentar a precisão da localização, apps e serviços do sistema ainda conseguem procurar redes Wi‑Fi. É 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para aumentar a precisão da localização, ative a verificação Wi-Fi 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>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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">"Ativado em horários definidos por você"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Ativado 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á ativado 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">"Suspensão"</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>
@@ -1020,8 +1061,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="7337555569694794132">"Sempre ativado / Aumento do uso da bateria"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
+    <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="6978257596231155345">"Mostrar horário, ícones de notificação e outras informações. Aumento do uso da bateria."</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>
@@ -1273,12 +1320,13 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Redefinir"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Redefinir rede"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Isso redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi;"</li>\n<li>"dados móveis;"</li>\n<li>"Bluetooth."</li></string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Isso redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"dados móveis"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Redefinir configurações"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Redefinir todas as configurações de rede? Não é possível desfazer esta ação."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Redefinir configurações"</string>
@@ -1296,15 +1344,20 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadoras no eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
     <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 smartphone"</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>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps transferidos por download? Não é possível desfazer esta ação."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Redefinir?"</string>
@@ -1324,26 +1377,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 Internet do smartphone via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Compartilhar 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">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar 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 para dispositivos móveis"</string>
@@ -1376,7 +1418,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>
@@ -1421,14 +1463,17 @@
     <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>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"As senhas não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PINs não correspondem"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seleção de desbloqueio"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selecionar desbloqueio"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A senha foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Tornar o padrão visível"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Tornar o padrão de perfil visível"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Botão liga/desliga bloqueia"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear com botão liga/desliga"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Alterar padrão"</string>
@@ -1491,6 +1536,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>
@@ -1539,7 +1587,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"App de emergência"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir apps"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir apps?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n \n "<li>"apps desabilitados;"</li>" \n "<li>"notificações de apps desabilitados;"</li>" \n "<li>"apps padrão para ações;"</li>" \n "<li>"restrições de dados em segundo plano para apps;"</li>" \n "<li>"qualquer restrição de permissão."</li>" \n\n Você não perderá os dados dos apps."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n \n "<li>"apps desabilitados"</li>" \n "<li>"notificações de apps desabilitados"</li>" \n "<li>"apps padrão para ações"</li>" \n "<li>"restrições de dados em segundo plano para apps"</li>" \n "<li>"qualquer restrição de permissão"</li>" \n\n Você não perderá os dados dos apps."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1659,6 +1707,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 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 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>
@@ -1688,7 +1740,7 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Assistente de atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar atalhos disponíveis"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Padrão"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do cursor"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de jogos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibração"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecionar vibração para o controlador de jogos quando estiver conectado."</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Controles de interação, leitores de tela, exibição"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuração visual"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Leitores de tela"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Áudio e texto na tela"</string>
     <string name="display_category_title" msgid="685461049938269166">"Tela"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Não é possível gerenciar a bateria do dispositivo normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Não é possível gerenciar a bateria do dispositivo normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo 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="6936542136153283692">"Desativar uso em segundo plano e parar o app?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g> e impedi-lo de executar no segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g> e impedi-lo de executar no segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Não é possível gerenciar a bateria do dispositivo normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g> e impedi-lo de executar no 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="7774807745601479888">"Não é possível gerenciar a bateria do smartphone 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, desative a localização para esse app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Não é possível gerenciar a bateria do tablet 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, desative a localização para esse app."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Não é possível gerenciar a bateria do dispositivo 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, desative 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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">"Ativa por <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última carga completa"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"O tempo restante de bateria é aproximado e pode mudar de acordo com o uso"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Os dados de uso da bateria são aproximados e podem mudar conforme o uso"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Ativo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Em segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso da bateria"</string>
@@ -2193,7 +2274,7 @@
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Não conectado"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adicionar rede"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Atualizar lista"</string>
-    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorar"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Pular"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Avançar"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Voltar"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalhes da rede"</string>
@@ -2306,7 +2387,7 @@
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dia do mês para redefinir o ciclo de uso dos dados:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Nenhum app usou dados durante o período."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primeiro plano"</string>
-    <string name="data_usage_label_background" msgid="3225844085975764519">"Plano de fundo"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Segundo plano"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"restrito"</string>
     <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Desativar os dados móveis?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Definir limite de dados móveis"</string>
@@ -2337,7 +2418,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"As alterações feitas em suas contas na Web serão automaticamente copiadas para o smartphone.\n\nAlgumas contas também poderão copiar automaticamente as alterações feitas no smartphone para a Web. É assim que funciona uma Conta do Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sincroniz. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Escolha o dia de início do ciclo"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definir"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"É possível compartilhar esse dispositivo com outras pessoas criando usuários adicionais. Cada usuário tem seu próprio espaço, que pode ser personalizado com apps, planos de fundo etc. Os usuários também podem ajustar as configurações do dispositivo, como Wi‑Fi, que afetam a todos.\n\nQuando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Quando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuário agora?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para assumir o dispositivo e configurar seu espaço"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para acessar o dispositivo e configurar seu espaço"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurar perfil agora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar agora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Agora não"</string>
@@ -2564,13 +2645,13 @@
     <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>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Receba alertas para ameaças extremas: materiais ou à vida"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ameaças graves"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Receber alertas para ameaças graves: materiais ou à vida"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Receber alertas para ameaças graves, materiais ou à vida"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"Alertas AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Receber boletins sobre crianças sequestradas"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Repetir"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"deslizar para desbloquear, senha, padrão, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafio de trabalho, trabalho, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabalho, perfil gerenciado, unificar, unificação, trabalho, perfil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestos"</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_assist_gesture_launch" msgid="813968759791342591">"gesto"</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>
@@ -2752,7 +2837,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras automáticas ativadas</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferências de \"Não perturbe\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permite Somente prioridade"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Configurar \"Somente prioridade\""</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir regras de Não perturbe"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar som e vibrar eventualmente"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2892,9 +2980,9 @@
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Durante os eventos de"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Durante eventos para <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"qualquer agenda"</string>
-    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Onde a resposta seja <xliff:g id="REPLY">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Quando a resposta for <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Qualquer agenda"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Onde a resposta seja"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Quando a resposta for"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"\"Sim\", \"Talvez\" ou \"Sem resposta\""</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"\"Sim\" ou \"Talvez\""</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"Sim"</string>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contatos marcados com estrela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmes são sempre prioridade e emitem som"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3076,10 +3160,10 @@
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Padrão do sistema)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Armazenamento de apps"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Acesso de uso"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acesso de uso"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Acesso ao uso"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acesso ao uso"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferências de uso de apps"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"O acesso de uso permite que um app rastreie que outros apps você está usando e com que frequência, bem como sua operadora, as configurações de idioma e outros detalhes."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"O acesso ao uso permite que um app rastreie que outros apps você está usando e com que frequência, bem como sua operadora, as configurações de idioma e outros detalhes."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Memória"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Detalhes da memória"</string>
     <string name="always_running" msgid="6042448320077429656">"Sempre em execução (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3093,8 +3177,17 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Otimização de bateria"</string>
     <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="show_all_apps" msgid="1512506948197818534">"Mostrar uso total do 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 da bateria"</string>
@@ -3118,7 +3211,7 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Carregar este dispositivo"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Somente carregar este dispositivo"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Fornecer energia"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carregue o dispositivo conectado. Isso funciona apenas com dispositivos compatíveis com o carregamento por USB."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carregue o dispositivo conectado. Funciona apenas com dispositivos compatíveis com carregamento por USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferir arquivos"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transfere arquivos para outro dispositivo"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3329,7 +3430,7 @@
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Exigir padrão para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Exigir PIN para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Exigir senha para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
-    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impr. digital"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impressão digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloqueie com um dedo diferente"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3369,7 +3470,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está ausente."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém essa chave."</string>
-    <string name="special_access" msgid="3458780842491881155">"Acesso especial ao app"</string>
+    <string name="special_access" msgid="3458780842491881155">"Acesso especial a apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados irrestritos</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados irrestritos</item>
@@ -3381,8 +3482,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"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>
@@ -3453,25 +3553,32 @@
     <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">"Tocar duas vezes na tela para verificar o smartphone"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar duas vezes na tela para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar 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_title" product="tablet" msgid="4455864282995698097">"Levantar o tablet para verificá-lo"</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar o dispositivo para verificá-lo"</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">"Usar impressão digital para ver as notificações"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do dispositivo."</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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Desativado"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O bootloader já está desbloqueado"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronizar dados de trabalho automaticamente"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Permitir que os apps atualizem dados automaticamente"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronização de contas"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sincronização ativada para <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g> itens"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sincronização ativada para todos os itens"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sincronização desativada para todos os itens"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informações do dispositivo gerenciado"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Alterações e configurações gerenciadas pela sua organização"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Alterações e configurações gerenciadas por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
     <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="storage_movies_tv" msgid="5498394447562086890">"Apps de filmes e TV"</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="698847081680980774">"O que há de novo e empolgante?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Confira os cinco melhores recursos"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Estado do registro de IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Não registrado"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index c69a2e15bd1a55b5e6e8da6cbdacd8650ecf81d1..d79ababa0787d546c27220f4d68b1c65aad540aa 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 4c9204b1ca4c13746ae39da4a59e0ef74c569022..4a32a90fd1eb9ef735bef1076f6dfd1d6085ecab 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) -->
@@ -305,7 +317,7 @@
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Hora"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Definir hora"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"Fuso horário"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"Seleccionar fuso horário"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecionar fuso horário"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Data"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Definir data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordenar alfabeticamente"</string>
@@ -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>
@@ -351,43 +363,42 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear com impr. digital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloq. com impressão 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">"Toque 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">"Toque 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">"Levante e toque 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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Fazer mais tarde"</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 +460,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 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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>
@@ -624,8 +645,16 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opções..."</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançadas"</string>
     <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="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode comunicar com dispositivos 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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Ativar o Wi‑Fi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"O Wi‑Fi é reativado quando estiver perto de redes de alta qualidade guardadas, como a sua rede doméstica"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Não disponível porque a procura de Wi‑Fi está desativada"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Para utilizar, selecionar um fornecedor de classificação de rede"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar más ligações"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Não utilizar uma rede Wi-Fi exceto se tiver uma boa ligação à Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilize apenas redes com uma boa ligação à Internet"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Ligar a redes abertas"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Ligar-se automaticamente a redes públicas de alta qualidade"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Para utilizar, selecionar um fornecedor de classificação de rede"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para utilizar, selecionar um fornecedor de classificação de rede compatível"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Para melhorar a precisão da localização, os serviços e as aplicações do sistema podem continuar a procurar redes Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para melhorar a precisão da localização, ative a procura de redes Wi-Fi nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de análise<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Sempre ativado/Maior utilização da bateria"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando 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="6978257596231155345">"Mostrar as horas, os ícones das notificações e outras informações. Maior utilização da bateria."</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>
@@ -1273,6 +1320,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>
@@ -1291,17 +1339,22 @@
       <item quantity="other"><xliff:g id="ACCOUNT_COUNT">%1$d</xliff:g> contas serão repostas</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"A memória de armazenamento interno e todos os dados serão repostos"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Existem outros utilizadores presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotografias"</li>\n<li>"Outros dados do utilizador"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadores no eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Esta ação não cancela o seu plano de serviços móveis."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar a "<b>"memória de armazenamento USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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">"Defina palavra-passe para usar impressão digital"</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">"Defina padrão para usar impressão digital"</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">"Defina PIN para usar impressão digital"</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>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Ver sequência de desbloqueio"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Tornar o padrão do perfil visível"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloq. c/ botão ligar/desligar"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear com botão lig./desl."</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Exceto quando mantido bloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Definir padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Mudar padrão de desbloqueio"</string>
@@ -1491,6 +1536,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>
@@ -1537,7 +1585,7 @@
     <string name="show_running_services" msgid="5736278767975544570">"Mostrar serv. em execução"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar proc. em cache"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplicação de emergência"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Repor pref. de aplic."</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Repor preferências de aplicações"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Repor preferências de aplicações?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Procede à reposição de todas as preferências de:\n\n "<li>"Aplicações desativadas"</li>\n" "<li>"Notificações de aplicações desativadas"</li>\n" "<li>"Aplicações predefinidas para ações"</li>\n" "<li>"Restrições de dados em segundo plano para aplicações"</li>\n" "<li>"Todas as restrições de permissão"</li>\n\n" Não irá perder quaisquer dados das aplicações."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Repor aplicações"</string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Leitores de ecrã, controlos de interação, ecrã"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Definições de visão"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Pode personalizar este dispositivo de acordo com as suas necessidades. Pode alterar estas funcionalidades de acessibilidade mais tarde em Definições."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar tamanho do tipo de letra"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Leitores de ecrã"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Áudio e texto no ecrã"</string>
     <string name="display_category_title" msgid="685461049938269166">"Visualização"</string>
@@ -1873,6 +1926,10 @@
       <item quantity="one">1 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">1 tarefa de impressão</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>
@@ -1939,6 +1996,29 @@
     <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">"Parar a aplicação?"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"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 parar a 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="2369957934555162428">"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 parar a 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="6195430620406365292">"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 parar a 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_wakeup_alarm" product="default" msgid="1638726742782558262">"O telemóvel não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP_0">%1$s</xliff:g> está constantemente a ativá-lo.\n\nPara tentar resolver este problema, pode parar a aplicação <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="tablet" msgid="8771690983566539742">"O tablet não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP_0">%1$s</xliff:g> está constantemente a ativá-lo.\n\nPara tentar resolver este problema, pode parar a aplicação <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="device" msgid="2854944538238649520">"O dispositivo não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP_0">%1$s</xliff:g> mantém-no constantemente ativo.\n\nPara tentar resolver este problema, pode parar a aplicação <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Desativar a utilização em segundo plano e parar a aplicação?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"O telemóvel não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP_0">%1$s</xliff:g> está constantemente a ativá-lo.\n\nPara tentar resolver este problema, pode parar a aplicação <xliff:g id="APP_1">%1$s</xliff:g> e impedir que esta funcione em segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"O tablet não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP_0">%1$s</xliff:g> está constantemente a ativá-lo.\n\nPara tentar resolver este problema, pode parar a aplicação <xliff:g id="APP_1">%1$s</xliff:g> e impedir que esta funcione em segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"O dispositivo não consegue gerir a bateria normalmente, pois a aplicação <xliff:g id="APP_0">%1$s</xliff:g> está constantemente a ativá-lo.\n\nPara tentar resolver este problema, pode parar a aplicação <xliff:g id="APP_1">%1$s</xliff:g> e impedir que esta funcione em segundo plano."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Desativar"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Desativar a localização?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhes desde o último carregamento completo"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Último carregamento completo"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"O tempo restante da bateria é um valor aproximado e pode variar em função da utilização"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Os dados de utilização da bateria são aproximados e podem variar com base na utilização."</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Numa utilização ativa"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Em segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Utilização da bateria"</string>
@@ -2564,7 +2645,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, como começar"</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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"deslizar lentamente para desbloquear, palavra-passe, padrão, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafio de trabalho, trabalho, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabalho, perfil gerido, unificar, unificação, trabalho, perfil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestos"</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_assist_gesture_launch" msgid="813968759791342591">"gesto"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contactos com estrela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Os alarmes têm sempre prioridade e emitem som"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertas de utilização"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Mostrar utilização total do dispositivo"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar utilização de aplic."</string>
+    <string name="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="APP">%1$s</xliff:g> aplicação está a apresentar um comportamento anormal</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"><xliff:g id="APP">%1$s</xliff:g> 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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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">1 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 1 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 da cor fria"</string>
     <string name="color_temperature_desc" msgid="4793729830226404052">"Utilizar cores de visualização mais frias"</string>
@@ -3296,8 +3398,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">1 restrição</item>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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écnico e sugestões"</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>
@@ -3453,27 +3553,34 @@
     <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">"Utilizar 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="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>
-    <string name="gesture_setting_on" msgid="3455094265233870280">"Ativados"</string>
-    <string name="gesture_setting_off" msgid="5230169535435881894">"Desativados"</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="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desativado"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O carregador de arranque já está desbloqueado"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Ligar à Internet primeiro"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Estabelecer ligação à Internet ou contactar o operador"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronizar dados de trabalho automaticamente"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Permitir que as aplicações atualizem os dados automaticamente"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronização da conta"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sincronização ativada para <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g> itens"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sincronização ativada para todos os itens"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sincronização desativada para todos os itens"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informações do dispositivo gerido"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Alterações e definições geridas pela sua entidade"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Alterações e definições geridas pela <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Quais são as grandes novidades?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Conhecer as 5 principais funcionalidades"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Estado do registo IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registado"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Não registado"</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 5619fb9cebde14a9227737d114af5f5a968a6d3e..b5d97900cb6ffd75b2020002a944b8a45be967ad 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 37b2767b5ea915eff0a5de1bb7e49dabf72d251f..12e0172fc76e19c2b0755ae8500a6883e6f98887 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) -->
@@ -317,7 +329,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Imediatamente após a suspensão, exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> após suspensão, exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Mostrar informações do proprietário na tela de bloqueio"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Msg na tela de bloqueio"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Mensagem na tela de bloqueio"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Desativada pelo administrador"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nenhuma"</string>
@@ -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>
@@ -347,50 +359,49 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Adicionar impressão digital"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"bloqueio de tela"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> impressão digital configurada</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> impressões digitais configuradas</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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="skip_anyway_button_label" msgid="2323522873558834513">"Ignorar"</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">"Pular mesmo assim"</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">"Ele fica na parte traseira do seu smartphone. Use o 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_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_start_title" msgid="2068961812439460133">"Toque no sensor"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Encoste o dedo no sensor e levante após sentir uma vibração"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Mais tarde"</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 traseira 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>
+    <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"O registro da impressão digital não funcionou. Tente novamente ou use um dedo diferente."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Adicionar outra"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Próxima"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Além de desbloquear seu smartphone, também é possível usar sua impressão digital para autorizar compras e acesso a apps. "<annotation id="url">"Saiba mais"</annotation></string>
@@ -449,6 +460,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>
@@ -502,30 +515,38 @@
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Os recursos de proteção de perfil não funcionam sem seu padrão."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Os recursos de proteção de perfil não funcionam sem seu padrão.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais salvas também são removidas deste perfil e não é possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Os recursos de proteção de perfil não funcionam sem seu PIN."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Os recursos de proteção de perfil não funcionam sem seu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais salvas também são removidas deste perfil e não é possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Os recursos de proteção de perfil não funcionam sem sua senha."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Os recursos de proteção de perfil não funcionam sem sua senha.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais salvas também são removidas deste perfil e não é possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_content_unknown_profile" msgid="6984215718701688202">"Os recursos de proteção de perfil não funcionarão sem seu bloqueio de tela."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint_profile" msgid="1962204059377724158">"Os recursos de proteção de perfil não funcionam sem seu bloqueio de tela.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Suas impressões digitais salvas também são removidas deste perfil e não é possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas.\""</string>
+</xliff:g>Suas impressões digitais salvas também serão removidas deste perfil e não será possível desbloquear o perfil, autorizar compras ou fazer login em apps com elas."</string>
     <string name="unlock_disable_frp_warning_ok" msgid="7075138677177748705">"Sim, remover"</string>
     <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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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>
@@ -624,8 +645,16 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opções…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançado"</string>
     <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="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode se comunicar com dispositivos próximos"</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>
@@ -671,9 +700,9 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Pronto para transmitir conteúdo de apps via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desativado"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque o NFC está desativado"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponível porque a NFC está desativada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Quando esse recurso está ativado, é possível enviar o conteúdo do app para outro dispositivo compatível com NFC, mantendo os dispositivos próximos, Por exemplo, é possível enviar páginas da Web, vídeos do YouTube, contatos e muito mais.\n\nBasta posicionar os dispositivos próximos (normalmente de costas um para o outro) e tocar na tela. O app determina o que é enviado."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Quando esse recurso está ativado, é possível enviar o conteúdo do app para outro dispositivo compatível com NFC, mantendo os dispositivos próximos. Por exemplo, é possível enviar páginas da Web, vídeos do YouTube, contatos e muito mais.\n\nBasta aproximar os dispositivos (normalmente de costas um para o outro) e tocar na tela. O app determina o que é enviado."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Ativar o Wi‑Fi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Reativar o Wi‑Fi automaticamente perto de redes salvas de alta qualidade como sua rede doméstica"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Indisponível porque a verificação Wi‑Fi está desativada"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Para usar, selecione um provedor de avaliação de rede"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexões ruins"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Não usar uma rede Wi-Fi a menos que tenha uma boa conexão com a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Use somente redes que têm uma boa conexão com a Internet"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Conectar-se a redes abertas"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Conectar-se automaticamente a redes públicas de alta qualidade"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Para usar, selecione um provedor de avaliação de rede"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para usar, selecione um provedor de avaliação de rede compatível"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Para aumentar a precisão da localização, apps e serviços do sistema ainda conseguem procurar redes Wi‑Fi. É 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para aumentar a precisão da localização, ative a verificação Wi-Fi 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>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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">"Ativado em horários definidos por você"</string>
+    <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Ativado 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á ativado 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">"Suspensão"</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>
@@ -1020,8 +1061,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="7337555569694794132">"Sempre ativado / Aumento do uso da bateria"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Novas notificações"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quando mostrar"</string>
+    <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="6978257596231155345">"Mostrar horário, ícones de notificação e outras informações. Aumento do uso da bateria."</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>
@@ -1273,12 +1320,13 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Redefinir"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Redefinir rede"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Isso redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi;"</li>\n<li>"dados móveis;"</li>\n<li>"Bluetooth."</li></string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Isso redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"dados móveis"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Redefinir configurações"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Redefinir todas as configurações de rede? Não é possível desfazer esta ação."</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Redefinir configurações"</string>
@@ -1296,15 +1344,20 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"No momento você está conectado às seguintes contas:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operadoras no eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Apagar armazenamento USB"</string>
     <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 smartphone"</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>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"Limpar todas as suas informações pessoais e apps transferidos por download? Não é possível desfazer esta ação."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Apagar tudo"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Redefinir?"</string>
@@ -1324,26 +1377,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 Internet do smartphone via USB"</string>
+    <string name="usb_tethering_subtext" product="tablet" msgid="5988796139573211318">"Compartilhar 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">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar 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 para dispositivos móveis"</string>
@@ -1376,7 +1418,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>
@@ -1421,14 +1463,17 @@
     <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>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"As senhas não correspondem"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"Os PINs não correspondem"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seleção de desbloqueio"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selecionar desbloqueio"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A senha foi definida"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"O PIN foi definido"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"O padrão foi definido"</string>
@@ -1467,7 +1512,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Tornar o padrão visível"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Tornar o padrão de perfil visível"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrar ao tocar"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Botão liga/desliga bloqueia"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear com botão liga/desliga"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Exceto quando mantido desbloqueado por <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Padrão de desbloqueio"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Alterar padrão"</string>
@@ -1491,6 +1536,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>
@@ -1539,7 +1587,7 @@
     <string name="default_emergency_app" msgid="1951760659640369980">"App de emergência"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Redefinir apps"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Redefinir apps?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n \n "<li>"apps desabilitados;"</li>" \n "<li>"notificações de apps desabilitados;"</li>" \n "<li>"apps padrão para ações;"</li>" \n "<li>"restrições de dados em segundo plano para apps;"</li>" \n "<li>"qualquer restrição de permissão."</li>" \n\n Você não perderá os dados dos apps."</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Isso redefinirá todas as preferências para:\n \n "<li>"apps desabilitados"</li>" \n "<li>"notificações de apps desabilitados"</li>" \n "<li>"apps padrão para ações"</li>" \n "<li>"restrições de dados em segundo plano para apps"</li>" \n "<li>"qualquer restrição de permissão"</li>" \n\n Você não perderá os dados dos apps."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Redefinir apps"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gerenciar espaço"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
@@ -1659,6 +1707,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 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 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>
@@ -1688,7 +1740,7 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Assistente de atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar atalhos disponíveis"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Padrão"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do cursor"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de jogos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibração"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecionar vibração para o controlador de jogos quando estiver conectado."</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Controles de interação, leitores de tela, exibição"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Configuração visual"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"É possível personalizar este dispositivo para atender às suas necessidades. Esses recursos de acessibilidade podem ser alterados posteriormente em \"Configurar\"."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Aumentar tamanho da fonte"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Leitores de tela"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Áudio e texto na tela"</string>
     <string name="display_category_title" msgid="685461049938269166">"Tela"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Não é possível gerenciar a bateria do dispositivo normalmente, porque o app <xliff:g id="APP">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo para melhorar o desempenho da bateria."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Não é possível gerenciar a bateria do dispositivo normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g>.\n\nSe isso continuar acontecendo, talvez seja necessário desinstalá-lo 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="6936542136153283692">"Desativar uso em segundo plano e parar o app?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Não é possível gerenciar a bateria do smartphone normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g> e impedi-lo de executar no segundo plano."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Não é possível gerenciar a bateria do tablet normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g> e impedi-lo de executar no segundo plano."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Não é possível gerenciar a bateria do dispositivo normalmente, porque o app <xliff:g id="APP_0">%1$s</xliff:g> o mantém ativado.\n\nPara tentar resolver esse problema, você pode forçar a parada do app <xliff:g id="APP_1">%1$s</xliff:g> e impedi-lo de executar no 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="7774807745601479888">"Não é possível gerenciar a bateria do smartphone 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, desative a localização para esse app."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Não é possível gerenciar a bateria do tablet 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, desative a localização para esse app."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Não é possível gerenciar a bateria do dispositivo 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, desative 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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">"Ativa por <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última carga completa"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"O tempo restante de bateria é aproximado e pode mudar de acordo com o uso"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Os dados de uso da bateria são aproximados e podem mudar conforme o uso"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Ativo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Em segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso da bateria"</string>
@@ -2193,7 +2274,7 @@
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Não conectado"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adicionar rede"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Atualizar lista"</string>
-    <string name="wifi_setup_skip" msgid="6661541841684895522">"Ignorar"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Pular"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Avançar"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Voltar"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalhes da rede"</string>
@@ -2306,7 +2387,7 @@
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dia do mês para redefinir o ciclo de uso dos dados:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Nenhum app usou dados durante o período."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Primeiro plano"</string>
-    <string name="data_usage_label_background" msgid="3225844085975764519">"Plano de fundo"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Segundo plano"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"restrito"</string>
     <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Desativar os dados móveis?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Definir limite de dados móveis"</string>
@@ -2337,7 +2418,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"As alterações feitas em suas contas na Web serão automaticamente copiadas para o smartphone.\n\nAlgumas contas também poderão copiar automaticamente as alterações feitas no smartphone para a Web. É assim que funciona uma Conta do Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desativar sincroniz. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto preservará o uso de dados e da bateria, mas será necessário sincronizar manualmente cada conta para obter as informações mais recentes, e você não será informado de novas atualizações."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de redefinição do ciclo de uso"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Escolha o dia de início do ciclo"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mês:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Definir"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir aviso de uso de dados"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"É possível compartilhar esse dispositivo com outras pessoas criando usuários adicionais. Cada usuário tem seu próprio espaço, que pode ser personalizado com apps, planos de fundo etc. Os usuários também podem ajustar as configurações do dispositivo, como Wi‑Fi, que afetam a todos.\n\nQuando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Quando você adiciona um novo usuário, essa pessoa precisa configurar o próprio espaço.\n\nQualquer usuário pode atualizar apps para os demais usuários."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuário agora?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para assumir o dispositivo e configurar seu espaço"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Certifique-se de que a pessoa está disponível para acessar o dispositivo e configurar seu espaço"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurar perfil agora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar agora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Agora não"</string>
@@ -2564,13 +2645,13 @@
     <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>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Receba alertas para ameaças extremas: materiais ou à vida"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ameaças graves"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Receber alertas para ameaças graves: materiais ou à vida"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Receber alertas para ameaças graves, materiais ou à vida"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"Alertas AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Receber boletins sobre crianças sequestradas"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Repetir"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"deslizar para desbloquear, senha, padrão, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"desafio de trabalho, trabalho, perfil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"perfil de trabalho, perfil gerenciado, unificar, unificação, trabalho, perfil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestos"</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_assist_gesture_launch" msgid="813968759791342591">"gesto"</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>
@@ -2752,7 +2837,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> regras automáticas ativadas</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferências de \"Não perturbe\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permite Somente prioridade"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Configurar \"Somente prioridade\""</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Regras automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir regras de Não perturbe"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar som e vibrar eventualmente"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2892,9 +2980,9 @@
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Durante os eventos de"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Durante eventos para <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"qualquer agenda"</string>
-    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Onde a resposta seja <xliff:g id="REPLY">%1$s</xliff:g>"</string>
+    <string name="zen_mode_event_rule_summary_reply_template" msgid="6590671260829837157">"Quando a resposta for <xliff:g id="REPLY">%1$s</xliff:g>"</string>
     <string name="zen_mode_event_rule_calendar_any" msgid="6485568415998569885">"Qualquer agenda"</string>
-    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Onde a resposta seja"</string>
+    <string name="zen_mode_event_rule_reply" msgid="5166322024212403739">"Quando a resposta for"</string>
     <string name="zen_mode_event_rule_reply_any_except_no" msgid="8868873496008825961">"\"Sim\", \"Talvez\" ou \"Sem resposta\""</string>
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"\"Sim\" ou \"Talvez\""</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"Sim"</string>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Apenas de contatos marcados com estrela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nenhuma"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmes"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmes são sempre prioridade e emitem som"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lembretes"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos os autores de chamadas"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3076,10 +3160,10 @@
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Padrão do sistema)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Armazenamento de apps"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Acesso de uso"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acesso de uso"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Acesso ao uso"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acesso ao uso"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferências de uso de apps"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"O acesso de uso permite que um app rastreie que outros apps você está usando e com que frequência, bem como sua operadora, as configurações de idioma e outros detalhes."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"O acesso ao uso permite que um app rastreie que outros apps você está usando e com que frequência, bem como sua operadora, as configurações de idioma e outros detalhes."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Memória"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Detalhes da memória"</string>
     <string name="always_running" msgid="6042448320077429656">"Sempre em execução (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3093,8 +3177,17 @@
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Otimização de bateria"</string>
     <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="show_all_apps" msgid="1512506948197818534">"Mostrar uso total do 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 da bateria"</string>
@@ -3118,7 +3211,7 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Carregar este dispositivo"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Somente carregar este dispositivo"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Fornecer energia"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carregue o dispositivo conectado. Isso funciona apenas com dispositivos compatíveis com o carregamento por USB."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Carregue o dispositivo conectado. Funciona apenas com dispositivos compatíveis com carregamento por USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferir arquivos"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transfere arquivos para outro dispositivo"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferir fotos (PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3329,7 +3430,7 @@
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Exigir padrão para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Exigir PIN para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Exigir senha para iniciar seu dispositivo. Enquanto desativado, este dispositivo não recebe chamadas, mensagens, notificações ou alarmes."</string>
-    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impr. digital"</string>
+    <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Adicionar outra impressão digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloqueie com um dedo diferente"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desativada / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -3369,7 +3470,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"nenhum"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"O objeto de classificação está ausente."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"O objeto de classificação não contém essa chave."</string>
-    <string name="special_access" msgid="3458780842491881155">"Acesso especial ao app"</string>
+    <string name="special_access" msgid="3458780842491881155">"Acesso especial a apps"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados irrestritos</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps podem usar dados irrestritos</item>
@@ -3381,8 +3482,7 @@
     <string name="notification_suggestion_title" msgid="4506524937307816475">"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>
@@ -3453,25 +3553,32 @@
     <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">"Tocar duas vezes na tela para verificar o smartphone"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar duas vezes na tela para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar 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_title" product="tablet" msgid="4455864282995698097">"Levantar o tablet para verificá-lo"</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar o dispositivo para verificá-lo"</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">"Usar impressão digital para ver as notificações"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do dispositivo."</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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Ativado"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Desativado"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"O bootloader já está desbloqueado"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronizar dados de trabalho automaticamente"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Permitir que os apps atualizem dados automaticamente"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronização de contas"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sincronização ativada para <xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$d</xliff:g> itens"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sincronização ativada para todos os itens"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sincronização desativada para todos os itens"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informações do dispositivo gerenciado"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Alterações e configurações gerenciadas pela sua organização"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Alterações e configurações gerenciadas por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Ativado"</string>
     <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="storage_movies_tv" msgid="5498394447562086890">"Apps de filmes e TV"</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="698847081680980774">"O que há de novo e empolgante?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Confira os cinco melhores recursos"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Estado do registro de IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrado"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Não registrado"</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index b42fe5ef20915ffc120a333695e775be369078be..61604fdd60921ec52abf72844d6fc9c3c9c9b86f 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 cf0fbef25d351d82637a4404764b9da36311186e..804e224164f5e6d5169603d8ddaa598e7e64a0aa 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) -->
@@ -239,7 +251,7 @@
     <string name="skip_label" msgid="47510779345218297">"Omiteți"</string>
     <string name="next_label" msgid="4693520878012668114">"Înainte"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"Limbi"</string>
-    <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferințele pentru limbă"</string>
+    <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferințe pentru limbă"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"Eliminați"</string>
     <string name="add_a_language" msgid="2330538812283783022">"Adăugați o limbă"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -317,7 +329,7 @@
     <string name="lock_after_timeout" msgid="4590337686681194648">"Blocare automată"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"La <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> după inactivitate"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Imediat după intervalul de inactivitate, cu excepția cazului când este păstrat deblocat prin <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> după intrarea în inactivitate, dacă dispozitivul nu este menținut în activitate de <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"La <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> după intrarea în inactivitate, dacă dispozitivul nu este menținut în activitate de <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Afișați info. proprietar la blocarea ecranului"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Mesaj pe ecranul de blocare"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activați widgeturi"</string>
@@ -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>
@@ -356,41 +368,40 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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" 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 complex."</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 complex."</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 degetul și atingeți din nou 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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Mai târziu"</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 +463,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 +535,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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 +658,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>
@@ -702,13 +731,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activează automat Wi-Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi se va reactiva automat lângă rețelele de înaltă calitate salvate, cum ar fi rețeaua dvs. de domiciliu"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Indisponibil, deoarece scanarea Wi-Fi este dezactivată"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Pentru a folosi funcția, selectați un furnizor de evaluări ale rețelei"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitați conexiunile slabe"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nu utilizați o rețea Wi-Fi, cu excepția cazului în care aceasta are o conexiune la internet adecvată"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilizați numai rețelele care au conexiune bună la internet"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Conectați-vă la rețele deschise"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Conectați-vă automat la rețele publice de înaltă calitate"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Pentru a folosi funcția, selectați un furnizor de evaluări ale rețelei"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Pentru a folosi funcția, selectați un furnizor de evaluări ale rețelei compatibil"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalați certificate"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Pentru a îmbunătăți precizia localizării, aplicațiile și serviciile de sistem pot totuși să caute rețelele Wi‑Fi. 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="wifi_scan_notify_text" msgid="5593805423071186757">"Pentru a îmbunătăți precizia localizării, aplicațiile și serviciile de sistem pot totuși să caute rețele Wi‑Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Pentru a îmbunătăți precizia localizării, activați scanarea Wi-Fi în <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="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Nu mai afișa"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mențineți Wi-Fi activat în modul inactiv"</string>
@@ -790,6 +822,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>
@@ -822,7 +855,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>
@@ -859,9 +891,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>
@@ -908,6 +948,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>
@@ -965,6 +1006,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>
@@ -992,23 +1034,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>
@@ -1032,8 +1073,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="7337555569694794132">"Activat permanent/Utilizare ridicată a bateriei"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Notificări noi"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Când se afișează"</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="6978257596231155345">"Afișează ora, pictogramele pentru notificări și alte informații. Utilizare ridicată a bateriei."</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>
@@ -1286,6 +1333,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>
@@ -1309,13 +1357,18 @@
     <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"aplicațiile descărcate;"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteți conectat(ă) la următoarele conturi:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
+    <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică;"</li>\n<li>"Fotografii;"</li>\n<li>"Alte date ale utilizatorului."</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatori pe eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Planul dvs. de servicii mobile nu va fi anulat astfel."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ștearsă."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie șters."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ștergeți stocarea USB"</string>
     <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>
@@ -1338,26 +1391,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>
@@ -1390,7 +1432,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>
@@ -1424,7 +1466,7 @@
     <string name="terms_title" msgid="7697580845616764642">"Termeni și condiții"</string>
     <string name="webview_license_title" msgid="2813507464175738967">"Licență de sistem pentru WebView"</string>
     <string name="wallpaper_attributions" msgid="3645880512943433928">"Imagini de fundal"</string>
-    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Furnizorii de imagini din satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
+    <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Furnizori de imagini din satelit:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Manual"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"A apărut o problemă la încărcarea manualului."</string>
     <string name="settings_license_activity_title" msgid="8525014571806471216">"Licențe terță parte"</string>
@@ -1435,8 +1477,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>
@@ -1505,6 +1550,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>
@@ -1674,6 +1722,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, introducerea textului ș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>
@@ -1772,6 +1824,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Cititoare de ecran, afișaj, comenzi pentru interacțiune"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Setări pentru vedere"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Puteți personaliza acest dispozitiv conform dorințelor dvs. Aceste funcții de accesibilitate pot fi modificate ulterior în Setări."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Măriți dimensiunea fontului"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Cititoare de ecran"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio și text pe ecran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Afișare"</string>
@@ -1894,6 +1947,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>
@@ -1960,6 +2018,29 @@
     <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="4006631636646776488">"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 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="2369957934555162428">"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 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="6195430620406365292">"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 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_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefonul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP_0">%1$s</xliff:g> activează telefonul încontinuu.\n\nCa să remediați problema, puteți să opriți aplicația.<xliff:g id="APP_1">%1$s</xliff:g>\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_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tableta dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP_0">%1$s</xliff:g> activează tableta încontinuu.\n\nCa să remediați problema, puteți să opriți aplicația. <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="device" msgid="2854944538238649520">"Dispozitivul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP_0">%1$s</xliff:g> activează dispozitivul încontinuu.\n\nCa să remediați problema, puteți să opriți aplicația.<xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Dezactivați utilizarea în fundal și opriți aplicația?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefonul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP_0">%1$s</xliff:g> activează telefonul încontinuu.\n\nCa să remediați problema, puteți să opriți aplicația <xliff:g id="APP_1">%1$s</xliff:g> și să o împiedicați să ruleze în fundal."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tableta dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP_0">%1$s</xliff:g> activează tableta încontinuu.\n\nCa să remediați problema, puteți să opriți aplicația <xliff:g id="APP_1">%1$s</xliff:g> și să o împiedicați să ruleze în fundal."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Dispozitivul dvs. nu poate gestiona în mod normal bateria, deoarece <xliff:g id="APP_0">%1$s</xliff:g> activează dispozitivul încontinuu.\n\nCa să remediați problema, puteți să opriți aplicația <xliff:g id="APP_1">%1$s</xliff:g> și să o împiedicați 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="7774807745601479888">"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\nCa să remediați problema, puteți să dezactivați locația pentru această aplicație."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"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\nCa să remediați problema, puteți să dezactivați locația pentru această aplicație."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"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\nCa să remediați 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>
@@ -1974,7 +2055,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>
@@ -2026,12 +2107,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detaliere de la ultima încărcare completă"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Ultima încărcare completă"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Timpul de funcționare rămas pentru baterie este aproximativ și se poate modifica în funcție de utilizare"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Datele despre utilizarea bateriei sunt aproximative și se pot modifica în funcție de utilizare"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"În timp ce se află în utilizare activă"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"În timp ce se află în fundal"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Utilizarea bateriei"</string>
@@ -2589,7 +2671,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>
@@ -2680,9 +2762,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>
@@ -2732,9 +2817,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"glisați pentru a debloca, parolă, model, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"provocare la serviciu, serviciu, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profil de serviciu, profil gestionat, unificați, unificare, serviciu, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gesturi"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"plată, atingere, plăți"</string>
     <string name="keywords_backup" msgid="470070289135403022">"backup"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gest"</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>
@@ -2818,7 +2904,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>
@@ -2833,6 +2920,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>
@@ -2861,8 +2952,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>
@@ -2948,6 +3037,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Doar de la persoanele de contact cu stea"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Niciunul"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarme"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmele sunt mereu prioritare și emit sunete"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mementouri"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Evenimente"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Toți apelanții"</string>
@@ -2997,11 +3087,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>
@@ -3009,7 +3094,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>
@@ -3131,6 +3216,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>
@@ -3161,7 +3257,7 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Transferați fotografii sau fișiere dacă MTP nu este acceptat (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Folosiți dispozitivul ca MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Folosiți acest dispozitiv ca MIDI"</string>
-    <string name="usb_use" msgid="3256040963685055320">"Folosiți conexiunea USB ca să"</string>
+    <string name="usb_use" msgid="3256040963685055320">"Folosiți conexiunea USB ca să:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Încărcarea acestui dispozitiv"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Alimentarea altui dispozitiv"</string>
@@ -3224,8 +3320,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>
@@ -3316,6 +3412,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>
@@ -3334,8 +3441,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>
@@ -3357,7 +3463,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>
@@ -3422,8 +3528,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>
@@ -3497,25 +3602,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Activat"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Dezactivat"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloaderul este deja deblocat"</string>
@@ -3536,6 +3648,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronizare automată a datelor de serviciu"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Permiteți aplicațiilor să actualizeze date automat"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronizarea contului"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sincronizare activată pentru <xliff:g id="ID_1">%1$d</xliff:g> din <xliff:g id="ID_2">%2$d</xliff:g> articole"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sincronizare activată pentru toate articolele"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sincronizare dezactivată pentru toate articolele"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informații privind dispozitivul gestionat"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Modificări și setări gestionate de organizația dvs."</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Modificări și setări gestionate de <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3623,6 +3738,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>
@@ -3636,5 +3752,11 @@
     <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="698847081680980774">"Ce este nou și interesant?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Încercați cele 5 funcții principale"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Situația înregistrării IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Înregistrat"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neînregistrat"</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 1f47436fb2375da30161b89cb41bd76f98d6f073..621dd4088d7604db774c573b0116aaddd3f33ef5 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 88fb2d8efa6100a75011b58c6b7da23bbb43d7e9..47380c449d9494e243cde40c4d5278bfcc977f20 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>
@@ -342,7 +354,7 @@
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Конфиденциальность"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Отключено администратором"</string>
-    <string name="security_status_title" msgid="5848766673665944640">"Статус безопасности"</string>
+    <string name="security_status_title" msgid="5848766673665944640">"Статус защиты"</string>
     <string name="security_dashboard_summary" msgid="6757421634477554939">"Блокировка экрана, цифровой отпечаток"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Блокировка экрана"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отпечатки пальцев"</string>
@@ -360,40 +372,39 @@
     <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_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_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="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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Не сейчас"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Не настраивать доступ по отпечаткам?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Для разблокировки телефона вы выбрали сканирование отпечатка пальца. Настройка займет около минуты. Если вы пропустите ее сейчас, вам все равно придется сделать это позже."</string>
     <string name="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 +466,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>
@@ -509,8 +522,8 @@
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Без графического ключа защита профиля работать не будет.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Сохраненные отпечатки пальцев также будут удалены: вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
-    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Без PIN-кода защита профиля работать не будет."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Без PIN-кода защита профиля работать не будет.<xliff:g id="EMPTY_LINE">
+    <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Без PIN-кода не будет работать защита профиля."</string>
+    <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Без PIN-кода не будет работать защита профиля.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>Сохраненные отпечатки пальцев также будут удалены: вы больше не сможете снимать блокировку, совершать покупки и входить в приложения с их помощью."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Без пароля защита профиля работать не будет."</string>
@@ -525,13 +538,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="1688030823464420974">"Если вы неправильно введете графический ключ, с устройства будут удалены все данные."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Если вы неправильно введете PIN-код, с устройства будут удалены все данные."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Если вы неправильно введете пароль, с устройства будут удалены все данные."</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="5047439819181833824">"Слишком много неудачных попыток. С устройства будут удалены все данные."</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 +669,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>
@@ -695,7 +724,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Выключено"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно, так как NFC отключен"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Эта функция позволяет обмениваться информацией между устройствами, приложив их друг к другу. Передавать можно практически любые данные, включая контакты, веб-страницы и видео.\n\nПросто разместите устройства рядом (например, совместите их задние панели) и нажмите на экран. Передаваемые данные зависят от приложения."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Эта функция позволяет обмениваться информацией между устройствами, приложив их друг к другу. Передавать можно практически любые данные, включая контакты, веб-страницы и видео.\n\nСовместите задние панели устройств и нажмите на экран. Передаваемые данные зависят от приложения."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Включить Wi‑Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -713,11 +742,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Включать Wi‑Fi автоматически"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Включать Wi‑Fi в зоне действия сохраненных сетей (например, домашней) с хорошим сигналом"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недоступно, так как поиск сетей Wi‑Fi отключен"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Чтобы использовать эту функцию, выберите источник рейтинга сетей"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Фильтр сетей Wi-Fi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Не использовать сети Wi-Fi с плохим интернет-соединением"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Использовать только сети с сильным сигналом"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Подключаться к открытым сетям"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Автоматически подключаться к общедоступным сетям с хорошим сигналом"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Чтобы использовать эту функцию, выберите источник рейтинга сетей"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Чтобы использовать эту функцию, выберите поддерживаемый источник рейтинга сетей"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Установка сертификатов"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Чтобы точнее определять местоположение, системные приложения и сервисы продолжат искать сети 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Чтобы повысить точность определения местоположения, включите поиск сетей Wi-Fi в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройках<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -801,6 +833,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>
@@ -834,7 +867,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>
@@ -871,9 +903,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>
@@ -920,6 +960,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>
@@ -977,6 +1018,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 +1046,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 +1085,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="7337555569694794132">"Всегда включено (батарея разряжается быстрее)"</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="6978257596231155345">"Показывать время, значки уведомлений и другую информацию (батарея разряжается быстрее)"</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 +1346,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>
@@ -1324,12 +1372,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Аккаунты на этом устройстве:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На этом устройстве есть другие аккаунты пользователей.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Операторы на eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Вы не потеряете доступ к услугам оператора связи."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Очистить USB-накопитель"</string>
     <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>
@@ -1352,32 +1405,21 @@
     <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>
     <string name="sms_application_title" msgid="4903928270533250448">"Приложение для SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Приложение для обмена SMS"</string>
-    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Использовать приложение <xliff:g id="NEW_APP">%1$s</xliff:g> вместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> для обмена SMS-сообщениями?"</string>
+    <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Использовать <xliff:g id="NEW_APP">%1$s</xliff:g> вместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> для обмена SMS-сообщениями?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Использовать приложение \"<xliff:g id="NEW_APP">%s</xliff:g>\" для обмена SMS-сообщениями?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Источник рейтинга сетей"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Нет"</string>
@@ -1404,7 +1446,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 +1491,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>
@@ -1475,7 +1520,7 @@
     <string name="lockpassword_invalid_pin" msgid="15588049067548470">"Неверный PIN-код"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"Неверный пароль"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"Неверный ключ"</string>
-    <string name="lock_settings_title" msgid="4213839087748988686">"Безопасность устройства"</string>
+    <string name="lock_settings_title" msgid="4213839087748988686">"Защита устройства"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"Изменить ключ"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Изменить PIN-код"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Начертите ключ разблокировки"</string>
@@ -1519,6 +1564,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 +1737,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>
@@ -1787,6 +1839,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Программы чтения с экрана, экран, элементы управления"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Настройки спец. возможностей"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Используйте специальные возможности для удобной работы с устройством. Эти параметры можно изменить в настройках."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Увеличьте размер шрифта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Программы чтения с экрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио и озвучивание текста"</string>
     <string name="display_category_title" msgid="685461049938269166">"Экран"</string>
@@ -1915,6 +1968,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 +2040,29 @@
     <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="4006631636646776488">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" не позволяет телефону перейти в спящий режим.\n\nЧтобы устранить эту проблему, остановите приложение.\n\nЕсли это не поможет, удалите его."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" не позволяет планшету перейти в спящий режим.\n\nЧтобы устранить эту проблему, остановите приложение.\n\nЕсли это не поможет, удалите его."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" не позволяет устройству перейти в спящий режим.\n\nЧтобы устранить эту проблему, остановите приложение.\n\nЕсли это не поможет, удалите его."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP_0">%1$s</xliff:g>\" часто выводит телефон из спящего режима.\n\nЧтобы устранить эту проблему, остановите приложение \"<xliff:g id="APP_1">%1$s</xliff:g>\".\n\nЕсли это не поможет, удалите его."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP_0">%1$s</xliff:g>\" часто выводит планшет из спящего режима.\n\nЧтобы устранить эту проблему, остановите приложение \"<xliff:g id="APP_1">%1$s</xliff:g>\".\n\nЕсли это не поможет, удалите его."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP_0">%1$s</xliff:g>\" часто выводит устройство из спящего режима.\n\nЧтобы устранить эту проблему, остановите приложение \"<xliff:g id="APP_1">%1$s</xliff:g>\".\n\nЕсли это не поможет, удалите его."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Остановить"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Запретить работу в фоновом режиме и остановить приложение?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP_0">%1$s</xliff:g>\" часто выводит телефон из спящего режима.\n\nЧтобы устранить эту проблему, запретите приложению \"<xliff:g id="APP_1">%1$s</xliff:g>\" работать в фоновом режиме."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP_0">%1$s</xliff:g>\" часто выводит планшет из спящего режима.\n\nЧтобы устранить эту проблему, запретите приложению \"<xliff:g id="APP_1">%1$s</xliff:g>\" работать в фоновом режиме."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP_0">%1$s</xliff:g>\" часто выводит устройство из спящего режима.\n\nЧтобы устранить эту проблему, запретите приложению \"<xliff:g id="APP_1">%1$s</xliff:g>\" работать в фоновом режиме."</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="7774807745601479888">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" запрашивает данные о вашем местоположении, даже когда вы им не пользуетесь.\n\nЧтобы устранить эту проблему, запретите приложению доступ к геоданным."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" запрашивает данные о вашем местоположении, даже когда вы им не пользуетесь.\n\nЧтобы устранить эту проблему, запретите приложению доступ к геоданным."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Заряд батареи расходуется слишком быстро, так как приложение \"<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 +2077,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>
@@ -2047,12 +2129,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Использование с момента полной зарядки"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Последняя полная зарядка"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Оставшееся время работы указано приблизительно и может меняться в зависимости от интенсивности использования."</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Время работы батареи указано приблизительно и может меняться в зависимости от интенсивности использования."</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"В активном режиме"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"В фоновом режиме"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Расход заряда батареи"</string>
@@ -2375,8 +2458,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Если будут доступны только мобильные сети, программы, зависящие от фонового режима, могут перестать работать.\n\nУстановите другие параметры передачи данных в настройках приложения."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Чтобы ограничить передачу данных в фоновом режиме, сначала установите лимит мобильного трафика."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Включить автосинхронизацию?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Все изменения в аккаунтах на компьютере будут автоматически копироваться на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Все изменения в аккаунтах на компьютере будут автоматически копироваться на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Отключить автосинхронизацию?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Расход трафика и энергии будет ниже, но для получения новых данных придется синхронизировать аккаунты вручную. Уведомления о наличии обновлений будут отключены."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Сброс статистики"</string>
@@ -2614,7 +2697,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>
@@ -2706,9 +2789,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>
@@ -2758,9 +2844,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"провести для разблокировки, пароль, графический ключ, PIN-код"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"защита рабочего профиля, рабочий, профиль"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"рабочий профиль, управляемый профиль, объединить, объединение, работа, профиль"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"жест"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"жесты"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"Бесконтактная оплата"</string>
     <string name="keywords_backup" msgid="470070289135403022">"создать резервную копию"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жест"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Настройка NFC-метки"</string>
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Нажмите на метку, чтобы начать запись..."</string>
@@ -2845,7 +2932,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 +2948,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 +2981,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>
@@ -2978,6 +3068,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Только от помеченных контактов"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ни от кого"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будильник"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Будильник всегда важен и подает звуковой сигнал"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напоминания"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Мероприятия"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Все абоненты"</string>
@@ -3029,19 +3120,14 @@
     <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>
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Вы можете задать графический ключ для разблокировки, чтобы защитить данные, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать графический ключ?"</string>
     <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_pattern_for_fingerprint" msgid="932184823193006087">"В дополнение к разблокировке с помощью отпечатка пальца вы также можете включить запрос графического ключа при запуске устройства. До запуска звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\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>
@@ -3167,6 +3253,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>
@@ -3261,8 +3360,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>
@@ -3354,6 +3453,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>
@@ -3372,8 +3484,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>
@@ -3397,7 +3508,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>
@@ -3463,8 +3574,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>
@@ -3541,25 +3651,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Жест для вызова помощника"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Чувствительность"</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="gesture_setting_on" msgid="3455094265233870280">"Вкл."</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Выкл."</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Загрузчик ОС уже разблокирован"</string>
@@ -3580,6 +3697,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Автоматическая синхронизация корпоративных данных"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Данные приложений обновляются без участия пользователя"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Синхронизировать аккаунты"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Синхронизация включена для некоторых элементов (<xliff:g id="ID_1">%1$d</xliff:g> из <xliff:g id="ID_2">%2$d</xliff:g>)"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Синхронизация включена для всех элементов"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Синхронизация отключена для всех элементов"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Информация об управляемом устройстве"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Изменения и настройки, управляемые организацией"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Изменения и настройки, управляемые организацией \"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>\""</string>
@@ -3674,6 +3794,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>
@@ -3687,5 +3808,11 @@
     <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="698847081680980774">"Что нового?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"5 функций, которые вам пригодятся"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Статус регистрации сервиса IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Зарегистрирован"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не зарегистрирован"</string>
 </resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 3745655707756c81e4c7a76ff583c339029748b3..aa1a01228ab4e24d83afb33030cbd5743893a90a 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 508fdd8cd9f6bd056f2487b6c93ee453bb0d0a5c..45f34bf3c600f7823127f9b603f82a0253e89f4d 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"පසුව එය කරන්න"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ඇඟිලි සලකුණ පිහිටුවීම මග හරින්නද?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"ඔබ ඔබේ දුරකථනය අගුලු හැරීමේ එක් ක්‍රමයක් ලෙස ඔබේ ඇඟිලි සලකුණ භාවිත කිරීම තෝරා ඇත. ඔබ දැන් මග හැරියොත්, ඔබට මෙය පසුව පිහිටුවීමට අවශ්‍ය වනු ඇත. පිහිටුවීම මිනිත්තුවක් හෝ කිහිපයක් ගනු ඇත."</string>
     <string name="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="1688030823464420974">"ඔබ ඊළඟ උත්සාහයේදී වැරදි රටාවක් ඇතුළු කළහොත්, මෙම උපාංගයෙහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"ඔබ ඊළඟ උත්සාහයේදී වැරදි PIN එකක් ඇතුළු කළහොත්, මෙම උපාංගයෙහි දත්ත මකනු ඇත"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"ඔබ ඊළඟ උත්සාහයේදී වැරදි මුරපදයක් ඇතුළු කළහොත්, මෙම උපාංගයෙහි දත්ත මකනු ඇත"</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="5047439819181833824">"වැරදි උත්සාහයන් ඉතා වැඩි ගණනකි. මෙම උපාංගයෙහි දත්ත මකනු ඇත."</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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi ස්වයංක්‍රියව නැවත සබල කරන්න"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ඔබගේ නිවෙස් ජාලය වැනි සුරැකි ඉහළ ගුණත්ව ජාල අවට ස්වයංක්‍රියව නැවත Wi-Fi සබල කරන්න"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi-Fi ස්කෑන් කිරීම ක්‍රියාවිරහිත කර ඇති නිසා ලබා ගත නොහැකිය"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"භාවිත කිරීමට, ජාල ඇගයීම් සපයන්නකු තෝරන්න"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"දුර්වල සම්බන්ධතා මඟහරින්න"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"හොඳ අන්තර්ජාල සම්බන්ධතාවයක් නොමැති නම් Wi‑Fi ජාල භාවිතා නොකරන්න"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"හොඳ අන්තර්ජාල සම්බන්ධතාවක් තිබෙන ජාල පමණක් භාවිතා කරන්න"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"විවෘත ජාල වලට සම්බන්ධ වෙන්න"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"ඉහළ-ගුණත්ව පොදු ජාල වලට ස්වයංක්‍රියව සම්බන්ධ වෙන්න"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"භාවිත කිරීමට, ජාල ඇගයීම් සපයන්නකු තෝරන්න"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"භාවිත කිරීමට, ගැළපෙන ජාල ඇගයීම් සපයන්නකු තෝරන්න"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"සහතික ස්ථාපනය කරන්න"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කිරීමට, පද්ධති යෙදුම් සහ සේවාවලට තවමත් 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"ස්ථාන නිරවද්‍යතාව වැඩිදියුණු කිරීමට, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ස්කෑන් කිරීමේ සැකසීම්<xliff:g id="LINK_END_1">LINK_END</xliff:g> තුළ Wi-Fi ස්කෑන් කිරීම ක්‍රියාත්මක කරන්න."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"සැම විට ක්‍රියාත්මකයි / වැඩි බැටරි භාවිතය"</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="6978257596231155345">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පෙන්වන්න. වැඩි බැටරි භාවිතය."</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 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරනය වී සිටියි:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"මෙම උපාංගයේ වෙනත් පරිශීලකයින් සිටි.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"සංගීතය"</li>\n<li>"ඡායාරූප"</li>\n<li>"වෙනත් පරිශීලක දත්ත"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM හි ගෙන යයි"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"සංගීත, පින්තූර, සහ වෙනත් පරිශීලක දත්ත මැකීමට, "<b>"USB ආචයනය"</b>" මැකීමට අවශ්‍යය."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත ඉවත් කිරීමට, "<b>"SD කාඩ් පත"</b>" මැකිය යුතුවේ."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ආචයනය මකන්න"</string>
     <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>
@@ -1324,26 +1377,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 +1418,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 +1463,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 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"තිර කියවන, සංදර්ශක, අන්තර්ක්‍රියා පාලන"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"දෘශ්‍ය සැකසීම්"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ඔබට ඔබේ අවශ්‍යතාවන්ට ගැළපෙන පරිදි මෙම උපාංගය අභිරුචිකරණය කළ හැකිය. මෙම ප්‍රවේශ්‍යතා විශේෂාංග සැකසීම්වල පසුව වෙනස් කළ හැකිය."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ෆොන්ට තරම වැඩි කරන්න"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"තිර කියවන"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ශ්‍රව්‍ය සහ තිරය මත පෙළ"</string>
     <string name="display_category_title" msgid="685461049938269166">"සංදර්ශකය"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ දුරකථනය අවදියෙන් තබා ගන්නා නිසා ඔබේ දුරකථනයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ ටැබ්ලටය අවදියෙන් තබා ගන්නා නිසා ඔබේ ටැබ්ලටයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ උපාංගය අවදියෙන් තබා ගන්නා නිසා ඔබේ උපාංගයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> ඔබේ දුරකථනය අවදියෙන් තබා ගන්නා නිසා ඔබේ දුරකථනයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට <xliff:g id="APP_1">%1$s</xliff:g> නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> ඔබේ ටැබ්ලටය අවදියෙන් තබා ගන්නා නිසා ඔබේ ටැබ්ලටයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට <xliff:g id="APP_1">%1$s</xliff:g> නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> ඔබේ උපාංගය අවදියෙන් තබා ගන්නා නිසා ඔබේ උපාංගයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට <xliff:g id="APP_1">%1$s</xliff:g> නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"යෙදුම නවත්වන්න"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"පසුබිම් භාවිතය ක්‍රියාවිරහිත කර යෙදුම නව්ත්වන්නද?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> ඔබේ දුරකථනය අවදියෙන් තබා ගන්නා නිසා ඔබේ දුරකථනයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට <xliff:g id="APP_1">%1$s</xliff:g> නවතා එය පසුබිමින් ධාවනය වීමෙන් වැළැක්වීමට හැකිය."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> ඔබේ ටැබ්ලටය අවදියෙන් තබා ගන්නා නිසා ඔබේ ටැබ්ලටයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට <xliff:g id="APP_1">%1$s</xliff:g> නවතා එය පසුබිමින් ධාවනය වීමෙන් වැළැක්වීමට හැකිය."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> ඔබේ උපාංගය අවදියෙන් තබා ගන්නා නිසා ඔබේ උපාංගයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට <xliff:g id="APP_1">%1$s</xliff:g> නවතා එය පසුබිමින් ධාවනය වීමෙන් වැළැක්වීමට හැකිය."</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="7774807745601479888">"<xliff:g id="APP">%1$s</xliff:g> ඔබ දුරකථනය භාවිත නොකරන විට ඔබේ ස්ථානය ඉල්ලමින් සිටින නිසා ඔබේ දුරකථනයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට, ඔබට මෙම යෙදුම සඳහා ස්ථානය ක්‍රියාවිරහිත කළ හැකිය."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"<xliff:g id="APP">%1$s</xliff:g> ඔබ ටැබ්ලටය භාවිත නොකරන විට ඔබේ ස්ථානය ඉල්ලමින් සිටින නිසා ඔබේ ටැබ්ලටයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට, ඔබට මෙම යෙදුම සඳහා ස්ථානය ක්‍රියාවිරහිත කළ හැකිය."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"<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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"අවසන් පූර්ණ ආරෝපණයෙන් පසුව ප්‍රභේදනය"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"අවසන් පූර්ණ ආරෝපණය"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"ඉතිරි බැටරි කාලය දළ අගයක් වන අතර භාවිතය අනුව වෙනස් විය හැකිය"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"බැටරි භාවිත දත්ත දළ අගයක් වන අතර භාවිතය අනුව වෙනස් විය හැකිය"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"සක්‍රිය භාවිතයෙහි ඇති අතර"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"පසුබිමේ සිටින අතරතුර"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"බැටරි භාවිතය"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"අගුලු හැරීමට ස්ලයිඩ කරන්න, මුරපදය, රටාව, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"වැඩ අභියෝගය, වැඩ, පැතිකඩ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"කාර්යාල පැතිකඩ, කළමනාකරණය කළ පැතිකඩ, ඒකාබද්ධ, ඒකාබද්ධ කිරීම, කාර්යාල, පැතිකඩ"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ඉංගිතය"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ඉංගිති"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ගෙවීම, තට්ටු කිරීම, ගෙවීම්"</string>
     <string name="keywords_backup" msgid="470070289135403022">"උපස්ථ, උපස්ථ"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ඉංගිතය"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"තරු ලකුණු කළ සම්බන්ධතා වෙතින් පමණි"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"කිසිවක් නැත"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"ඇඟවීම්"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"සීනු සැමවිටම ප්‍රමුඛ වන අතර ශබ්ද ඇති කරයි"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"සිහිකැඳවීම්"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"සිදුවීම්"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"සියලු අමතන්නන්"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3118,7 +3211,7 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"මෙම උපාංගය ආරෝපණය කිරීම"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"මෙම උපාංගය දැන් ආරෝපනය කරන්න"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"බලය සැපයීම"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"සම්බන්ධිත උපාංගය ආරෝපණය කරන්න. වැඩ කරන්නේ USB ආරෝපණය වෙත සහය දක්වන උපාංග සමඟ පමණි."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"සම්බන්ධිත උපාංගය ආරෝපණය කරන්න. වැඩ කරන්නේ USB ආරෝපණයට  සහය දක්වන උපාංග සමඟ පමණි."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"ගොනු මාරු කිරීම"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"වෙනත් උපාංගයකට ගොනු මාරු කරන්න"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"ඡායාරූප හුවමාරුව (PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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_pickup_title" product="default" msgid="818688002837687268">"දුරකථනය පරීක්ෂා කිරීමට ඔසවන්න"</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="assist_gesture_title" msgid="7746563137898655539">"ඉඟිතයට සහාය දක්වන්න"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"සංවේදීතාවය"</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="gesture_setting_on" msgid="3455094265233870280">"ක්‍රියාත්මකයි"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ක්‍රියාවිරහිතයි"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader දැනටමත් අගුලු හැර ඇත"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ස්වයංක්‍රියව වැඩ දත්ත සමමුහුර්ත කරන්න"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"යෙදුම් වෙත දත්ත ස්වයංක්‍රියව නැවුම් කිරීමට ඉඩ දෙන්න"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"ගිණුම් සමමුහුර්තය"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"අයිතම <xliff:g id="ID_2">%2$d</xliff:g>කින් <xliff:g id="ID_1">%1$d</xliff:g>ක් සඳහා සමමුහුර්තය ක්‍රියාත්මකයි"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"සියලු අයිතම සඳහා සමමුහුර්තය ක්‍රියාත්මකයි"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"සියලු අයිතම සඳහා සමමුහුර්තය ක්‍රියාවිරහිතයි"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"කළමනාකරණය කළ උපාංග තොරතුරු"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"ඔබගේ සංවිධානය විසින් වෙනස් කිරීම් සහ සැකසීම් කළමනාකරණය කරනු ලැබේ"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> විසින් වෙනස් කිරීම් සහ සැකසීම් කළමනාකරණය කරනු ලැබේ"</string>
@@ -3572,6 +3682,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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ක්‍රියාත්මකයි"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"ක්ෂණික යෙදුම"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"ආචයන කළමනාකරු අක්‍රිය කරන්නද?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"චිත්‍රපටය සහ රූපවාහිනී යෙදුම්"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"භාවිතා කළ ඉඩ ප්‍රමාණය"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"චිත්‍රපටය සහ TV යෙදුම්"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"වාහක ප්‍රතිපාදන තතු"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"උත්ප්‍රේරක වාහක ප්‍රතිපාදන"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"අලුත් සහ උද්යෝගිමත් දේවල් මොනවාද?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ඉහළම විශේෂාංග 5 පරීක්ෂා කරන්න"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS ලියාපදිංචි තත්ත්වය"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"ලියාපදිංචි වී ඇත"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ලියාපදිංචි වී නැත"</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index cd29ee5c5ae6b0982b09e0e0c717f0b2cb851c96..43a1033e53599e047bbaa858cc47ab26cade30bb 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>
@@ -257,7 +247,7 @@
     <item msgid="6546959730920410907">"úprava denníka hovorov"</item>
     <item msgid="446877710771379667">"čítanie kalendára"</item>
     <item msgid="7674458294386319722">"úprava kalendára"</item>
-    <item msgid="8281201165558093009">"prehľadanie sietí Wi-Fi"</item>
+    <item msgid="8281201165558093009">"prehľadanie sietí Wi‑Fi"</item>
     <item msgid="8694611243479480497">"upozornenie"</item>
     <item msgid="7776439107987345446">"prehľadanie mobilných sietí"</item>
     <item msgid="514615766544675057">"volanie na telefón"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ba325cedae62220d7e17dd319a3621734b78fd96..48a2f8d6af922c62b9a2f62f373690141551ad5e 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>
@@ -42,7 +43,8 @@
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Zakázať dátové pripojenie"</string>
     <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="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>
@@ -53,7 +55,7 @@
     <string name="radio_info_ims_reg_status_not_registered" msgid="4438054067642750717">"Nezaregistrované"</string>
     <string name="radio_info_ims_feature_status_available" msgid="3687807290327566879">"K dispozícii"</string>
     <string name="radio_info_ims_feature_status_unavailable" msgid="4606182208970114368">"Nie je k dispozícii"</string>
-    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"Registrácia IMS: <xliff:g id="STATUS">%1$s</xliff:g>\nHlas cez LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nHlas cez Wi-Fi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideohovory: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nRozhranie UT: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"Registrácia IMS: <xliff:g id="STATUS">%1$s</xliff:g>\nHlas cez LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nHlas cez Wi‑Fi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideohovory: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nRozhranie UT: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1697703164394784618">"V prevádzke"</string>
     <string name="radioInfo_service_out" msgid="7999094221728929681">"Mimo prevádzky"</string>
     <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Len tiesňové volania"</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) -->
@@ -278,7 +290,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Režim v lietadle"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Ďalšie"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrôtové pripojenia a siete"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Spravovať Wi-Fi, Bluetooth, režim v lietadle, mobilné siete a siete VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Spravovať Wi‑Fi, Bluetooth, režim v lietadle, mobilné siete a siete VPN"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"Mobilné dáta"</string>
     <string name="calls_title" msgid="3544471959217176768">"Hovory"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"Správy SMS"</string>
@@ -289,9 +301,9 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Pripájať sa k dátovým službám pri roamingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Dátové pripojenie bolo prerušené, pretože ste opustili domovskú sieť a máte vypnutý dátový roaming."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Zapnúť"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Môžu sa vám účtovať vysoké poplatky."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ak povolíte dátový roaming, môžu sa vám účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ak povolíte dátový roaming, môžu sa vám účtovať vysoké poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Môžu sa vám účtovať nemalé poplatky."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Ak povolíte dátový roaming, môžu sa vám účtovať nemalé poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Ak povolíte dátový roaming, môžu sa vám účtovať nemalé poplatky za roaming!\n\nToto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Povoliť dátový roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Výber operátora"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Zvoliť sieťového operátora"</string>
@@ -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,53 +372,52 @@
     <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">"Dotknite sa senzora"</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">"Dotknite sa senzora"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Neskôr"</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 senzora 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>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Pridať ďalší"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Ďalej"</string>
-    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Okrem odomknutia svojho telefónu môžete pomocou odtlačku autorizovať nákupy a prístup aplikácií. "<annotation id="url">"Ďalšie informácie"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Okrem odomknutia svojho telefónu môžete pomocou odtlačku schvaľovať nákupy a prístup aplikácií. "<annotation id="url">"Ďalšie informácie"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Možnosť zámky obrazovky je zakázaná. Ďalšie informácie vám poskytne správca vašej organizácie. "<annotation id="admin_details">"Ďalšie podrobnosti"</annotation>\n\n"Naďalej môžete pomocou odtlačku prsta schvaľovať nákupy a prístup do aplikácií. "<annotation id="url">"Ďalšie informácie"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Nadvihnite prst, potom sa opäť dotknite senzora"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Môžete pridať ďalšie odtlačky (max. <xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Pridali ste maximálny počet odtlačkov prstov"</string>
     <string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Nie je možné pridať ďalšie odtlačky prstov"</string>
     <string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Odstrániť všetky odtlačky prstov?"</string>
-    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Pomocou odtlačkov prstov nebudete môcť odomknúť telefón, autorizovať nákupy ani sa prihlásiť do aplikácií."</string>
+    <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Pomocou odtlačkov prstov nebudete môcť odomknúť telefón, schvaľovať nákupy ani sa prihlásiť do aplikácií."</string>
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Pomocou odtlačkov prstov nebudete môcť odomknúť pracovný profil, schváliť nákupy ani sa prihlásiť do pracovných aplikácií."</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Áno, odstrániť"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Pokračujte priložením prsta."</string>
@@ -455,6 +466,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>
@@ -492,19 +505,19 @@
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funkcie ochrany zariadenia nebudú bez vášho vzoru fungovať."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funkcie ochrany zariadenia nebudú fungovať bez vášho vzoru.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, autorizovať nákupy ani sa prihlasovať do aplikácií.“"</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií.“"</string>
     <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Funkcie ochrany zariadenia nebudú fungovať bez vášho kódu PIN.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, autorizovať nákupy ani sa prihlasovať do aplikácií.“"</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií.“"</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"Funkcie ochrany zariadenia nebudú fungovať bez vášho hesla."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint" msgid="2228159168587170445">"Funkcie ochrany zariadenia nebudú fungovať bez vášho hesla.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, autorizovať nákupy ani sa prihlasovať do aplikácií.“"</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií.“"</string>
     <string name="unlock_disable_frp_warning_content_unknown" msgid="1550718040483548220">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky."</string>
     <string name="unlock_disable_frp_warning_content_unknown_fingerprint" msgid="6363091330281670692">"Funkcie ochrany zariadenia nebudú fungovať bez vašej zámky obrazovky.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, autorizovať nákupy ani sa prihlasovať do aplikácií.“"</string>
+</xliff:g>Z tohto zariadenia sa tiež odstránia vaše uložené odtlačky prstov a nebudete môcť pomocou nich ďalej odomykať svoj telefón, schvaľovať nákupy ani sa prihlasovať do aplikácií.“"</string>
     <string name="unlock_disable_frp_warning_content_pattern_profile" msgid="8682200103576359918">"Funkcie ochrany zariadenia nebudú fungovať bez vášho bezpečnostného vzoru."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint_profile" msgid="3675154828957224316">"Funkcie na ochranu zariadenia nebudú fungovať bez vášho bezpečnostného vzoru.<xliff:g id="EMPTY_LINE">
 
@@ -525,13 +538,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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>
@@ -647,7 +668,15 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Rozšírené"</string>
     <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="ble_scan_notify_text" msgid="1295915006005700650">"Systémové aplikácie a služby môžu i tak rozpoznávať zariadenia Bluetooth, aby zlepšili presnosť určovania polohy. Toto správanie môžete zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania<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>
@@ -683,8 +712,8 @@
     <string name="wifi_band_24ghz" msgid="852929254171856911">"2,4 GHz"</string>
     <string name="wifi_band_5ghz" msgid="6433822023268515117">"5 GHz"</string>
     <string name="link_speed" msgid="8896664974117585555">"%1$d Mbps"</string>
-    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> chce zapnúť Wi-Fi"</string>
-    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> chce vypnúť Wi-Fi"</string>
+    <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> chce zapnúť Wi‑Fi"</string>
+    <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> chce vypnúť Wi‑Fi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu dát, ak sa tablet dotýka iného zariadenia"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povoliť výmenu dát, ak sa telefón dotýka iného zariadenia"</string>
@@ -696,15 +725,15 @@
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nedostupné, pretože je vypnutá technológia NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Keď je táto funkcia zapnutá a podržíte zariadenia blízko pri sebe, môžete odosielať obsah aplikácií do iného zariadenia s technológiou NFC. Môžete napríklad odosielať webové stránky, videá YouTube, kontakty a ďalší obsah.\n\nStačí priložiť zariadenia k sebe (obyčajne zadnými stranami) a potom klepnúť na obrazovku. Aplikácia určí, aký obsah sa prenesie."</string>
-    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Zapnúť Wi-Fi"</string>
-    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavenia Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Zapnúť Wi‑Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavenia Wi‑Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastaviť a spravovať prístupové body bezdrôtovej siete"</string>
-    <string name="wifi_select_network" msgid="4210954938345463209">"Vybrať sieť Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6732377932749942954">"Prebieha zapínanie siete Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="8952524572499500804">"Prebieha vypínanie Wi-Fi..."</string>
+    <string name="wifi_select_network" msgid="4210954938345463209">"Vybrať sieť Wi‑Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Prebieha zapínanie siete Wi‑Fi..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Prebieha vypínanie Wi‑Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"V tejto krajine nie je pásmo 5 GHz k dispozícii"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Režim v lietadle"</string>
@@ -713,34 +742,37 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Zapínať Wi‑Fi automaticky"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi sa znova zapne v blízkosti uložených sietí vysokej kvality, ako je napríklad vaša domáca sieť"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nedostupné, pretože vyhľadávanie cez Wi‑Fi je vypnuté"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Ak sa chcete automaticky pripájať, je potrebné vybrať poskytovateľa hodnotenia siete"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vyhnúť sa nekvalitným pripojeniam"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nepoužívať sieť Wi-Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nepoužívať sieť Wi‑Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Použiť iba siete s dobrým pripojením k internetu"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Pripájať k otvoreným sieťam"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automaticky pripájať k verejným sieťam vysokej kvality"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Automaticky pripájať ku kvalitným verejným sieťam"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Ak sa chcete automaticky pripájať, je potrebné vybrať poskytovateľa hodnotenia siete"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Ak sa chcete automaticky pripájať, je potrebné vybrať kompatibilného poskytovateľa hodnotenia siete"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Inštalácia certifikátov"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Systémové aplikácie a služby môžu stále vyhľadávať siete Wi-Fi, 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Ak chcete zlepšiť presnosť polohy, zapnite vyhľadávanie sietí Wi-Fi v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Systémové aplikácie a služby môžu i tak vyhľadávať siete Wi‑Fi, aby zlepšili presnosť určovania polohy. Toto správanie môžete 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Ak chcete spresniť určovanie polohy, zapnite vyhľadávanie sietí Wi‑Fi v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Túto správu znova nezobrazovať"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi zapnuté aj v režime spánku"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi‑Fi zapnuté aj v režime spánku"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi aktívne v režime spánku"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pri zmene nastavení sa vyskytol problém"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Zlepšiť výkonnosť"</string>
-    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalizácia Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovať spotrebu batérie pri zapnutej sieti Wi-Fi"</string>
-    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Obmedz. využitie batérie sieťou Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalizácia Wi‑Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovať spotrebu batérie pri zapnutej sieti Wi‑Fi"</string>
+    <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Obmedz. využitie batérie sieťou Wi‑Fi"</string>
     <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Prepínať na mobilné dáta, keď sieť Wi‑Fi nebude mať pripojenie k internetu"</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Automaticky prepnúť na mobilné dáta"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Používať mobilné dáta, keď Wi-Fi nemá prístup k internetu. Za využité dáta vám môžu byť účtované poplatky."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Používať mobilné dáta, keď Wi‑Fi nemá prístup k internetu. Za využité dáta vám môžu byť účtované poplatky."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridať sieť"</string>
-    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Predvoľby siete Wi‑Fi"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Predvoľby Wi‑Fi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi sa automaticky znova zapne"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi sa nezapína automaticky znova"</string>
-    <string name="wifi_access_points" msgid="7053990007031968609">"Siete Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Siete Wi‑Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačidlo WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Ďalšie možnosti"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadanie kódu WPS PIN"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhľadávanie"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšírené"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"Konfigurácia"</string>
@@ -749,27 +781,27 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstrániť sieť"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upraviť sieť"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zápis na štítok NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ak chcete zobraziť dostupné siete, zapnite Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Prebieha vyhľadávanie sietí Wi-Fi..."</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Nemáte povolenie na zmenu siete Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ak chcete zobraziť dostupné siete, zapnite Wi‑Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Prebieha vyhľadávanie sietí Wi‑Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Nemáte povolenie na zmenu siete Wi‑Fi."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ďalšie"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatické nastavenie (WPS)"</string>
     <string name="wifi_show_advanced" msgid="3409422789616520979">"Rozšírené možnosti"</string>
     <string name="wifi_advanced_toggle_description_expanded" msgid="2380600578544493084">"Rozbaľovací zoznam Rozšírené možnosti. Zbalíte ho dvojitým klepnutím."</string>
     <string name="wifi_advanced_toggle_description_collapsed" msgid="1463812308429197263">"Rozbaľovací zoznam Rozšírené možnosti. Rozbalíte ho dvojitým klepnutím."</string>
-    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Chránené nastavenie siete Wi-Fi"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Chránené nastavenie siete Wi‑Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spúšťanie WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Stlačte na svojom smerovači tlačidlo Chránené nastavenie Wi-Fi. Môže byť označené písmenami WPS alebo týmto symbolom:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Zadajte na svojom smerovači Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavenia môže trvať až dve minúty."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"Stlačte na svojom smerovači tlačidlo Chránené nastavenie Wi‑Fi. Môže byť označené písmenami WPS alebo týmto symbolom:"</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Zadajte na svojom smerovači Wi‑Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavenia môže trvať až dve minúty."</string>
     <string name="wifi_wps_complete" msgid="2388138550456729134">"Spustenie WPS sa podarilo. Prebieha pripájanie k sieti…"</string>
-    <string name="wifi_wps_connected" msgid="7153432445748931183">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Pripojené k sieti Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS prebieha a dokončenie procesu môže trvať až dve mnúty"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spustenie WPS zlyhalo. Skúste to znova o niekoľko minút."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
     <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Zlyhanie overenia totožnosti. Skúste to znova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Bola rozpoznaná ďalšia relácia WPS. Skúste to znova o niekoľko minút."</string>
-    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Sieť Wi-Fi je odpojená. Nastavenie WPS bolo zrušené."</string>
+    <string name="wifi_wps_failed_wifi_disconnected" msgid="3829472117754104164">"Sieť Wi‑Fi je odpojená. Nastavenie WPS bolo zrušené."</string>
     <string name="wifi_ssid" msgid="5519636102673067319">"Názov siete"</string>
     <string name="wifi_ssid_hint" msgid="897593601067321355">"Zadajte SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečenie"</string>
@@ -801,11 +833,12 @@
     <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>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Zadajte heslo siete"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi-Fi.\n\nChcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi‑Fi.\n\nChcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Ak chcete toto nastavenie vypnúť, prejdite na položku Rozšírené v rozšírenej ponuke."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povoliť"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odmietnuť"</string>
@@ -814,8 +847,8 @@
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"PRIPOJIŤ"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"Táto sieť nemá prístup k internetu. Chcete k nej zostať pripojený/-á?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"Nabudúce sa na túto sieť nepýtať"</string>
-    <string name="lost_internet_access_title" msgid="6228530645663584505">"Sieť Wi-Fi nie je pripojená k internetu"</string>
-    <string name="lost_internet_access_text" msgid="9029649339816197345">"Ak máte slabé pripojenie Wi-Fi, môžete prepnúť na mobilnú sieť. Za využité dáta vám však môžu byť účtované poplatky."</string>
+    <string name="lost_internet_access_title" msgid="6228530645663584505">"Sieť Wi‑Fi nie je pripojená k internetu"</string>
+    <string name="lost_internet_access_text" msgid="9029649339816197345">"Ak máte slabé pripojenie Wi‑Fi, môžete prepnúť na mobilnú sieť. Za využité dáta vám však môžu byť účtované poplatky."</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"Prepnúť na mobilné dáta"</string>
     <string name="lost_internet_access_cancel" msgid="338273139419871110">"Ďalej používať Wi‑Fi"</string>
     <string name="lost_internet_access_persist" msgid="7634876061262676255">"Viac už nezobrazovať"</string>
@@ -833,8 +866,7 @@
       <item quantity="other">%d sietí</item>
       <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_titlebar" msgid="4485841401774142908">"Wi‑Fi, rozšírené"</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>
@@ -842,7 +874,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Uložené siete"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Nastavenia adresy IP"</string>
-    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Rozšírené nastavenia Wi-Fi nie sú pre tohto používateľa dostupné"</string>
+    <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Rozšírené nastavenia Wi‑Fi nie sú pre tohto používateľa dostupné"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Uložiť"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Zrušiť"</string>
     <string name="wifi_ip_settings_invalid_ip_address" msgid="2513142355364274970">"Zadajte platnú adresu IP."</string>
@@ -869,38 +901,46 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušiť pozvánku?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušiť pozvánku na spojenie s klientom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <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_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>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Chyba hotspotu siete Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastaviť hotspot Wi-Fi"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Chyba hotspotu siete Wi‑Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastaviť hotspot Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Nastavenie hotspotu Wi‑Fi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Hotspot AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Volanie cez Wi-Fi"</string>
-    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Zapnutie volania cez Wi-Fi"</string>
-    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Namiesto mobilnej siete použite Wi-Fi"</string>
+    <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Volanie cez Wi‑Fi"</string>
+    <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Zapnutie volania cez Wi‑Fi"</string>
+    <string name="wifi_calling_suggestion_summary" msgid="3765923249566552233">"Namiesto mobilnej siete použite Wi‑Fi"</string>
     <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Predvoľba volania"</string>
-    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Režim volania cez Wi-Fi"</string>
+    <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Režim volania cez Wi‑Fi"</string>
     <string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Predvoľby roamingu"</string>
     <!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
     <skip />
     <string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Predvoľby roamingu"</string>
   <string-array name="wifi_calling_mode_choices">
-    <item msgid="2124257075906188844">"Uprednostniť Wi-Fi"</item>
+    <item msgid="2124257075906188844">"Uprednostniť Wi‑Fi"</item>
     <item msgid="1335127656328817518">"Preferujem mobilné dáta"</item>
-    <item msgid="3132912693346866895">"Len Wi-Fi"</item>
+    <item msgid="3132912693346866895">"Len Wi‑Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2">
-    <item msgid="742988808283756263">"Wi-Fi"</item>
+    <item msgid="742988808283756263">"Wi‑Fi"</item>
     <item msgid="7715869266611010880">"Mobilné dáta"</item>
-    <item msgid="2838022395783120596">"Len Wi-Fi"</item>
+    <item msgid="2838022395783120596">"Len Wi‑Fi"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values">
     <item msgid="4799585830102342375">"2"</item>
@@ -908,20 +948,21 @@
     <item msgid="3194458950573886239">"0"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_without_wifi_only">
-    <item msgid="5782108782860004851">"Uprednostniť Wi-Fi"</item>
+    <item msgid="5782108782860004851">"Uprednostniť Wi‑Fi"</item>
     <item msgid="5074515506087318555">"Preferujem mobilné dáta"</item>
   </string-array>
   <string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
-    <item msgid="6132150507201243768">"Wi-Fi"</item>
+    <item msgid="6132150507201243768">"Wi‑Fi"</item>
     <item msgid="1118703915148755405">"Mobilné dáta"</item>
   </string-array>
   <string-array name="wifi_calling_mode_values_without_wifi_only">
     <item msgid="2339246858001475047">"2"</item>
     <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" 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="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>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitosti"</string>
@@ -977,6 +1018,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>
@@ -1004,23 +1046,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>
@@ -1044,8 +1085,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="7337555569694794132">"Vždy zapnuté / Zvýšené využitie batérie"</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="6978257596231155345">"Zobrazovať čas, ikony upozornení a ďalšie informácie. Zvýšené využitie batérie."</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>
@@ -1125,7 +1172,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Sila signálu"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Sieť"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC siete Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC siete Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nie je k dispozícii"</string>
@@ -1227,7 +1274,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Systém"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Preskúmať položku <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Priečinok Iné obsahuje zdieľané súbory uložené aplikáciami, súbory stiahnuté z internetu alebo prostredníctvom rozhrania Bluetooth, súbory Androidu atď. \n\nAk chcete zobraziť viditeľný obsah tohto zariadenia typu <xliff:g id="NAME">^1</xliff:g>, klepnite na položku Preskúmať."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systém zahrnuje súbory, ktoré sa používajú na fungovanie Androidu verzie <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systém obsahuje súbory, používané na fungovanie Androidu verzie <xliff:g id="VERSION">%s</xliff:g>."</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> môže mať uložené fotky, hudbu, aplikácie a ďalšie dáta, ktoré využívajú <xliff:g id="SIZE">^2</xliff:g> úložiska. \n\nAk chcete zobraziť podrobnosti, prepnite na používateľa <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavte úložisko <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Použiť ako prenosné úložisko"</string>
@@ -1299,6 +1346,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>
@@ -1324,12 +1372,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Aktuálne ste prihlásení do nasledujúcich účtov:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Na tomto zariadení sú prítomní ďalší používatelia.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operátori na eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Nezruší sa tým vaša tarifa mobilných služieb."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské dáta, je treba vymazať "<b>"úložisko USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské dáta, je treba vymazať "<b>"SD kartu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Vymazať ukladací priestor USB"</string>
     <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>
@@ -1352,26 +1405,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ľať internetové pripojenie 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>
@@ -1381,7 +1423,7 @@
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Použiť aplikáciu <xliff:g id="NEW_APP">%s</xliff:g> ako aplikáciu pre SMS?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Poskytovateľ hodnotenia siete"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Žiadne"</string>
-    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Zmeniť aplikáciu asistent pripojenia Wi-Fi?"</string>
+    <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Zmeniť aplikáciu asistent pripojenia Wi‑Fi?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Chcete spravovať sieťové pripojenia pomocou aplikácie <xliff:g id="NEW_APP">%1$s</xliff:g> namiesto aplikácie <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Chcete spravovať sieťové pripojenia pomocou aplikácie <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Neznámy operátor SIM karty"</string>
@@ -1402,17 +1444,17 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Vysoká spotreba batérie"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Nízka spotreba batérie"</string>
     <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_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="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>
+    <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>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Vyhľadávať zariadenia Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"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ť zariadenia Bluetooth."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilnej siete"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi‑Fi a mobilnej siete"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Povoliť apl. používať službu urč. polohy Google a rýchl. odhad. vašu polohu. Anonym. údaje o polohe sa budú odosielať spol. Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha je určená podľa siete Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha je určená podľa siete Wi‑Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Umožniť aplikáciám na vašom tablete určovať polohu pomocou GPS"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Umožniť aplikáciám na vašom telefóne určovať polohu pomocou GPS"</string>
@@ -1449,8 +1491,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>
@@ -1519,6 +1564,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 (<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>
@@ -1567,8 +1615,8 @@
     <string name="show_running_services" msgid="5736278767975544570">"Spustené služby"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Vyrovnávacia pamäť"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplikácia pre tiesňové volania"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Obnovenie predvolieb aplikácií"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Chcete obnoviť predvoľby aplikácií?"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Resetovať predvoľby aplikácií"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Chcete resetovať predvoľby aplikácií?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Touto akciou obnovíte predvoľby položiek:\n\n "<li>"deaktivované aplikácie,"</li>\n" "<li>"deaktivované upozornenia aplikácií,"</li>\n" "<li>"predvolené aplikácie pre rôzne akcie,"</li>\n" "<li>"obmedzenia dátových prenosov na pozadí pre aplikácie,"</li>\n" "<li>"akékoľvek obmedzenia povolení."</li>\n\n" Neprídete o žiadne dáta v aplikáciách."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Obnoviť aplikácie"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Správa pamäte"</string>
@@ -1689,6 +1737,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>
@@ -1787,6 +1839,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čítačky obrazovky, zobrazenie, ovládacie prvky interakcie"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Pre slabozrakých"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Zariadenie môžete prispôsobiť, aby zodpovedalo vašim potrebám. Tieto funkcie dostupnosti môžete neskôr zmeniť v Nastaveniach."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Zväčšiť veľkosť písma"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Čítačky obrazovky"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk a text na obrazovke"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zobrazenie"</string>
@@ -1915,6 +1968,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>
@@ -1967,24 +2026,47 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktívne"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"Zapnutý fotoaparát"</string>
     <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"Zapnuté svietidlo"</string>
-    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktívny režim"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signál mobilnej siete"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Doba používania zariadenia"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Čas prevádzky siete Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas prevádzky siete Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Čas prevádzky siete Wi‑Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas prevádzky siete Wi‑Fi"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"Podrobnosti využitia batérie"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti histórie"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Využitie batérie"</string>
     <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">"Stále prebúdza zariadenie"</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="4006631636646776488">"Telefón nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho udržuje prebudený.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu zastavíte.\n\nAk sa to zopakuje, zrejme budete musieť aplikáciu odinštalovať, aby ste zlepšili výkonnosť batérie."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Tablet nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho udržuje prebudený.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu zastavíte.\n\nAk sa to zopakuje, zrejme budete musieť aplikáciu odinštalovať, aby ste zlepšili výkonnosť batérie."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Zariadenie nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho udržuje prebudené.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu zastavíte.\n\nAk sa to zopakuje, zrejme budete musieť aplikáciu odinštalovať, aby ste zlepšili výkonnosť batérie."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefón nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP_0">%1$s</xliff:g> ho prebúdza.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu <xliff:g id="APP_1">%1$s</xliff:g> zastavíte.\n\nAk sa to zopakuje, zrejme budete musieť aplikáciu odinštalovať, aby ste zlepšili výkonnosť batérie."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tablet nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP_0">%1$s</xliff:g> ho prebúdza.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu <xliff:g id="APP_1">%1$s</xliff:g> zastavíte.\n\nAk sa to zopakuje, zrejme budete musieť aplikáciu odinštalovať, aby ste zlepšili výkonnosť batérie."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Zariadenie nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP_0">%1$s</xliff:g> ho prebúdza.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu <xliff:g id="APP_1">%1$s</xliff:g> zastavíte.\n\nAk sa to zopakuje, zrejme budete musieť aplikáciu odinštalovať, aby ste zlepšili výkonnosť batérie."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Zastaviť aplikáciu"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Vypnúť používanie aplikácie na pozadí a zastaviť ju?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefón nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP_0">%1$s</xliff:g> ho prebúdza.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu <xliff:g id="APP_1">%1$s</xliff:g> zastavíte a zabránite jej spúšťať sa na pozadí."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tablet nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP_0">%1$s</xliff:g> ho prebúdza.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu <xliff:g id="APP_1">%1$s</xliff:g> zastavíte a zabránite jej spúšťať sa na pozadí."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Zariadenie nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP_0">%1$s</xliff:g> ho prebúdza.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu <xliff:g id="APP_1">%1$s</xliff:g> zastavíte a zabránite jej spúšťať sa na pozadí."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Vypnúť"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Vypnúť prístup k polohe?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Telefón nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> stále požaduje informácie o polohe, aj keď ju práve nepoužívate.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikácii vypnete prístup k polohe."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Tablet nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> stále požaduje informácie o polohe, aj keď ju práve nepoužívate.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikácii vypnete prístup k polohe."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Zariadenie nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> stále požaduje informácie o polohe, aj keď ju práve nepoužívate.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikácii vypnete prístup k polohe."</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>
-    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="3392999761958982492">"Pohotovostný režim mobilnej siete"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
@@ -1995,12 +2077,12 @@
     <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>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Pripojenie Wi-Fi aktívne"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Pripojenie Wi‑Fi aktívne"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefón"</string>
     <string name="usage_type_data_send" msgid="8971710128438365919">"Odoslané pakety – mobilná sieť"</string>
@@ -2021,7 +2103,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"O aplikácii"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavenia aplikácie"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Nastavenia obrazovky"</string>
-    <string name="battery_action_wifi" msgid="8181553479021841207">"Nastavenia Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Nastavenia Wi‑Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Nastavenia Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Využitie batérie hlasovými hovormi"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Využitie batérie v stave nečinnosti tabletu"</string>
@@ -2032,8 +2114,8 @@
     <string name="battery_desc_camera" msgid="7375389919760613499">"Batéria využívaná fotoaparátom"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Využitie batérie obrazovkou a podsvietením"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Znížte jas obrazovky alebo interval vypnutia obrazovky"</string>
-    <string name="battery_desc_wifi" msgid="2375567464707394131">"Využitie batérie sieťou Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="7776093125855397043">"Vypnite pripojenie Wi-Fi, keď sa sieť Wi-Fi nepoužíva alebo keď nie je k dispozícii"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Využitie batérie sieťou Wi‑Fi"</string>
+    <string name="battery_sugg_wifi" msgid="7776093125855397043">"Vypnite pripojenie Wi‑Fi, keď sa sieť Wi‑Fi nepoužíva alebo keď nie je k dispozícii"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Využitie batérie technológiou Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Keď technológiu Bluetooth nepoužívate, vypnite ju"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Skúste sa pripojiť k inému zariadeniu Bluetooth"</string>
@@ -2047,12 +2129,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Prehľad od posledného úplného nabitia"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Posledné úplné nabitie"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Zostávajúci čas výdrže batérie je približný a môže sa meniť podľa spôsobu používania"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Údaje o využívaní batérie sú približné a môžu sa meniť podľa spôsobu používania"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Pri aktívnom používaní"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Na pozadí"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Využitie batérie"</string>
@@ -2102,7 +2185,7 @@
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Vyrovnávacie pamäte jadra Kernel"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
     <string name="mem_use_free_type" msgid="717708548454880840">"Voľné"</string>
-    <string name="mem_use_total" msgid="6308786055749777934">"Celkové"</string>
+    <string name="mem_use_total" msgid="6308786055749777934">"Celkove"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 hodín"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 hodín"</string>
@@ -2138,14 +2221,14 @@
     <string name="tts_reset" msgid="2661752909256313270">"Obnoviť"</string>
     <string name="tts_play" msgid="2628469503798633884">"Prehrať"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Ovládanie napájania"</string>
-    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Prebieha aktualizácia nastavenia Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Prebieha aktualizácia nastavenia Wi‑Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Prebieha aktualizácia nastavenia Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"zapnuté"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"vypnuté"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"zapínanie"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínanie"</string>
-    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_location" msgid="2974757497945178165">"Poloha"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronizácia"</string>
@@ -2172,7 +2255,7 @@
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Iba softvérové"</string>
     <string name="credentials_settings_not_available" msgid="7968275634486624215">"Poverenia nie sú pre tohto používateľa k dispozícii"</string>
     <string name="credential_for_vpn_and_apps" msgid="4168197158768443365">"Nainštalované pre sieť VPN a aplikácie"</string>
-    <string name="credential_for_wifi" msgid="6228425986551591864">"Nainštalované pre sieť Wi-Fi"</string>
+    <string name="credential_for_wifi" msgid="6228425986551591864">"Nainštalované pre sieť Wi‑Fi"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Zadajte heslo pre úložisko poverení."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Aktuálne heslo:"</string>
@@ -2192,7 +2275,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Zálohovať a obnoviť"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobné údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohovať moje dáta"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Zálohovať dáta aplikácií, heslá Wi-Fi a ďalšie nastavenia na serveroch Google"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Zálohovať dáta aplikácií, heslá Wi‑Fi a ďalšie nastavenia na serveroch Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Zálohovací účet"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Zahrnúť dáta aplikácií"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaticky obnovovať"</string>
@@ -2200,9 +2283,9 @@
     <string name="backup_inactive_title" msgid="685838037986644604">"Služba zálohovania nie je aktívna"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Momentálne nie sú záložné údaje ukladané do žiadneho účtu"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Chcete zastaviť zálohovanie hesiel Wi-Fi, záložiek, ďalších nastavení a dát aplikácií? Chcete vymazať všetky kópie na serveroch Google?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Chcete zastaviť zálohovanie dát zariadenia (ako sú heslá Wi-Fi a história hovorov) a dát aplikácií (ako sú nastavenia a súbory uložené aplikáciami)? Chcete vymazať všetky kópie na vzdialených serveroch?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"Automaticky vzdialene zálohujte údaje zariadenia (napr. heslá do sietí Wi-Fi a históriu hovorov) a údaje aplikácií (napr. nastavenia a súbory uložené aplikáciami). \n\nKeď zapnete automatické zálohovanie, údaje zariadenia a aplikácií sa budú pravidelne vzdialene ukladať. Údaje aplikácie môžu byť ľubovoľné informácie uložené aplikáciou (na základe nastavení vývojára) aj potenciálne citlivé údaje, ako sú kontakty, správy a fotky."</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Chcete zastaviť zálohovanie hesiel Wi‑Fi, záložiek, ďalších nastavení a dát aplikácií? Chcete vymazať všetky kópie na serveroch Google?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Chcete zastaviť zálohovanie dát zariadenia (ako sú heslá Wi‑Fi a história hovorov) a dát aplikácií (ako sú nastavenia a súbory uložené aplikáciami)? Chcete vymazať všetky kópie na vzdialených serveroch?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"Automaticky vzdialene zálohujte údaje zariadenia (napr. heslá do sietí Wi‑Fi a históriu hovorov) a údaje aplikácií (napr. nastavenia a súbory uložené aplikáciami). \n\nKeď zapnete automatické zálohovanie, údaje zariadenia a aplikácií sa budú pravidelne vzdialene ukladať. Údaje aplikácie môžu byť ľubovoľné informácie uložené aplikáciou (na základe nastavení vývojára) aj potenciálne citlivé údaje, ako sú kontakty, správy a fotky."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"Nastavenia správcu zariadenia"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"Aplikácia na správu zariadenia"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"Deaktivovať túto aplikáciu na správu zariadenia"</string>
@@ -2227,10 +2310,10 @@
     <string name="notification_log_title" msgid="3766148588239398464">"Denník upozornení"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tón zvonenia a vibrovanie"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Systém"</string>
-    <string name="wifi_setup_title" msgid="2970260757780025029">"Nastavenie Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Pripojenie k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Prebieha pripájanie k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Nastavenie Wi‑Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Pripojenie k sieti Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Prebieha pripájanie k sieti Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Pripojené k sieti Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Pridanie siete"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nepripojené"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Pridať sieť"</string>
@@ -2252,9 +2335,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Pripája sa..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Prejsť na ďalší krok"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"Protokol EAP nie je podporovaný."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"Počas inštalácie nie je možné konfigurovať pripojenie k sieti Wi-Fi cez protokol EAP. Po inštalácii to môžete vykonať v sekcii Nastavenia &gt; Bezdrôtové pripojenie a siete."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"Počas inštalácie nie je možné konfigurovať pripojenie k sieti Wi‑Fi cez protokol EAP. Po inštalácii to môžete vykonať v sekcii Nastavenia &gt; Bezdrôtové pripojenie a siete."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Pripájanie môže trvať niekoľko minút..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Ak chcete pokračovať v nastavovaní, klepnite na možnosť "<b>"Ďalej"</b>".\n\nAk sa chcete pripojiť k inej sieti Wi-Fi, klepnite na možnosť "<b>"Späť"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Ak chcete pokračovať v nastavovaní, klepnite na možnosť "<b>"Ďalej"</b>".\n\nAk sa chcete pripojiť k inej sieti Wi‑Fi, klepnite na možnosť "<b>"Späť"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizácia je povolená"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizácia bola zakázaná"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronizuje sa…"</string>
@@ -2332,7 +2415,7 @@
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Obmedziť prenosy na pozadí"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Povoliť prenosy na pozadí"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Samostatné použitie 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Zobraziť využitie Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"Zobraziť využitie Wi‑Fi"</string>
     <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Skryť využitie Wi‑Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Zobraziť využitie siete Ethernet"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Skryť využitie Ethernetu"</string>
@@ -2354,13 +2437,13 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nastaviť dát. limit mobil. sietí"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nastaviť dátový limit siete 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Nastaviť dát. limit sietí 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Nastaviť dát. limit Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Nastaviť dát. limit Wi‑Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
-    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilné"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
-    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobil"</string>
+    <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobilné"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Žiadne"</string>
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobilné dáta"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dátové prenosy 2G a 3G"</string>
@@ -2382,13 +2465,13 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dátum obnovenia cyklu spotreby"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Dátum v každom mesiaci:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nastaviť"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastaviť upozornenie o využívaní údajov"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavenie limitu spotreby dát"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Upozornenie na spotrebu dát"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limit spotreby dát"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Obmedzenie spotreby dát"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Po dosiahnutí nastaveného limitu váš tablet vypne mobilné dátové pripojenie.\n\nKeďže spotrebu dát meria tablet, ale váš operátor môže spotrebu vyčísliť inak, je vhodné si nastaviť nižší limit."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Po dosiahnutí nastaveného limitu váš telefón vypne mobilné dátové pripojenie.\n\nKeďže spotrebu dát meria telefón, ale váš operátor môže spotrebu vyčísliť inak, je vhodné nastaviť si nižší limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Obmedziť prenosy na pozadí?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi."</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi‑Fi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi‑Fi.\n\nToto nastavenie platí pre všetkých používateľov tabletu."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi‑Fi.\n\nToto nastavenie platí pre všetkých používateľov telefónu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozorn."</font></string>
@@ -2402,8 +2485,8 @@
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Obmedzenia siete"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Keď sú dátové prenosy na pozadí obmedzené, zaobchádzame s meranými sieťami rovnako ako s mobilnými. Pred sťahovaním veľkých súborov pomocou týchto sietí vás môžu aplikácie upozorniť."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilné siete"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Merané siete Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ak chcete vybrať merané siete, zapnite Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Merané siete Wi‑Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Ak chcete vybrať merané siete, zapnite Wi‑Fi."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Účtovanie dát operátorom sa môže líšiť od údajov zariadenia."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tiesňové volanie"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Späť na hovor"</string>
@@ -2545,7 +2628,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Používateľ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Obmedzený profil"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Pridať nového používateľa?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"Toto zariadenie môžete zdieľať s inými ľuďmi tak, že vytvoríte ďalších používateľov. Každý používateľ má svoje prostredie, ktoré si môže prispôsobiť aplikáciami, tapetou atď. Môže tiež upraviť nastavenia zariadenia (napr. sieť Wi-Fi), ktoré ovplyvnia všetkých ostatných používateľov.\n\nKeď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nKaždý používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"Toto zariadenie môžete zdieľať s inými ľuďmi tak, že vytvoríte ďalších používateľov. Každý používateľ má svoje prostredie, ktoré si môže prispôsobiť aplikáciami, tapetou atď. Môže tiež upraviť nastavenia zariadenia (napr. sieť Wi‑Fi), ktoré ovplyvnia všetkých ostatných používateľov.\n\nKeď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nKaždý používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Keď pridáte nového používateľa, musí si nastaviť vlastný priestor.\n\nAkýkoľvek používateľ môže aktualizovať aplikácie všetkých ostatných používateľov."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Chcete teraz nastaviť používateľa?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Uistite sa, že je daná osoba k dispozícii a môže si na zariadení nastaviť svoj priestor."</string>
@@ -2614,7 +2697,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>
@@ -2643,8 +2726,8 @@
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Riadi: <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Táto aplikácia má prístup k vašim účtom"</string>
     <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Táto aplikácia má prístup k vašim účtom. Riadené aplikáciou <xliff:g id="APP">%1$s</xliff:g>."</string>
-    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Siete Wi-Fi a mobilné siete"</string>
-    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Povoliť úpravu nastavení sietí Wi-Fi a mobilných sietí"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Siete Wi‑Fi a mobilné siete"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Povoliť úpravu nastavení sietí Wi‑Fi a mobilných sietí"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Povoliť úpravy párovania a nastavení rozhrania Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
@@ -2706,9 +2789,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>
@@ -2758,10 +2844,11 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"odomknúť prejdením prstom, heslo, vzor, pin"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"pracovná výzva, práca, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"pracovný profil, spravovaný profil, zjednotiť, zjednotenie, práca, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gesto"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gestá"</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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavenie štítka NFC pre Wi-Fi"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</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>
     <string name="status_invalid_password" msgid="2575271864572897406">"Neplatné heslo, skúste to znova."</string>
@@ -2845,7 +2932,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>
@@ -2860,6 +2948,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>
@@ -2889,8 +2981,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>
@@ -2978,6 +3068,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Iba od kontaktov s hviezdičkou"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Žiadne"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Budíky"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Budíky sú vždy prioritné a vydávajú zvuk"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Pripomenutia"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Udalosti"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Všetci volajúci"</string>
@@ -3016,7 +3107,7 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Keď je obrazovka vypnutá"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Keď je obrazovka zapnutá alebo vypnutá"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"Odoslať spätnú väzbu o zariadení"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"Spätná väzba o zariadení"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Zadajte PIN správcu"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Vypnuté"</string>
@@ -3029,11 +3120,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>
@@ -3041,7 +3127,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>
@@ -3167,6 +3253,19 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Upozornenia o spotrebe"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Zobraziť úplné využitie zariadenia"</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 sa správajú nezvyčajne</item>
+      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
+      <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikácií sa správa nezvyčajne</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> aplikácia sa správa nezvyčajne</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>
@@ -3261,8 +3360,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>
@@ -3338,22 +3437,35 @@
     <string name="condition_expand_show" msgid="608202020023489939">"Zobraziť"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"Skryť"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot je zapnutý"</string>
-    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prenosný hotspot Wi-Fi <xliff:g id="ID_1">%1$s</xliff:g> je aktívny, pripojenie Wi-Fi pre toto zariadenie je vypnuté."</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prenosný hotspot Wi‑Fi <xliff:g id="ID_1">%1$s</xliff:g> je aktívny, pripojenie Wi‑Fi pre toto zariadenie je vypnuté."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Režim v lietadle je zapnutý"</string>
-    <string name="condition_airplane_summary" msgid="5561586417832393666">"Siete Wi-Fi, Bluetooth a mobilná sieť sú vypnuté. Nemôžete telefonovať ani sa pripojiť k internetu."</string>
+    <string name="condition_airplane_summary" msgid="5561586417832393666">"Siete Wi‑Fi, Bluetooth a mobilná sieť sú vypnuté. Nemôžete telefonovať ani sa pripojiť k internetu."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Nastavenie Nerušiť je zapnuté (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Šetrič batérie je zapnutý"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Znížený výkon. Služby určovania polohy a dáta na pozadí sú vypnuté."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Mobilné dáta sú vypnuté"</string>
-    <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet je k dispozícii len prostredníctvom siete Wi-Fi"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet je k dispozícii len prostredníctvom siete Wi‑Fi"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"Šetrič dát je zapnutý"</string>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"Dáta na pozadí sú dostupné iba prostredníctvom siete Wi-Fi. Môže to ovplyvniť niektoré aplikácie či služby, keď sieť Wi-Fi nie je dostupná."</string>
+    <string name="condition_bg_data_summary" msgid="656957852895282228">"Dáta na pozadí sú dostupné iba prostredníctvom siete Wi‑Fi. Môže to ovplyvniť niektoré aplikácie či služby, keď sieť Wi‑Fi nie je dostupná."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"Pracovný profil je vypnutý"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"Aplikácie, synchronizácia na pozadí a ďalšie funkcie súvisiace s pracovným profilom sú vypnuté."</string>
     <string name="condition_night_display_title" msgid="5599814941976856183">"Nočný režim je zapnutý"</string>
     <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>
@@ -3362,18 +3474,17 @@
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizácie systému"</string>
     <string name="usage" msgid="2977875522080448986">"Spotreba"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Spotreba mobilných dát"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Spotreba dát cez Wi-Fi"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Spotreba dát cez Wi‑Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Spotreba dát prostredníctvom ethernetu"</string>
-    <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
+    <string name="wifi" msgid="1081550856200013637">"Wi‑Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> mobilných dát"</string>
-    <string name="wifi_data_template" msgid="6265570748799357386">"Dáta Wi-Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
+    <string name="wifi_data_template" msgid="6265570748799357386">"Dáta Wi‑Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"Ethernetové dáta: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <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>
@@ -3382,7 +3493,7 @@
       <item quantity="one">1 obmedzenie</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Účtovanie dát operátorom sa môže líšiť od účtovania na zariadení"</string>
-    <string name="data_used_template" msgid="3245919669966296505">"Využité <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="data_used_template" msgid="3245919669966296505">"Spotreba <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Nastaviť dátové upozornenie"</string>
     <string name="data_warning" msgid="209133958008062117">"Dátové upozornenie"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastaviť dátový limit"</string>
@@ -3397,7 +3508,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>
@@ -3463,8 +3574,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>
@@ -3541,25 +3651,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Zapnuté"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Vypnuté"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader je už odomknutý"</string>
@@ -3580,6 +3697,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automaticky synchronizovať pracovné dáta"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Umožniť aplikáciám automatické obnovovanie dát"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Synchronizácia účtu"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Synchronizácia je zapnutá pre <xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$d</xliff:g> položiek"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Synchronizácia je zapnutá pre všetky položky"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Synchronizácia je vypnutá pre všetky položky"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informácie o spravovanom zariadení"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Zmeny a nastavenia spravované vašou organizáciou"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Zmeny a nastavenia spravované organizáciou <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3674,6 +3794,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>
@@ -3687,5 +3808,11 @@
     <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="698847081680980774">"Aké sú najaktuálnejšie novinky?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Prezrite si 5 najlepších funkcií"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Stav registrácie IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrované"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Neregistrované"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index a07385c934a08412731589fd351f02e69cb6d7ef..4e034f3abf4231194556ddbd4d50ce9462b8560b 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 cf441770a8dd07af8a58c19f532935c285dff57a..b23b67ff38ae6050d75bc57475817a529945f18e 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Pozneje"</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 +466,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 +538,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="1688030823464420974">"Če pri naslednjem poskusu vnesete napačen vzorec, bodo podatki v napravi izbrisani."</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Če pri naslednjem poskusu vnesete napačno kodo PIN, bodo podatki v napravi izbrisani."</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Če pri naslednjem poskusu vnesete napačno geslo, bodo podatki v 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="5047439819181833824">"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 +669,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>
@@ -713,11 +742,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Samodejno vklopi Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi se bo samodejno znova vklopil v bližini zanesljivih shranjenih omrežij, na primer vašega domačega omrežja"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ni na voljo, ker je iskanje omrežij Wi‑Fi izklopljeno"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Za uporabo te funkcije morate izbrati ponudnika ocenjevanja omrežij"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izogni se slabim povezavam"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Omrežje Wi-Fi uporabi samo, če je na voljo dobra internetna povezava"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Uporaba samo omrežij z dobro internetno povezavo"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Povezovanje z odprtimi omrežji"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Samodejno povezovanje z zanesljivimi javnimi omrežji"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Za uporabo te funkcije morate izbrati ponudnika ocenjevanja omrežij"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Za uporabo te funkcije morate izbrati združljivega ponudnika ocenjevanja omrežij"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Namestitev potrdil"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Zaradi večje natančnosti ugotavljanja lokacije lahko sistemske aplikacije in storitve še vedno iščejo omrežja Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Če želite izboljšati natančnost ugotavljanja lokacije, v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastavitvah iskanja<xliff:g id="LINK_END_1">LINK_END</xliff:g> vklopite iskanje omrežij Wi-Fi."</string>
@@ -801,6 +833,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>
@@ -834,7 +867,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>
@@ -871,9 +903,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>
@@ -920,6 +960,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>
@@ -977,6 +1018,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>
@@ -1004,23 +1046,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">"Urnik"</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>
@@ -1044,8 +1085,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="7337555569694794132">"Vedno vključeno/višja poraba energije akumulatorja"</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="6978257596231155345">"Prikaz ure, ikon obvestil in drugih informacij. Višja poraba energije akumulatorja."</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>
@@ -1227,7 +1274,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Razišči: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Med druge datoteke spadajo datoteke v skupni rabi, ki jih shranijo aplikacije, datoteke, ki jih prenesete iz interneta ali prek Bluetootha, datoteke sistema Android in druge. \n\nČe si želite ogledati vidno vsebino te naprave za shranjevanje <xliff:g id="NAME">^1</xliff:g>, se dotaknite »Razišči«."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem vključuje datoteke, ki se uporabljajo za izvajanje Androida različice <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem vključuje datoteke, ki se uporabljajo za izvajanje Androida različice <xliff:g id="VERSION">%s</xliff:g>."</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"Uporabnik <xliff:g id="USER_0">^1</xliff:g> je morda shranil fotografije, glasbo, aplikacije ali druge podatke, za kar je porabil <xliff:g id="SIZE">^2</xliff:g> shrambe. \n\nČe si želite ogledati podrobnosti, preklopite na uporabnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Nastavitev imena za: <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Uporaba kot prenosna shramba"</string>
@@ -1299,6 +1346,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>
@@ -1324,12 +1372,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"V napravi so prisotni drugi uporabniki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operaterji na digitalni kartici e-SIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Izbriši pomnilnik USB"</string>
     <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>
@@ -1352,26 +1405,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>
@@ -1404,7 +1446,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>
@@ -1449,8 +1491,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>
@@ -1519,6 +1564,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 aplikacije (<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">"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>
@@ -1689,6 +1737,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>
@@ -1787,6 +1839,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Bralniki zaslona, prikaz, interakcija"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Nastavitve vidnosti"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"To napravo lahko prilagodite svojim potrebam. Te funkcije za ljudi s posebnimi potrebami lahko pozneje spremenite v nastavitvah."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Povečanje velikosti pisave"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Bralniki zaslona"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvok in besedilo na zaslonu"</string>
     <string name="display_category_title" msgid="685461049938269166">"Zaslon"</string>
@@ -1915,6 +1968,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>
@@ -1981,6 +2040,29 @@
     <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="4006631636646776488">"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 tako, da zaustavite aplikacijo.\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="2369957934555162428">"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 tako, da zaustavite aplikacijo.\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="6195430620406365292">"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 tako, da zaustavite aplikacijo.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefon ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP_0">%1$s</xliff:g> nenehno prebuja telefon.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo <xliff:g id="APP_1">%1$s</xliff:g>.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tablični računalnik ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP_0">%1$s</xliff:g> nenehno prebuja tablični računalnik.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo <xliff:g id="APP_1">%1$s</xliff:g>.\n\nČe se težava ponovi, boste za podaljšanje časa delovanja akumulatorja morda morali aplikacijo odstraniti."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Naprava ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP_0">%1$s</xliff:g> nenehno prebuja napravo.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Želite izklopiti izvajanje v ozadju in zaustaviti aplikacijo?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefon ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP_0">%1$s</xliff:g> nenehno prebuja telefon.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo <xliff:g id="APP_1">%1$s</xliff:g> in preprečite njeno izvajanje v ozadju."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tablični računalnik ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP_0">%1$s</xliff:g> nenehno prebuja tablični računalnik.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo <xliff:g id="APP_1">%1$s</xliff:g> in preprečite njeno izvajanje v ozadju."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Naprava ne more ustrezno upravljati porabe energije akumulatorja, ker aplikacija <xliff:g id="APP_0">%1$s</xliff:g> nenehno prebuja napravo.\n\nTežavo lahko poskusite rešiti tako, da zaustavite aplikacijo <xliff:g id="APP_1">%1$s</xliff:g> in preprečite njeno izvajanje 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1995,7 +2077,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>
@@ -2047,12 +2129,13 @@
     <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> porabil: <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razčlenitev od zadnje napolnjenosti akumulatorja"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Zadnja polna napolnjenost"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Preostali čas delovanja akumulatorja je približen, ker je odvisen od uporabe in se lahko spremeni."</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Podatki o uporabi akumulatorja so približni in se lahko spremenijo glede na uporabo naprave"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Med aktivno uporabo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Med izvajanjem v ozadju"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Poraba akumulatorja"</string>
@@ -2380,10 +2463,10 @@
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Želite izklopiti samodejno sinhroniziranje podatkov?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"S tem zmanjšate količino prenesenih podatkov in porabo akumulatorja, vendar boste morali vsak posamezen račun sinhronizirati ročno, da dobite najnovejše podatke. Prav tako ne boste dobili obvestil o posodobitvah."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum ponastavitve cikla porabe"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum vsakega meseca:"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum v posameznem mesecu:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nastavi"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastavi opozorilo o uporabi podatkov"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavitev omejitve količine prenesenih podatkov"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavi omejitve količine prenesenih podatkov"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Omejitev porabe podatkov"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablični računalnik bo izklopil prenos podatkov v mobilnih omrežjih, ko bo dosežena nastavljena omejitev.\n\nKer količino prenesenih podatkov meri tablični računalnik, operater pa jo morda drugače, priporočamo, da nastavite nekoliko manjšo omejitev."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon bo izklopil prenos podatkov v mobilnih omrežjih, ko bo dosežena nastavljena omejitev.\n\nKer količino prenesenih podatkov meri telefon, operater pa jo morda drugače, priporočamo, da nastavite nekoliko manjšo omejitev."</string>
@@ -2548,7 +2631,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"To napravo lahko daste v skupno rabo z drugimi, tako da ustvarite dodatne uporabnike. Vsak ima svoj prostor, ki ga lahko prilagodi z aplikacijami, ozadji in drugim. Uporabniki lahko tudi prilagodijo nastavitve naprave, ki vplivajo na vse, na primer nastavitve omrežja Wi-Fi.\n\nKo dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Ko dodate novega uporabnika, mora ta nastaviti svoj prostor.\n\nVsak uporabnik lahko posodobi aplikacije za vse druge uporabnike."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Želite uporabnika nastaviti zdaj?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Prepričajte se, da ima oseba čas za nastavitev svojega prostora v napravi"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Prepričajte se, da ima oseba čas za nastavitev svojega prostora v napravi."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Želite zdaj nastaviti profil?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Želim nastaviti zdaj"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne zdaj"</string>
@@ -2614,7 +2697,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>
@@ -2706,9 +2789,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, prenos 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>
@@ -2758,9 +2844,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"podrsanje za odklepanje, geslo, vzorec, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"delovna preizkušnja, delo, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"delovni profil, upravljan profil, poenotiti, poenotenje, delo, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"poteza"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"poteze"</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_assist_gesture_launch" msgid="813968759791342591">"poteza"</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>
@@ -2836,16 +2923,17 @@
     <string name="notification_pulse_title" msgid="1905382958860387030">"Utripajoča lučka"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na zaklenjenem zaslonu"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaži vso vsebino obvestil"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrij občutljivo vsebino obvestil"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrij vsebino občutljivih obvestil"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Sploh ne prikazuj obvestil"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kako naj se obvestila prikazujejo, ko je naprava zaklenjena?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Obvestila"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Pokaži vso vsebino obvestil za delovni profil"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Skrij občutljivo vsebino obvest. za delovni profil"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Skrij vsebino občutljivih obvest. za delovni profil"</string>
     <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>
@@ -2860,6 +2948,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>
@@ -2889,8 +2981,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>
@@ -2978,6 +3068,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Samo od stikov, označenih z zvezdico"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Nič"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmi so vedno prednostni in predvajajo zvok"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Opomniki"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Dogodki"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Vsi klicatelji"</string>
@@ -3029,11 +3120,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>
@@ -3041,7 +3127,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>
@@ -3167,6 +3253,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 potratne aplikacije</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>
@@ -3197,7 +3296,7 @@
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Prenos fotografij ali datotek, če MTP ni podprt (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"Uporaba naprave kot vmesnik MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Uporaba te naprave kot vmesnik MIDI"</string>
-    <string name="usb_use" msgid="3256040963685055320">"Uporaba povezave USB za:"</string>
+    <string name="usb_use" msgid="3256040963685055320">"Povezavo USB uporabi za:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Polnjenje te naprave"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Napajanje"</string>
@@ -3261,8 +3360,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">"Ni dovoljeno"</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>
@@ -3354,6 +3453,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>
@@ -3372,8 +3484,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>
@@ -3385,7 +3496,7 @@
     <string name="data_used_template" msgid="3245919669966296505">"Porabljeno: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Nastavi opozorilo za prenos podatkov"</string>
     <string name="data_warning" msgid="209133958008062117">"Opozorilo za prenos podatkov"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"Nastavitev omej. prenosa pod."</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"Nastavi omej. prenosa pod."</string>
     <string name="data_limit" msgid="1885406964934590552">"Omejitev prenosa podatkov"</string>
     <string name="data_usage_template" msgid="392191945602400904">"Porabljeno: <xliff:g id="ID_1">%1$s</xliff:g> v obdobju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguriranje"</string>
@@ -3397,7 +3508,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>
@@ -3463,8 +3574,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>
@@ -3541,25 +3651,32 @@
     <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">"Preverjanje telefona z dvigom"</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, dvignite 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, dvignite 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Vklopljeno"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Izklopljeno"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Nalagalnik zagona je že odklenjen"</string>
@@ -3580,6 +3697,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Samodejno sinhroniziranje delovnih podatkov"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Omogoči, da aplikacije samodejno osvežijo podatke"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sinhronizacija računa"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinhronizacija je vklopljena za <xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$d</xliff:g> elementov"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sinhronizacija je vklopljena za vse elemente"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sinhronizacija je izklopljena za vse elemente"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Podatki o upravljani napravi"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Spremembe in nastavitve, ki jih upravlja vaša organizacija"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Spremembe in nastavitve, ki jih upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3668,12 +3788,13 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Datoteke"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Uporabljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"uporabljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"uporab."</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Počisti aplikacijo"</string>
     <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>
@@ -3687,5 +3808,11 @@
     <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="698847081680980774">"Odkrijte zanimive novosti"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Spoznajte pet najuporabnejših funkcij"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Stanje registracije IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrirana"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ni registrirana"</string>
 </resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 2340b344e6b6521825f80c3956af9ea3118d3816..7324054717290f73840a0a662fc30cde8cb489e5 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 46618db01df21be08dda8b998d1e80dbf1ebe556..c52d9292183bffd9ccddc0de9c72e22a3cfad338 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,7 @@
     <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>
+    <string name="security_settings_title" msgid="4918904614964215087">"Siguria dhe vendndodhja"</string>
     <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 +366,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Bëje më vonë"</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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktivizo automatikisht Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi do të aktivizohet përsëri në afërsi të rrjeteve të ruajtura me cilësi të lartë, si p.sh. në rrjetin e shtëpisë"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nuk ofrohet sepse skanimi i Wi-Fi është çaktivizuar"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Për ta përdorur, zgjidh një ofrues të vlerësimit të rrjetit"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Shmang lidhjet e dobëta"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Mos e përdor një rrjet Wi‑Fi nëse nuk ka lidhje të mirë interneti"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Përdor vetëm rrjete që kanë lidhje të mirë interneti"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Lidhu me rrjete të hapura"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Lidhu automatikisht me rrjete publike me cilësi të lartë"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Për ta përdorur, zgjidh një ofrues të vlerësimit të rrjetit"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Për ta përdorur, zgjidh një ofrues të përputhshëm të vlerësimit të rrjetit"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalo certifikatat"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Për të përmirësuar saktësinë e vendndodhjes, aplikacionet dhe shërbimet e sistemit mund të skanojnë akoma për rrjetet Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Për të përmirësuar saktësinë e vendndodhjes, aktivizo skanimin e Wi-Fi 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>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Gjithmonë aktive / Përdorim i rritur i baterisë"</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="6978257596231155345">"Shfaq orën, ikonat e njoftimeve dhe informacione të tjera. Përdorim i rritur i baterisë."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Ka përdorues të tjerë të pranishëm në këtë pajisje.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzika"</li>\n<li>"Fotografitë"</li>\n<li>"Të dhëna të tjera të përdoruesit"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatorët celularë në eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Kjo nuk do ta anulojë planin tënd të shërbimit celular."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"hapësira ruajtëse e USB-së"</b>" duhet të spastrohet."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"karta SD"</b>" duhet të spastrohet."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Fshi hapësirën ruajtëse të USB-së"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Lexues ekrani, ekran, kontrolle interaktive"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Cilësimet e shikimit"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Mund ta personalizosh këtë pajisje për t\'iu përshtatur nevojave të tua. Këto funksione të qasjes mund të ndryshohen më vonë te \"Cilësimet\"."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Rrit madhësinë e fontit"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Lexuesit e ekranit"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audioja dhe teksti në ekran"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekrani"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"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.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh 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="2369957934555162428">"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.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh 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="6195430620406365292">"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.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh 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_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefoni yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi <xliff:g id="APP_0">%1$s</xliff:g> vazhdon ta zgjojë telefonin.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Tableti yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi <xliff:g id="APP_0">%1$s</xliff:g> vazhdon ta zgjojë tabletin.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh <xliff:g id="APP_1">%1$s</xliff:g>.\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_wakeup_alarm" product="device" msgid="2854944538238649520">"Pajisja jote nuk mund ta menaxhojë baterinë në mënyrë normale pasi <xliff:g id="APP_0">%1$s</xliff:g> vazhdon ta zgjojë pajisjen.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh <xliff:g id="APP_1">%1$s</xliff:g>.\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="6936542136153283692">"Të çaktivizohet përdorimi në sfond dhe të ndalohet aplikacioni?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefoni yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP_0">%1$s</xliff:g> vazhdon ta zgjojë telefonin.\n\nQë të provosh të rregullosh këtë problem, mund të ndalosh <xliff:g id="APP_1">%1$s</xliff:g> dhe të mos lejosh që ai të ekzekutohet në sfond."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Tableti yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP_0">%1$s</xliff:g> vazhdon ta zgjojë tabletin.\n\nQë të provosh të rregullosh këtë problem, mund të ndalosh <xliff:g id="APP_1">%1$s</xliff:g> dhe të mos lejosh që ai të ekzekutohet në sfond."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Pajisja jote nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP_0">%1$s</xliff:g> vazhdon ta zgjojë pajisjen.\n\nQë të provosh të rregullosh këtë problem, mund të ndalosh <xliff:g id="APP_1">%1$s</xliff:g> dhe të mos lejosh që ai të 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analiza që nga ngarkimi i fundit i plotë"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Ngarkimi i fundit i plotë"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Koha e mbetur e baterisë është e përafërt dhe mund të ndryshojë sipas përdorimit"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Të dhënat e përdorimit të baterisë janë të përafërta dhe mund të ndryshojnë bazuar në përdorimin"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Kur është në përdorim aktiv"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Kur është në sfond"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Përdorimi i baterisë"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"rrëshqit për ta shkyçur, fjalëkalim, motiv, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"sfidë në punë, punë, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profili i punës, profili i menaxhuar, unifiko, unifikim, punë, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"gjesti"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"gjestet"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"paguaj, trokit, pagesa"</string>
     <string name="keywords_backup" msgid="470070289135403022">"rezervim, rezervo"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gjesti"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Vetëm nga kontaktet me yll"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Asnjë"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmet"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmet janë gjithmonë me prioritet dhe lëshojnë tingull"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Alarmet rikujtuese"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Ngjarjet"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Të gjithë telefonuesit"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3118,7 +3211,7 @@
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Karikuar këtë pajisje"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Vetëm karikoje këtë pajisje"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Furnizuar me energji elektrike"</string>
-    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Ngarkoje pajisjen e lidhur. Funksionon vetëm me pajisjet që mbështesin ngarkimin me USB."</string>
+    <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Karikoje pajisjen e lidhur. Funksionon vetëm me pajisjet që mbështesin ngarkimin me USB."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Transferuar skedarë"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Transfero skedarët te një pajisje tjetër"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Transferuar fotografi (PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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ë dorë."</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 telefonin në dorë."</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Aktiv"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Joaktiv"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Ngarkuesi i sistemit është i shkyçur tashmë"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sinkronizo automatikisht të dhënat e punës"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Lejo që aplikacionet të rifreskojnë automatikisht të dhënat"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sinkronizimi i llogarisë"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinkronizimi aktiv për <xliff:g id="ID_1">%1$d</xliff:g> nga <xliff:g id="ID_2">%2$d</xliff:g> artikuj"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sinkronizimi aktiv për të gjithë artikujt"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sinkronizimi joaktiv për të gjithë artikujt"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Informacioni i pajisjes së menaxhuar"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Ndryshimet dhe cilësimet menaxhohen nga organizata jote"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Ndryshimet dhe cilësimet menaxhohen nga <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Çfarë ka të reja dhe emocionuese?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Shiko 5 funksionet kryesore"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Gjendja e regjistrimit të IMS-së"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Regjistruar"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Paregjistruar"</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 62129103e20e2dac99fb6a53bd0e74a459fbf922..30853979fb0da96415a1232f075eb6ae01a59bac 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 654fd2e495c9b9f87ad52029ef057bb3cbe39663..26738a2d5327d5edc06a2d8106436611de08c79d 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>
@@ -349,7 +361,7 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Додај отисак прста"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"закључавање екрана"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one">Подешен је <xliff:g id="COUNT_1">%1$d</xliff:g> отисак прстију </item>
+      <item quantity="one">Подешен је <xliff:g id="COUNT_1">%1$d</xliff:g> отисак прста </item>
       <item quantity="few">Подешена су <xliff:g id="COUNT_1">%1$d</xliff:g> отиска прстију</item>
       <item quantity="other">Подешено је <xliff:g id="COUNT_1">%1$d</xliff:g> отисака прстију</item>
     </plurals>
@@ -357,40 +369,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Урадићу то касније"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Прескочити подешавање отиска прста?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Изабрали сте да користите отисак прста као један начин за откључавање телефона. Ако сада прескочите, мораћете касније да обавите ово подешавање. За подешавање је потребно само око минут времена."</string>
     <string name="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 +463,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 +535,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="1688030823464420974">"Ако у следећем покушају унесете нетачан шаблон, избрисаћемо податке са овог уређаја"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ако у следећем покушају унесете нетачан PIN, избрисаћемо податке са овог уређаја"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Ако унесете нетачну лозинку при следећем покушају, избрисаћемо податке са овог уређаја"</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="5047439819181833824">"Превише нетачних покушаја. Избрисаћемо податке са овог уређаја."</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 +658,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>
@@ -702,11 +731,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Аутоматски укључи Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi ће се поново укључити у близини сачуваних мрежа високог квалитета, као што је кућна мрежа"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недоступно је јер је искључено Wi‑Fi скенирање"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Да бисте користили функцију, изаберите добављача оцене мреже"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Избегавај лоше везе"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Не користи Wi-Fi мрежу ако нема добру интернет везу"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Коришћење само оних мрежа које имају добру интернет везу"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Повезуј се са отвореним мрежама"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Аутоматски се повезуј са јавним мрежама високог квалитета"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Да бисте користили функцију, изаберите добављача оцене мреже"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Да бисте користили функцију, изаберите компатибилног добављача оцене мреже"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталирај сертификате"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Да би побољшале тачност локације, системске апликације и услуге ће и даље скенирати 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Да бисте побољшали прецизност локације, укључите Wi-Fi скенирање у <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>подешавањима скенирања<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -790,6 +822,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>
@@ -822,7 +855,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>
@@ -859,9 +891,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>
@@ -908,6 +948,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>
@@ -965,6 +1006,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>
@@ -992,23 +1034,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>
@@ -1032,8 +1073,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="7337555569694794132">"Увек укључено/већа потрошња батерије"</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="6978257596231155345">"Приказује време, иконе обавештења и друге информације. Већа потрошња батерије."</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>
@@ -1286,6 +1333,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>
@@ -1310,12 +1358,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На овом уређају су присутни и други корисници.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фотографије"</li>\n<li>"Други кориснички подаци"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Мобилни оператери на eSIM-у"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"На тај начин нећете отказати мобилни тарифни пакет."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете "<b>"USB меморију"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете садржај "<b>"SD картице"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Избриши USB меморију"</string>
     <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>
@@ -1338,26 +1391,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>
@@ -1390,7 +1432,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>
@@ -1435,8 +1477,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>
@@ -1505,6 +1550,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>
@@ -1674,6 +1722,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>
@@ -1772,6 +1824,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Читачи екрана, екран, контроле интеракције"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Подешавања за вид"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Можете да прилагодите овај уређај према потребама. Те функције приступачности можете касније да промените у Подешавањима."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Повећајте величину фонта"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Читачи екрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Звук и текст на екрану"</string>
     <string name="display_category_title" msgid="685461049938269166">"Приказ"</string>
@@ -1894,6 +1947,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>
@@ -1908,7 +1966,7 @@
     <string name="print_service_disabled" msgid="7739452396114245222">"Услуга је онемогућена"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"Задаци за штампање"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Задатак за штампање"</string>
-    <string name="print_restart" msgid="8373999687329384202">"Поново покрени"</string>
+    <string name="print_restart" msgid="8373999687329384202">"Рестартуј"</string>
     <string name="print_cancel" msgid="3621199386568672235">"Откажи"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"Штампа се <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1952,14 +2010,37 @@
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Време буђења уређаја"</string>
-    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi на време"</string>
-    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi на време"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Време од укључивања Wi-Fi мреже"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Време од укључивања Wi-Fi мреже"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"Напредна потрошња батерије"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Детаљи историје"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Потрошња батерије"</string>
     <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="4006631636646776488">"Телефон не може да управља батеријом на уобичајен начин јер му <xliff:g id="APP">%1$s</xliff:g> не дозвољава да пређе у стање спавања.\n\nДа бисте решили овај проблем, можете да зауставите ту апликацију.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Таблет не може да управља батеријом на уобичајен начин јер му <xliff:g id="APP">%1$s</xliff:g> не дозвољава да пређе у стање спавања.\n\nДа бисте решили овај проблем, можете да зауставите ту апликацију.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Уређај не може да управља батеријом на уобичајен начин јер му <xliff:g id="APP">%1$s</xliff:g> не дозвољава да пређе у стање спавања.\n\nДа бисте решили овај проблем, можете да зауставите ту апликацију.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Телефон не може да управља батеријом на уобичајен начин јер га <xliff:g id="APP_0">%1$s</xliff:g> стално буди.\n\nДа бисте решили овај проблем, можете да зауставите апликацију <xliff:g id="APP_1">%1$s</xliff:g>.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Таблет не може да управља батеријом на уобичајен начин јер га <xliff:g id="APP_0">%1$s</xliff:g> стално буди.\n\nДа бисте решили овај проблем, можете да зауставите апликацију <xliff:g id="APP_1">%1$s</xliff:g>.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Уређај не може да управља батеријом на уобичајен начин јер га <xliff:g id="APP_0">%1$s</xliff:g> стално буди.\n\nДа бисте решили овај проблем, можете да зауставите апликацију <xliff:g id="APP_1">%1$s</xliff:g>.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Заустави апликацију"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Желите ли да искључите коришћење у позадини?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Телефон не може да управља батеријом на уобичајен начин јер га <xliff:g id="APP_0">%1$s</xliff:g> стално буди.\n\nДа бисте решили овај проблем, можете да зауставите апликацију <xliff:g id="APP_1">%1$s</xliff:g> и спречите је да ради у позадини."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Таблет не може да управља батеријом на уобичајен начин јер га <xliff:g id="APP_0">%1$s</xliff:g> стално буди.\n\nДа бисте решили овај проблем, можете да зауставите апликацију <xliff:g id="APP_1">%1$s</xliff:g> и спречите је да ради у позадини."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Уређај не може да управља батеријом на уобичајен начин јер га <xliff:g id="APP_0">%1$s</xliff:g> стално буди.\n\nДа бисте решили овај проблем, можете да зауставите апликацију <xliff:g id="APP_1">%1$s</xliff:g> и спречите је да ради у позадини."</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="7774807745601479888">"Телефон не може да управља батеријом на уобичајен начин јер апликација <xliff:g id="APP">%1$s</xliff:g> стално тражи локацију чак и када не користите ту апликацију.\n\nДа бисте решили овај проблем, можете да искључите локацију за ову апликацију."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Таблет не може да управља батеријом на уобичајен начин јер апликација <xliff:g id="APP">%1$s</xliff:g> стално тражи локацију чак и када не користите ту апликацију.\n\nДа бисте решили овај проблем, можете да искључите локацију за ову апликацију."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Уређај не може да управља батеријом на уобичајен начин јер апликација <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>
@@ -1974,7 +2055,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>
@@ -2026,12 +2107,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Преглед од последњег потпуног пуњења"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Последње потпуно пуњење"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Преостало трајање батерије је приближно и може да се мења у зависности од начина коришћења"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Подаци о коришћењу батерије су приближни и могу да се мењају у зависности од начина коришћења"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"У активној употреби"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"У позадини"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Потрошња батерије"</string>
@@ -2353,9 +2435,9 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Желите ли да ограничите позадинске податке?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ова функција може да заустави апликацију која зависи од позадинских података када су доступне само мобилне мреже.\n\nАдекватније контроле за коришћење података можете да пронађете у подешавањима доступним у оквиру апликације."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Ограничавање позадинских података је могуће само када будете подесили ограничење за мобилне податке."</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Укључити аутом. синх. података?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Све промене које унесете у налоге на вебу ће аутоматски бити копиране на таблет.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на таблету. Тако функционише Google налог."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Све промене које унесете у налоге на вебу ће аутоматски бити копиране на телефон.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на телефону. Тако функционише Google налог."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Укључујете ауто. синхронизацију?"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Све промене које унесете на налоге на вебу ће аутоматски бити копиране на таблет.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на таблету. Тако функционише Google налог."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Све промене које унесете на налоге на вебу ће аутоматски бити копиране на телефон.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на телефону. Тако функционише Google налог."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Искључујете ауто-синх. података?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"То ће се смањити потрошњу података и батерије, али биће потребно да ручно синхронизујете сваки налог да бисте прикупили недавне информације. Нећете примати ни обавештења када дође до ажурирања."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Датум враћања циклуса потрошње на почетне вредности"</string>
@@ -2522,10 +2604,10 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Додајете новог корисника?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Овај уређај са можете да делите другим људима ако направите још корисника. Сваки корисник има сопствени простор, који може да прилагођава помоћу апликација, позадине и тако даље. Корисници могу да прилагођавају и подешавања уређаја која утичу на свакога, попут Wi‑Fi-ја.\n\nКада додате новог корисника, та особа треба да подеси сопствени простор.\n\nСваки корисник може да ажурира апликације за све остале кориснике."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Када додате новог корисника, та особа треба да подеси сопствени простор.\n\nСваки корисник може да ажурира апликације за све остале кориснике."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Подешавате корисника одмах?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Проверите да ли је особа доступна да узме уређај и подеси свој простор"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Подешавате корисника?"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Та особа треба да узме уређај и подеси свој простор"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Желите ли да одмах подесите профил?"</string>
-    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Подеси одмах"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Подеси"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сада"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Само власник таблета може да управља корисницима."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Само власник телефона може да управља корисницима."</string>
@@ -2589,7 +2671,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>
@@ -2680,9 +2762,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>
@@ -2732,9 +2817,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"превлачење за откључавање, лозинка, шаблон, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"work изазов, work, профил"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"профил за Work, профил којим се управља, обједини, обједињавање, Work, профил"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"покрет"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"покрети"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"платите, додирните, плаћања"</string>
     <string name="keywords_backup" msgid="470070289135403022">"резервна копија, правити резервну копију"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"покрет"</string>
     <string name="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>
@@ -2818,7 +2904,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>
@@ -2833,6 +2920,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>
@@ -2861,8 +2952,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>
@@ -2948,6 +3037,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Само од контаката са звездицом"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ни од кога"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Аларми"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Аларми су увек приоритет и емитује се звук"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Подсетници"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Догађаји"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Сви позиваоци"</string>
@@ -2997,19 +3087,14 @@
     <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>
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати шаблон при покретању уређаја?"</string>
     <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_pattern_for_fingerprint" msgid="932184823193006087">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\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>
@@ -3131,6 +3216,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>
@@ -3224,8 +3320,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>
@@ -3316,6 +3412,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>
@@ -3334,8 +3441,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>
@@ -3357,7 +3463,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>
@@ -3422,8 +3528,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>
@@ -3497,25 +3602,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Покрет за помоћ"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Осетљивост"</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="gesture_setting_on" msgid="3455094265233870280">"Укључено"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Искључено"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Алатка за покретање оперативног система је већ откључана"</string>
@@ -3536,6 +3648,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Аутоматске синхронизуј пословне податке"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Омогући апликацијама да аутоматски освежавају податке"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Синхронизација налога"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Синхронизација је укључена за одређене ставке (<xliff:g id="ID_1">%1$d</xliff:g> од <xliff:g id="ID_2">%2$d</xliff:g>)"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Синхронизација је укључена за све ставке"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Синхронизација је искључена за све ставке"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Информације о уређају којим се управља"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Промене и подешавања којима управља организација"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Промене и подешавања којима управља <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3623,6 +3738,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>
@@ -3636,5 +3752,11 @@
     <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="698847081680980774">"Шта је ново и узбудљиво?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Погледајте 5 најпопуларнијих функција"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Статус IMS регистрације"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Регистрован je"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Није регистрован"</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 26e17f84eb28156f750feba89d9dd30d1d4797b2..7f3847c5ed97f29b820c607116461b7c46a90e2a 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 8b7a6ce51575a58c66fd45496a1597e90618e0a9..171820f865d19679bd100098cf2cd98878f1fefa 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">"Parkoppla 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>
@@ -120,8 +129,8 @@
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Hittade inga Bluetooth-enheter i närheten."</string>
     <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_notif_message" msgid="5057417127600942904">"Tryck om du vill parkoppla med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</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">"Parkoppla 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Gör det senare"</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 +460,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>
@@ -481,7 +494,7 @@
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Lösenord"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"När du har konfigurerat skärmlåset kan du även registrera ditt fingeravtryck i Inställningar &gt; Säkerhet."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Inaktivera skärmlås"</string>
-    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vill du ta bort enhetsskydd?"</string>
+    <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Vill du ta bort enhetsskyddet?"</string>
     <string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Vill du ta bort profilens säkerhetsfunktioner?"</string>
     <string name="unlock_disable_frp_warning_content_pattern" msgid="8869767290771023461">"Funktionerna för enhetsskydd fungerar inte utan det grafiska lösenordet."</string>
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Funktionerna för enhetsskydd fungerar inte utan det grafiska lösenordet.<xliff:g id="EMPTY_LINE">
@@ -506,7 +519,7 @@
     <string name="unlock_disable_frp_warning_content_pin_profile" msgid="7790688070593867767">"Profilens säkerhetsfunktioner kan inte användas utan en pinkod."</string>
     <string name="unlock_disable_frp_warning_content_pin_fingerprint_profile" msgid="4879321153584598940">"Profilens säkerhetsfunktioner kan inte användas utan en pinkod.<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Dina sparade fingeravtryck tas dessutom bort från profilen och du kan inte längre använda dem för att låsa upp profilen, auktorisera köp eller logga in i appar."</string>
+</xliff:g>Dina sparade fingeravtryck tas dessutom bort från profilen och du kan inte längre använda dem för att låsa upp profilen, godkänna köp eller logga in i appar."</string>
     <string name="unlock_disable_frp_warning_content_password_profile" msgid="7569285520567674461">"Profilens säkerhetsfunktioner kan inte användas utan ett lösenord."</string>
     <string name="unlock_disable_frp_warning_content_password_fingerprint_profile" msgid="3527188316958917839">"Profilens säkerhetsfunktioner kan inte användas utan ett lösenord.<xliff:g id="EMPTY_LINE">
 
@@ -519,13 +532,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="1688030823464420974">"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="5350785938296254352">"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="6208035114731421034">"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="5047439819181833824">"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>
@@ -625,7 +646,15 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avancerat"</string>
     <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="ble_scan_notify_text" msgid="1295915006005700650">"För 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>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktivera Wi‑Fi automatiskt"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi aktiveras i närheten av sparade nätverk av hög kvalitet, till exempel ditt hemnätverk"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Detta är inte tillgängligt eftersom Wi‑Fi-sökning har inaktiverats"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Du måste välja en leverantör av nätverksbetyg om du vill använda nätverket"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undvik dåliga anslutningar"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Använd inte Wi-Fi-nätverk som inte har en bra internetanslutning"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Använd endast nätverk som har en bra internetanslutning"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Anslut till öppna nätverk"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Anslut automatiskt till offentliga nätverk av hög kvalitet"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Du måste välja en leverantör av nätverksbetyg om du vill använda nätverket"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Du måste välja en kompatibel leverantör av nätverksbetyg om du vill använda nätverket"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installera certifikat"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"I syfte att förbättra platsangivelserna kan systemtjänster och -appar fortfarande söka efter Wi-Fi-nätverk. 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="wifi_scan_notify_text" msgid="5593805423071186757">"För att förbättra platsangivelserna kan systemtjänster och -appar fortfarande söka efter Wi-Fi-nätverk. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Platsangivelsen kan göras mer exakt om du aktiverar sökning efter Wi-Fi-nätverk i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>genomsökningsinställningarna<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Visa inte igen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Behåll Wi-Fi på i viloläge"</string>
@@ -779,6 +811,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>
@@ -810,8 +843,7 @@
       <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_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>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
@@ -847,9 +879,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 surfzon"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Mobilens internetanslutning delas inte via en 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 surfzon"</string>
+    <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="6461075246164300670">"Mobilens internetanslutning delas via en surfzon"</string>
+    <string name="wifi_hotspot_on_local_only_subtext" msgid="2068110388011294735">"Appen delar innehåll. Om du vill dela internetanslutningen inaktiverar du 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 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">"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 surfzon ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Surfzon inaktiveras ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> är aktiv"</string>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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">"Aktiv låsskärm"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Alltid på/Batterianvändningen ökar"</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="6978257596231155345">"Visa tid, aviseringsikoner och annan information. Batterianvändningen ökar."</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>
@@ -1273,6 +1320,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>
@@ -1291,17 +1339,22 @@
       <item quantity="one">1 konto återställs</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"Det interna lagringsutrymmet och all data återställs"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"hämtade appar"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Hämtade appar"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Hämtade appar"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Du är inloggad på följande konton:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Det finns andra användare på enheten.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Andra användardata"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Operatörer på eSIM-kortet"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Detta innebär inte att serviceavtalet avslutas."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"USB-lagringsenheten"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"SD-kortet"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Radera USB-lagring"</string>
     <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>
@@ -1314,7 +1367,7 @@
     <string name="call_settings_title" msgid="5188713413939232801">"Samtalsinställningar"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Ställ in röstbrevlåda, vidarekoppla samtal, samtal väntar, nummerpres."</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Internetdelning via USB"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobil surfpunkt"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mobil surfzon"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Delning via Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internetdelning"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"Surfzon och internetdelning"</string>
@@ -1323,27 +1376,16 @@
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Internetdelning"</string>
     <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_button_text" msgid="585829947108007917">"Delning via USB"</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 surfzon och internetdelning"</string>
+    <string name="tethering_footer_info" msgid="1308462275952345985">"Med hjälp av surfzoner och internetdelning kan andra enheter anslutas till internet via mobildataanslutningen. 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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1569,8 +1617,8 @@
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"Det gick inte att ta bort data för appen."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Appen har åtkomst till följande på surfplattan:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Appen har åtkomst till följande på mobilen:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Den här appen har åtkomst till följande på din surfplatta. I syfte att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Den här appen har åtkomst till följande på din mobil. I syfte att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Den här appen har åtkomst till följande på din surfplatta. För att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Den här appen har åtkomst till följande på din mobil. För att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> och <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> och <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
@@ -1659,6 +1707,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>
@@ -1684,7 +1736,7 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Hjälp med tangentbord"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Fysiskt tangentbord"</string>
     <string name="show_ime" msgid="2658582193437188227">"Visa virtuellt tangentbord"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"Ha kvar den på skärmen när det fysiska tangentbordet används"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Ha kvar det på skärmen när det fysiska tangentbordet används"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Hjälp med kortkommandon"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Visa tillgängliga genvägar"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Standard"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Skärmläsningsprogram, visning och interaktionsinställningar"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Syninställningar"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Du kan anpassa enheten efter dina behov. Tillgänglighetsfunktionerna kan ändras senare under Inställningar."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Öka textstorlek"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Skärmläsningsprogram"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ljud och text på skärmen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Skärm"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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 som 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="4006631636646776488">"Batterihanteringen på mobilen fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller mobilen aktiv.\n\nDu kan testa att lösa problemet genom att stänga av appen.\n\nOm problemet kvarstår kan det hända att du måste avinstallera appen för att förbättra batteritiden."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Batterihanteringen på surfplattan fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller surfplattan aktiv.\n\nDu kan testa att lösa problemet genom att stänga av appen.\n\nOm problemet kvarstår kan det hända att du måste avinstallera appen för att förbättra batteritiden."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Batterihanteringen på enheten fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller enheten aktiv.\n\nDu kan testa att lösa problemet genom att stänga av appen.\n\nOm problemet kvarstår kan det hända att du måste avinstallera appen för att förbättra batteritiden."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Batterihanteringen på mobilen fungerar inte som den ska eftersom <xliff:g id="APP_0">%1$s</xliff:g> håller mobilen aktiv.\n\nDu kan testa att lösa problemet genom att stänga av <xliff:g id="APP_1">%1$s</xliff:g>.\n\nOm problemet kvarstår kan det hända att du måste avinstallera appen för att förbättra batteritiden."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Batterihanteringen på surfplattan fungerar inte som den ska eftersom <xliff:g id="APP_0">%1$s</xliff:g> håller surfplattan aktiv.\n\nDu kan testa att lösa problemet genom att stänga av <xliff:g id="APP_1">%1$s</xliff:g>.\n\nOm problemet kvarstår kan det hända att du måste avinstallera appen för att förbättra batteritiden."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Batterihanteringen på enheten fungerar inte som den ska eftersom <xliff:g id="APP_0">%1$s</xliff:g> håller enheten aktiv.\n\nDu kan testa att lösa problemet genom att stänga av <xliff:g id="APP_1">%1$s</xliff:g>.\n\nOm problemet kvarstår kan det hända att du måste avinstallera appen för att förbättra batteritiden."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Stoppa appen"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Vill du inaktivera bakgrundsanvändning och stänga av appen?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Batterihanteringen på mobilen fungerar inte som den ska eftersom <xliff:g id="APP_0">%1$s</xliff:g> håller mobilen aktiv.\n\nDu kan testa att lösa problemet genom att stänga av <xliff:g id="APP_1">%1$s</xliff:g> och förhindra att den körs i bakgrunden."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Batterihanteringen på surfplattan fungerar inte som den ska eftersom <xliff:g id="APP_0">%1$s</xliff:g> håller surfplattan aktiv.\n\nDu kan testa att lösa problemet genom att stänga av <xliff:g id="APP_1">%1$s</xliff:g> och förhindra att den körs i bakgrunden."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Batterihanteringen på enheten fungerar inte som den ska eftersom <xliff:g id="APP_0">%1$s</xliff:g> håller enheten aktiv.\n\nDu kan testa att lösa problemet genom att stänga av <xliff:g id="APP_1">%1$s</xliff:g> och förhindra att den körs 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="7774807745601479888">"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="118745801732181618">"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="6783678153382298295">"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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Fördelning sedan senaste fulladdningen"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Sedan senaste fulladdning"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Den återstående batteritiden är ungefärlig och kan ändras beroende på användning"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Informationen om batterianvändning är en uppskattning och kan ändras utifrån användning"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Under aktiv användning"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"I bakgrunden"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batteriförbrukning"</string>
@@ -2263,7 +2344,7 @@
     <string name="cant_sync_dialog_title" msgid="2777238588398046285">"Det går inte att synkronisera manuellt"</string>
     <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Synkronisering är inaktiverad för det här objektet. Om du vill ändra inställningen aktiverar du bakgrundsdata och automatisk synkronisering tillfälligt."</string>
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
-    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G Mac-adress"</string>
+    <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adress"</string>
     <string name="enter_password" msgid="8035706727471334122">"Starta Android genom att ange ditt lösenord"</string>
     <string name="enter_pin" msgid="5305333588093263790">"Starta Android genom att ange din pinkod"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"Starta Android genom att rita ditt grafiska lösenord"</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Du kan dela enheten med andra om du skapar flera användare. Alla användare får sitt eget utrymme som de kan anpassa som de vill med appar, bakgrund och så vidare. Användarna kan även ändra enhetsinställningar som påverkar alla, till exempel Wi‑Fi.\n\nNär du lägger till en ny användare måste han eller hon konfigurera sitt utrymme.\n\nAlla användare kan uppdatera appar för samtliga användares räkning."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"När du lägger till en ny användare måste den personen konfigurera sitt utrymme.\n\nAlla användare kan uppdatera appar för samtliga användares räkning."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurera användare nu?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Kontrollera att personen har möjlighet att ta enheten och konfigurera sitt utrymme"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Kontrollera att personen finns tillgänglig för att konfigurera sitt utrymme på enheten"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vill du konfigurera en profil nu?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Konfigurera nu"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Inte nu"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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, 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">"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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"dra för att låsa upp, lösenord, mönster, pinkod"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"jobbutmaning, jobb, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"jobbprofil, hanterad profil, koppla samman, sammankoppling, jobb, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"rörelse"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"rörelser"</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_assist_gesture_launch" msgid="813968759791342591">"rörelse"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Endast från stjärnmärkta kontakter"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarm"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarm är alltid prioriterade och ljuder"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Påminnelser"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Händelser"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alla ringande"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3305,7 +3406,7 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Operatörens dataredovisning kan skilja sig från enhetens dataredovisning."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> har använts"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Konfigurera en datavarning"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Ställ in en datavarning"</string>
     <string name="data_warning" msgid="209133958008062117">"Datavarning"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Ange datagräns"</string>
     <string name="data_limit" msgid="1885406964934590552">"Datagräns"</string>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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">"Svep med fingret för aviseringar"</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"På"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Av"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader har redan låsts upp"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Synkronisera jobbdata automatiskt"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Tillåt att data uppdateras av appar automatiskt"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Kontosynkronisering"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Synkronisering har aktiverats för <xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$d</xliff:g> objekt"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Synkronisering har aktiverats för alla objekt"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Synkronisering har inaktiverats för alla objekt"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Information om hanterad enhet"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Ändringar och inställningar som hanteras av organisationen"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Ändringar och inställningar som hanteras av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Aktiverat"</string>
     <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="storage_movies_tv" msgid="5498394447562086890">"Film- och TV-appar"</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="698847081680980774">"Vad är nytt?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Kolla in de fem populäraste funktionerna"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS-registrering"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registrerad"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Ej registrerad"</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index a0f61d6a41c378bfbd749724cf72a400fc4b4cc4..087da45a9b8af8ce5192f835c05ad2b06b938ee4 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>
@@ -283,7 +273,7 @@
     <item msgid="2603878814882344450">"sauti kuu"</item>
     <item msgid="7136963238377062018">"kiwango cha sauti"</item>
     <item msgid="4270236897655923007">"sauti ya mlio"</item>
-    <item msgid="6325739889222559394">"sauti ya midia"</item>
+    <item msgid="6325739889222559394">"sauti ya faili"</item>
     <item msgid="5762123934816216821">"sauti ya kengele"</item>
     <item msgid="785049718065337473">"sauti ya arifa"</item>
     <item msgid="6700305533746877052">"sauti ya bluetooth"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 7a746613026c8be7dbdec01f3ccb21db03ca45c0..a25a2aabb4d8688497c761ae1997fed18c2ba55e 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>
@@ -105,11 +107,18 @@
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Hakuna jina lililowekwa, inatumia jina la akaunti"</string>
     <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_rename_button" msgid="1648028693822994566">"Hifadhi jina jipya"</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 zilizopokelewa"</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) -->
@@ -232,7 +244,7 @@
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"Kadi ya SD iliondolewa ikiwa ingali inatumika!"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Baiti zilizotumika:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Inachanganua hifadhi ya USB ya media..."</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Inakagua ikiwa kadi ya SD ina midia..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Inakagua ikiwa kadi ya SD ina faili mpya..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Hifadhi ya USB imepachikwa kusoma-tu."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"Hifadhi ya SD imepachikwa kusoma-tu."</string>
     <string name="skip_label" msgid="47510779345218297">"Ruka"</string>
@@ -240,7 +252,7 @@
     <string name="language_picker_title" msgid="3596315202551687690">"Lugha"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"Mapendeleo ya lugha"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"Ondoa"</string>
-    <string name="add_a_language" msgid="2330538812283783022">"Ongeza lugha"</string>
+    <string name="add_a_language" msgid="2330538812283783022">"Ongeza lugha nyingine"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
       <item quantity="other">Ungependa kuondoa lugha zilizochaguliwa?</item>
       <item quantity="one">Ungependa kuondoa lugha iliyochaguliwa?</item>
@@ -285,7 +297,7 @@
     <string name="roaming_disable" msgid="1295279574370898378">"Unganisha huduma ya data wakati niko nje ya mtandao wangu wa kawaida"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Umepoteza muunganisho wa data kwa sababu uliondoka kwenye mtandao wako wa kawaida ukiwa umezima utumiaji data nje ya mtandao wa kawaida."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Iwashe"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"Unaweza kutozwa gharama kubwa."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"Huenda ukatozwa gharama kubwa."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!\n\nMpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!\n\nMpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Ruhusu data kupitia mitandao mingine?"</string>
@@ -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>
@@ -344,7 +356,7 @@
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Kitambulisho"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Dhibiti vitambulisho"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Tumia kitambulisho kwa"</string>
-    <string name="fingerprint_add_title" msgid="1926752654454033904">"Ongeza kitambulisho"</string>
+    <string name="fingerprint_add_title" msgid="1926752654454033904">"Ongeza alama nyingine"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"kufunga skrini"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
       <item quantity="other">Vitambulisho <xliff:g id="COUNT_1">%1$d</xliff:g> vimewekwa</item>
@@ -354,40 +366,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Andikisha baadaye"</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 +460,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 +532,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="1688030823464420974">"Ukiweka mchoro usio sahihi utakapojaribu tena, data iliyo kwenye kifaa hiki itafutwa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Ukiweka PIN isiyo sahihi utakapojaribu tena, data iliyo kwenye kifaa hiki itafutwa"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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="5047439819181833824">"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>
@@ -624,8 +645,16 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Chaguo…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Mipangilio ya kina"</string>
     <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="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Wakati Bluetooth 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">"Imeshindwa 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>
@@ -637,14 +666,14 @@
     <string name="bluetooth_device_advanced_online_mode_title" msgid="3689050071425683114">"Unganisha"</string>
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"Unganisha kwa kifaa cha Bluetooth"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"Tumia kwa"</string>
-    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Ipe jina jipya"</string>
+    <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"Badilisha jina"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"Ruhusu mahamisho ya faili inayoingia"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Umeunganishwa kwa kifaa cha ufikia Mtandao"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Kushiriki muunganisho wa mtandao wa nyumbani na kifaa"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"Mipangilio ya Gati"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Tumia dock ya sauti"</string>
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Kama simu ya spika"</string>
-    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Kwa muziki na midia"</string>
+    <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"lli kupata muziki na faili zingine"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Kumbuka mipangilio"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Tuma"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Washa kuonyesha skrini bila kutumia waya"</string>
@@ -671,9 +700,9 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Programu iko tayari kusambaza maudhui kupitia NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Imezimwa"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hazipatikani kwa sababu NFC imezimwa"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Haipatikani kwa sababu NFC imezimwa"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Unapowasha kipengele hiki, unaweza kutuma maudhui ya programu kwenye kifaa kingine kinachoweza kutumia NFC kwa kuviweka vifaa pamoja. Kwa mfano, unaweza kutuma kurasa za wavuti, video za YouTube, anwani na mengineyo.\n\nWeka tu vifaa pamoja (kwa kuvigusisha sehemu za nyuma) na ugonge skrini yako. Programu itabaini ni nini kitatumwa."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Unapowasha kipengele hiki, unaweza kutuma maudhui ya programu kwenye kifaa kingine kinachoweza kutumia NFC kwa kuviweka vifaa pamoja. Kwa mfano, unaweza kutuma kurasa za wavuti, video za YouTube, anwani na mengineyo.\n\nWeka tu vifaa pamoja (kwa kuvigusisha sehemu za nyuma) na ugonge skrini yako. Programu itabaini kile kitatumwa."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Washa Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Washa Wi‑Fi kiotomatiki"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi itaanza kutumika tena mitandao iliyohifadhiwa ya ubora wa juu itakapopatikana, kama vile mtandao wa nyumbani"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Hakipatikani kwa sababu utafutaji wa mitandao ya Wi-Fi umezimwa"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Chagua mtoa huduma wa ukadiriaji wa mtandao ili utumie kipengele hiki"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Epuka miunganisho mibovu"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Usitumie mtandao wa Wi-Fi ambao hauna muunganisho mzuri wa Intaneti"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Tumia mitandao yenye muunganisho bora wa Intaneti pekee"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Unganisha kwenye mitandao wazi"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Unganisha kiotomatiki kwenye mitandao ya umma ya ubora wa juu"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Chagua mtoa huduma wa ukadiriaji wa mtandao ili utumie kipengele hiki"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Chagua mtoa huduma wa ukadiriaji wa mtandao anayeruhusiwa ili utumie kipengele hiki"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sakinisha vyeti"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma za mifumo bado zinaweza kutafuta mitandao ya Wi-Fi. 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="wifi_scan_notify_text" msgid="5593805423071186757">"Ili kuboresha usahihi wa kutambua mahali, programu na huduma za mfumo bado zinaweza kutafuta mitandao ya Wi-Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Ili kuboresha usahihi wa data ya mahali, washa utafutaji wa Wi-Fi katika <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mipangilio ya utafutaji<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Usionyeshe tena"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi ikae ikiwa imewashwa wakati kifaa kiko katika hali tuli"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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 kipengele cha mtandao-hewa kuunda mtandao wa Wi-Fi kwa vifaa vyako vingine. Mtandao-hewa hutoa huduma ya Intaneti ikitumia muunganisho wako wa  mtandao wa simu za mkononi. Unaweza kutozwa ada za ziada za kutumia data ya mtandao wa simu."</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>
@@ -896,6 +936,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>
@@ -924,7 +965,7 @@
     <string name="volume_notification_description" msgid="5810902320215328321">"Arifa"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Kengele"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"Zima mlio wa simu na arifa"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"Zima sauti ya muziki na midia nyingine"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"Zima sauti ya muziki na maudhui mengine"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Puuza arifa"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Zima kengele"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Gati"</string>
@@ -953,6 +994,7 @@
     <string name="search_settings_no_results" msgid="8799027492641230999">"Hakuna matokeo yoyote yaliyopatikana"</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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Iwe imewashwa / Inatumia chaji nyingi"</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="6978257596231155345">"Onyesha saa, aikoni za arifa na maelezo mengine. Inatumia chaji nyingi."</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>
@@ -1103,7 +1150,7 @@
     <string name="status_bt_address" msgid="4195174192087439720">"Anwani ya Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nambari ya Ufuatiliaji"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Hapatikani"</string>
-    <string name="status_up_time" msgid="7294859476816760399">"juu saa"</string>
+    <string name="status_up_time" msgid="7294859476816760399">"Muda wa matumizi tangu mwisho ilipozimwa"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Saa ya kuamka"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Hifadhi ya ndani"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Hifadhi ya USB"</string>
@@ -1273,15 +1320,16 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Weka upya"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Weka upya mipangilio ya mtandao"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Badilisha mipangilio ya mtandao"</string>
     <string name="reset_network_desc" msgid="5547979398298881406">"Hatua itabadilisha mipangilio yote ya mtandao ikiwa ni pamoja:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data ya simu"</li>\n<li>"Bluetooth"</li></string>
-    <string name="reset_network_button_text" msgid="2035676527471089853">"Weka upya mipangilio"</string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Badilisha mipangilio"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Ungependa kuweka upya mipangilio yote ya mtandao? Huwezi kutendua kitendo hiki."</string>
-    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Weka upya mipangilio"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Badilisha mipangilio"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Iwekwe upya?"</string>
     <string name="network_reset_not_available" msgid="7188610385577164676">"Kuweka upya mtandao hakupatikani kwa mtumiaji huyu"</string>
     <string name="reset_network_complete_toast" msgid="787829973559541880">"Mipangilio ya mtandao imewekwa upya"</string>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Kuna watumiaji wengine waliopo kwenye kifaa hiki.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Vipengee vilivyo kwenye eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Hatua hii haitaghairi mpango wako wa huduma ya simu ya mkononi."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Futa hifadhi ya USB"</string>
     <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>
@@ -1324,26 +1377,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 kipengele cha mtandao-hewa na kusambaza mtandao ili usambazie vifaa vingine intaneti kutoka kwenye mtandao wako wa simu za 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>
@@ -1351,7 +1393,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ungependa kubadilisha programu ya SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Ungependa kutumia <xliff:g id="NEW_APP">%1$s</xliff:g> badala ya <xliff:g id="CURRENT_APP">%2$s</xliff:g> kama programu yako ya SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Ungependa kutumia <xliff:g id="NEW_APP">%s</xliff:g> kama programu yako ya SMS?"</string>
-    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Mtoa huduma za ukadiriaji wa mtandao"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Mtoa huduma anayekadiria mtandao"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Hamna"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Ungependa kubadili kisaidizi cha Wi-Fi?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Ungependa kutumia <xliff:g id="NEW_APP">%1$s</xliff:g> badala ya <xliff:g id="CURRENT_APP">%2$s</xliff:g> kusimamia miunganisho yako ya mtandao?"</string>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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 karibuni"</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>
@@ -1537,7 +1585,7 @@
     <string name="show_running_services" msgid="5736278767975544570">"Onyesha huduma zinazoendeshwa"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Onyesha michakato iliyoakibishwa"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Programu ya dharura"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"Weka upya mapendeleo ya programu"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"Badilisha mapendeleo ya programu"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ungependa kuweka upya mapendeleo ya programu?"</string>
     <string name="reset_app_preferences_desc" msgid="4822447731869201512">"Hii itaweka upya mapendeleo yote ya: \n\n "<li>"Programu zilizozimwa"</li>\n" "<li>" Arifa za programu zilizozimwa"</li>\n" "<li>"Programu chaguo-msingi kwa vitendo"</li>\n" "<li>"Vikwazo vya chinichini vya data ya programu"</li>\n" "<li>"Vikwazo vyovyote vya ruhusa"</li>\n\n"Hutapoteza data yoyote ya programu."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Weka upya"</string>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Vidhibiti vya mawasiliano, maonyesho na visoma skrini"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Mipangilio ya Kuona"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Unaweza kubadilisha mipangilio ya kifaa hiki kulingana na mahitaji yako. Vipengele hivi vya zana za walio na matatizo ya kuona au kusikia vinaweza kubadilishwa baadaye kwenye Mipangilio."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Ongeza ukubwa wa fonti"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Visoma skrini"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Maandishi kwenye skrini na sauti"</string>
     <string name="display_category_title" msgid="685461049938269166">"Onyesho"</string>
@@ -1765,7 +1818,7 @@
     <string name="experimental_category_title" msgid="5272318666666893547">"Ya majaribio"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Kisoma skrini hasa kwa watu wenye upofu na wenye matatizo ya kuona"</string>
-    <string name="select_to_speak_summary" msgid="4282846695497544515">"Gonga vipengee kwenye skrini yako ili usikie vikisoma kwa sauti"</string>
+    <string name="select_to_speak_summary" msgid="4282846695497544515">"Gusa vipengee kwenye skrini yako ili usikie vikisoma kwa sauti"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Manukuu"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Ukuzaji"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Kuza kwa kugonga mara tatu"</string>
@@ -1775,7 +1828,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Gonga mara 3 ili ukuze"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Gonga kitufe ili ukuze"</string>
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ili kukuza"</b>", gonga skrini mara 3 haraka.\n"<ul><li>"Buruta vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gonga skrini mara 3 kwa haraka na ukifika mara ya tatu, usiondoe kidole.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kukuza ukitumia kibodi au sehemu ya viungo muhimu."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gonga Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha ugonge mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gonga Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"Ukiwasha kipengele cha ukuzaji, tumia Kitufe cha zana za walio na matatizo ya kuona au kusikia hapo chini ya skrini ili ukuze haraka.\n\n"<b>"Ili kukuza"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha ugonge mahali popote kwenye skrini.\n"<ul><li>"Buruta kwa kutumia vidole 2 au zaidi ili usogeze"</li>\n<li>"Bana vidole 2 au zaidi ili ubadilishe ukuzaji"</li></ul>\n\n<b>"Ili kukuza kwa muda mfupi"</b>", gusa Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uguse na ushikilie mahali popote kwenye skrini.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili usogeze mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye kibodi au sehemu ya viungo muhimu."</string>
     <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Kitufe cha zana za walio na matatizo ya kuona au kusikia kimewekwa kuwa <xliff:g id="SERVICE">%1$s</xliff:g>. Gusa na ushikilie Kitufe cha zana za walio na matatizo ya kuona au kusikia, kisha uchague ukuzaji ili utumie kipengele cha ukuzaji."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Njia mkato ya ufikiaji"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Huduma ya njia ya mkato"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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 zinazotumia chaji 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 maelezo ya mahali 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="4006631636646776488">"Simu yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia skrini ya simu kuzimika.\n\nIli kujaribu kurekebisha tatizo hili, unaweza kuzima programu.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Kompyuta kibao yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia skrini ya kompyuta kibao kuzimika.\n\nIli kujaribu kurekebisha tatizo hili, unaweza kuzima programu.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Kifaa chako hakiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia skrini ya kifaa chako kuzimika.\n\nIli kujaribu kurekebisha tatizo hili, unaweza kuzima programu.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Simu yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP_0">%1$s</xliff:g> inawasha skrini ya simu mara kwa mara.\n\nIli kujaribu kutatua tatizo hili, unaweza kuzima programu<xliff:g id="APP_1">%1$s</xliff:g>.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Kompyuta kibao yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP_0">%1$s</xliff:g> inawasha skrini ya kompyuta kibao mara kwa mara.\n\nIli kujaribu kutatua tatizo hili, unaweza kuzima programu<xliff:g id="APP_1">%1$s</xliff:g>.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Kifaa chako hakiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP_0">%1$s</xliff:g> inawasha skrini ya kifaa chako mara kwa mara.\n\nIli kujaribu kutatua tatizo hili, unaweza kuzima programu<xliff:g id="APP_1">%1$s</xliff:g>.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Simamisha programu"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Je, ungependa kuzima programu ili isitumike chini chini?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Simu yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP_0">%1$s</xliff:g> inawasha simu yako kila wakati.\n\nIli kujaribu kutatua tatizo hili, unaweza kuzima <xliff:g id="APP_1">%1$s</xliff:g> ili kuizuia kutumika chini chini."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Kompyuta kibao yako haiwezi kudhibiti betri ipasavyo kwa sababu <xliff:g id="APP_0">%1$s</xliff:g> inawasha kompyuta kibao kila wakati.\n\nIli kushughulikia tatizo hili, unaweza kuzima <xliff:g id="APP_1">%1$s</xliff:g> ili kuizuia kutumika chini chini."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Kifaa chako hakiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP_0">%1$s</xliff:g> inakiwasha kila wakati.\n\nIli kutatua tatizo hili, unaweza kuzima <xliff:g id="APP_1">%1$s</xliff:g> ili kuizuia kutumika 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="7774807745601479888">"Simu yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inaendelea kuomba data ya mahali ulipo wakati hutumii programu.\n\nIli kutatua tatizo hili, unaweza kuzima kipengele cha kutambua mahali katika programu hii."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Kompyuta kibao yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inaendelea kuomba data ya mahali ulipo wakati hutumii programu.\n\nIli kutatua tatizo hili, unaweza kuzima kipengele cha kutambua mahali katika programu hii."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Kifaa chako hakiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inaendelea kuomba data ya mahali ulipo wakati hutumii programu.\n\nIli kutatua tatizo hili, unaweza kuzima kipengele cha kutambua mahali katika 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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">"Imetumika 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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uchanganuzi tangu mara ya mwisho ilipojaa chaji"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Mwisho ilipokuwa imejaa chaji"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Muda wa matumizi ya betri uliosalia umekadiriwa tu na unaweza kubadilika kulingana na matumizi"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Data ya matumizi ya betri imekadiriwa na inaweza kubadilika kulingana na matumizi"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Inapotumika"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Ikitumika chini chini"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Matumizi ya betri"</string>
@@ -2500,7 +2581,7 @@
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Mtumiaji aongezwe sasa?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Hakikisha kuwa mtu huyu anaweza kuchukua kifaa na kuweka mapendeleo yake"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ungependa kuweka wasifu sasa?"</string>
-    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Ongeza sasa"</string>
+    <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Mwongeze sasa"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Siyo sasa"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Mmiliki wa kompyuta kibao pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
@@ -2551,20 +2632,20 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Tumia chaguo-msingi"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Kila wakati"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Isipokuwa wakati programu nyingine ya malipo imefunguliwa"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Unapolipa ukitumia chaguo la Gonga na ulipe, tumia:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Unapolipa ukitumia chaguo la Gusisha ili ulipe, tumia:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Kulipa katika kituo"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Sanidi programu ya malipo. Shikilia tu upande wa nyuma wa simu yako kwenye kituo chochote cha malipo chenye alama ya kulipa bila kugusa."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Nimeelewa"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"Zaidi..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Ungependa kuweka kama mapendeleo yako?"</string>
-    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Ungependa kutumia <xliff:g id="APP">%1$s</xliff:g> unapotumia Gonga na ulipe?"</string>
-    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Ungependa kutumia <xliff:g id="APP_0">%1$s</xliff:g> badala ya <xliff:g id="APP_1">%2$s</xliff:g> unapotumia Gonga na ulipe?"</string>
+    <string name="nfc_payment_set_default" msgid="8532426406310833489">"Ungependa kutumia <xliff:g id="APP">%1$s</xliff:g> unapogusisha ili ulipe?"</string>
+    <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"Ungependa kutumia <xliff:g id="APP_0">%1$s</xliff:g> badala ya <xliff:g id="APP_1">%2$s</xliff:g> unapotumia chaguo la kugusisha ili ulipe?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"Vikwazo"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Ondoa vikwazo"</string>
     <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>
@@ -2581,7 +2662,7 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"Matangazo ya dharura"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Kampuni zinazotoa huduma za mitandao"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"Majina ya Lango la Mtandao"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"Majina ya milango ya Mtandao"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Hali Iliyoimarishwa ya 4G LTE"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Tumia data ya LTE ili uongeze ubora wa sauti na mawasiliano (Inapendekezwa)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"Aina ya mtandao unaoupendelea"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"telezesha kidole ili ufungue, nenosiri, mchoro, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"mashindano kazini, kazi, wasifu"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"wasifu wa kazini, wasifu uliodhibitiwa, unganisha, uunganishaji, kazi, wasifu"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ishara"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"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_assist_gesture_launch" msgid="813968759791342591">"ishara"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kutoka kwa anwani zenye nyota pekee"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hamna"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Kengele"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Kengele hupewa kipaumbele na hutoa sauti"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Vikumbusho"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Matukio"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Wapiga simu wote"</string>
@@ -2965,19 +3054,14 @@
     <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>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Unaweza kulinda kifaa hiki 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_pattern" msgid="7081249914068568570">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kukuhitaji uongeze 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 kiitishe mchoro kabla ya kufunguka?"</string>
     <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_pattern_for_fingerprint" msgid="932184823193006087">"Mbali na kutumia alama yako ya kidole kufungua kifaa chako, unaweza kukilinda zaidi kwa kuweka mipangilio itakayokuhitaji kuweka 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 kiitishe mchoro 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>
@@ -3095,6 +3179,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 zinazotumia 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>
@@ -3115,15 +3208,15 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Ripoti hii ya hitilafu inashirikiwa na msimamizi wako wa TEHAMA. Wasiliana naye kwa maelezo zaidi."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"Shiriki"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Kataa"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"Chaji kifaa hiki"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"Kuchaji kifaa hiki"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Chaji tu kifaa hiki"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"Sambaza nishati"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"Kusambaza nishati"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Chaji kifaa kilichounganishwa. Hufanya kazi kwenye vifaa vinavyotumia chaja za USB pekee."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"Kuhamisha faili"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Hamishia faili kwenye kifaa kingine"</string>
     <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Kuhamisha picha (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Hamisha picha au faili ikiwa MPT haiwezi kutumika (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"Tumia kifaa kama MIDI"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"Kutumia kifaa kama MIDI"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Tumia kifaa hiki kama MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Tumia USB"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
@@ -3187,8 +3280,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>
@@ -3225,7 +3318,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Jumanne saa 12:02 jioni"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Jumanne saa 12:03 jioni"</string>
     <string name="disconnected" msgid="4836600637485526329">"Haijaunganishwa"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ya data imetumika"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> za data zimetumika"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">Zimezimwa katika programu <xliff:g id="COUNT">%d</xliff:g></item>
       <item quantity="one">Zimezimwa katika programu 1</item>
@@ -3245,7 +3338,7 @@
     <string name="location_on_summary" msgid="5127631544018313587">"WASHA / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"IMEZIMWA"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Kipengee cha kuhifadhi nakala kimezimwa"</string>
-    <string name="about_summary" msgid="924181828102801010">"Imesasishwa na sasa inatumia Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
+    <string name="about_summary" msgid="924181828102801010">"Umesasishwa na sasa unatumia Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Kitendo hakiruhusiwi"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Haiwezi kubadilisha sauti"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Huruhusiwi kupiga simu"</string>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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 bila kipimo"</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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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">"Jipige picha mwenyewe 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 saa, aikoni za arifa na maelezo mengine, gusa 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 saa, aikoni za arifa na maelezo mengine, chukua simu yako."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ili uangalie saa, arifa za aikoni na maelezo mengine, chukua kompyuta yako kibao."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ili uangalie saa, 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Imewashwa"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Imezimwa"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Tayari kipakiaji cha mfumo wa uendeshaji kimefunguliwa"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sawazisha data ya kazini kiotomatiki"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Ruhusu programu zionyeshe data upya kiotomatiki"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Usawazishaji akaunti"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Umewasha usawazishaji katika vipengee <xliff:g id="ID_1">%1$d</xliff:g> kati ya <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Umewasha usawazishaji katika vipengee vyote"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Umezima usawazishaji katika vipengee vyote"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Maelezo kuhusu kifaa kinachosimamiwa"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Mabadiliko na mipangilio inayosimamiwa na shirika lako"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Mabadiliko na mipangilio inayosimamiwa na <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Nini kipya na cha kusisimua?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Angalia vipengele 5 vikuu"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Hali ya usajili wa IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Imesajiliwa"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Haijasajiliwa"</string>
 </resources>
diff --git a/res/values-sw400dp/dimens.xml b/res/values-sw400dp/dimens.xml
index 7ae40612aa29dada9ef8eb5a88fe52022d2d3b60..35a25d8c7201370e2e8d20172ca1f745a9a01162 100755
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -16,8 +16,7 @@
   -->
 
 <resources>
-    <dimen name="fingerprint_enrolling_content_margin_top">56dp</dimen>
-    <dimen name="fingerprint_in_app_indicator_size">176dp</dimen>
+    <dimen name="fingerprint_enrolling_content_margin_vertical">56dp</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 0000000000000000000000000000000000000000..f69f7c35048aa2a92b37d62904325ab75d26fd9d
--- /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-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 0157fa23926b7cac50b610528601bf9f8fefa4b8..041191467fe006a6c9a6cb28e1e69bdfb8cab623 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -66,6 +66,8 @@
     <dimen name="search_result_item_image_margin_start">24dp</dimen>
     <dimen name="search_result_item_image_margin_end">32dp</dimen>
 
+    <dimen name="search_bar_height">64dp</dimen>
+
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">24dp</dimen>
     <dimen name="wifi_assistant_padding_start_end">24dp</dimen>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 87a941dfada781d7a7e0b1d29cbce883284920c3..9a20a6ff5d4067c6f9a885fd2d34eba868ce1cd6 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>
@@ -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-ta/strings.xml b/res/values-ta/strings.xml
index 002c71d35d7fc9cc56c5e4fa7156d2de98c8e9db..7a0d60fd15f28cd86d89a7e9f584c070b2014965 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -30,17 +30,19 @@
     </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>
     <string name="header_category_personal" msgid="3310195187905720823">"தனிப்பட்டவை"</string>
     <string name="header_category_access" msgid="7580499097416970962">"அணுகல்"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"முறைமை"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"சிஸ்டம்"</string>
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"தரவு இணைப்பை இயக்கு"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"தரவு இணைப்பை முடக்கு"</string>
     <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>
@@ -104,12 +106,19 @@
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"சுயவிவர அமைப்பு"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"பெயர் அமைக்கப்படவில்லை, கணக்குப் பெயரைப் பயன்படுத்துகிறது"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"சாதனங்களுக்கு ஸ்கேன் செய்"</string>
-    <string name="bluetooth_rename_device" msgid="4352483834491958740">"சாதனத்தை மறுபெயரிடுக"</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) -->
@@ -275,20 +287,20 @@
     <string name="radio_controls_title" msgid="3447085191369779032">"மேலும்"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"வயர்லெஸ் &amp; நெட்வொர்க்குகள்"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"வைஃபை, புளூடூத், விமானப் பயன்முறை, மொபைல் நெட்வொர்க்குகள், &amp; VPNகள் ஆகியவற்றை நிர்வகி"</string>
-    <string name="cellular_data_title" msgid="6835451574385496662">"மொபைல் தரவு"</string>
+    <string name="cellular_data_title" msgid="6835451574385496662">"மொபைல் டேட்டா"</string>
     <string name="calls_title" msgid="3544471959217176768">"அழைப்புகள்"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS செய்திகள்"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"செல் நெட்வொர்க்கில் தரவு உபயோகத்தை அனுமதி"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"ரோமிங்கின் போது தரவுப் பயன்பாட்டை அனுமதி"</string>
     <string name="roaming" msgid="3596055926335478572">"தரவு ரோமிங்"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"ரோமிங்கின்போது தரவு சேவைகளுடன் இணை"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"ரோமிங்கின் போது தரவு சேவைகளுடன் இணை"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"ரோமிங்கின் போது டேட்டா சேவைகளுடன் இணை"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"உங்களுடைய உள்ளூர் நெட்வொர்க்கில் தரவு ரோமிங்கை முடக்கியுள்ளதால் உங்கள் தரவு இணைப்பை இழந்துவிட்டீர்கள்."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"இதை இயக்கவும்"</string>
-    <string name="roaming_warning" msgid="4275443317524544705">"குறிப்பிடத்தக்க கட்டணங்கள் இருக்கலாம்."</string>
+    <string name="roaming_warning" msgid="4275443317524544705">"கட்டணம் விதிக்கப்படலாம்."</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் கட்டணங்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, டேப்லெட்டில் உள்ள அனைவரையும் பாதிக்கும்."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"நீங்கள் தரவு ரோமிங்கை அனுமதிக்கும்போது, குறிப்பிட்ட ரோமிங் கட்டணங்கள் உங்களுக்கு விதிக்கப்படலாம்!\n\nஅமைப்பானது, தொலைபேசியில் உள்ள அனைவரையும் பாதிக்கும்."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"தரவு ரோமிங்கை அனுமதிக்கவா?"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"டேட்டா ரோமிங்கை அனுமதிக்கவா?"</string>
     <string name="networks" msgid="6333316876545927039">"ஆபரேட்டர் தேர்வு"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"நெட்வொர்க் ஆபரேட்டரைத் தேர்வுசெய்யவும்"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"தேதி &amp; நேரம்"</string>
@@ -315,31 +327,31 @@
     <string name="lock_after_timeout" msgid="4590337686681194648">"தானாகவே பூட்டு"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"உறக்கநிலைக்குச் சென்ற பிறகு <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ஆல் திறக்கப்பட்டிருக்கும் சூழல்கள் தவிர, பிற சூழல்களில் உடனடியாக உறக்கத்திற்குச் செல்லும்"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> பயன்படுத்தாத போது, <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>க்குப் பின் உறக்கநிலையில் வை"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"உறங்கியதற்குப் பின் <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> முடிந்த பிறகு பூட்டிக்கொள்ளும்; <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> பயன்படுத்தினால் இவ்வாறு நிகழாது."</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"பூட்டுத் திரையில் உரிமையாளர் தகவலைக் காட்டு"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"பூட்டுத் திரை செய்தி"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"லாக் ஸ்கிரீன் செய்தி"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"விட்ஜெட்களை இயக்கு"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"ஏதுமில்லை"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"எ.கா., ஜோவின் அண்ட்ராய்டு."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"எ.கா., சந்திராவின் ஆண்ட்ராய்டு."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"பயனர் தகவல்"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"பூட்டு திரையில் சுயவிவரத் தகவலைக் காட்டு"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"சுயவிவரத் தகவல்"</string>
     <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>
+    <string name="security_settings_title" msgid="4918904614964215087">"பாதுகாப்பு &amp; இருப்பிடம்"</string>
     <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>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"பூட்டுத் திரை விருப்பத்தேர்வுகள்"</string>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"லாக் ஸ்கிரீன் விருப்பத்தேர்வுகள்"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"தனியுரிமை"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="security_status_title" msgid="5848766673665944640">"பாதுகாப்பு நிலை"</string>
-    <string name="security_dashboard_summary" msgid="6757421634477554939">"திரைப் பூட்டு, கைரேகை"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"ஸ்கிரீன் லாக், கைரேகை"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"திரைப் பூட்டு"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"கைரேகை"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"கைரேகைகளை நிர்வகிக்கவும்"</string>
@@ -353,41 +365,40 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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" msgid="3508870672887336095">"மொபைலைத் திறக்க, வாங்குவதை அங்கீகரிக்க அல்லது பயன்பாடுகளில் உள்நுழைய, கைரேகை உணர்வியைத் தொட்டால் போதும். கைரேகையைப் பயன்படுத்தி மேலே குறிப்பிட்டுள்ளவற்றைச் செய்ய முடியும் என்பதால், அனைவரின் கைரேகைகளையும் இதில் சேர்க்க வேண்டாம்.\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="skip_anyway_button_label" msgid="2323522873558834513">"பரவாயில்லை, தவிர்"</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_content_description" msgid="2058830032070449160">"சாதனத்தில் கைரேகை உணர்வி அமைந்துள்ள இடத்தின் விளக்கப்படம்"</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="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_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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"பின்னர் செய்"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"கைரேகையை அமைக்க வேண்டாமா?"</string>
+    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"கைரேகையை மட்டும் பயன்படுத்தி மொபைலைத் திறக்கும் முறையைத் தேர்ந்தெடுத்துள்ளீர்கள். இப்போது தவிர்த்தால், இதைப் பின்னர் அமைக்க வேண்டியிருக்கும். இதை அமைக்க ஒரு நிமிடமே ஆகும்."</string>
     <string name="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_title" msgid="1863561601428695160">"அச்சச்சோ, அது சென்சார் இல்லை"</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="1688030823464420974">"அடுத்த முறை தவறான பேட்டர்னை வரைந்தால், சாதனத்தின் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"அடுத்த முறை தவறான பின்னை உள்ளிட்டால், சாதனத்தின் தரவு நீக்கப்படும்"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"அடுத்த முறை தவறான கடவுச்சொல்லை உள்ளிட்டால், சாதனத்தின் தரவு நீக்கப்படும்"</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="5047439819181833824">"பலமுறை தவறாக முயன்றதால், சாதனத்தின் தரவு நீக்கப்படும்."</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>
@@ -568,18 +589,18 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"ரத்துசெய்"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"அடுத்து"</string>
     <string name="lock_setup" msgid="3355847066343753943">"அமைக்கப்பட்டது."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"சாதன நிர்வாகிப் பயன்பாடுகள்"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"சாதன நிர்வாகி ஆப்ஸ்"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"பயன்பாடுகள் எதுவும் செயலில் இல்லை"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> பயன்பாடுகள் செயலில் உள்ளன</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> பயன்பாடு செயலில் உள்ளது</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> பயன்பாடுகள் இயங்குகின்றன</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> பயன்பாடு இயங்குகிறது</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"நம்பகமான ஏஜென்ட்கள்"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"பயன்படுத்த, முதலில் திரைப்பூட்டை அமைக்கவும்"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"ஏதுமில்லை"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
-      <item quantity="other">செயலில் உள்ள <xliff:g id="COUNT">%d</xliff:g> நம்பக ஏஜென்ட்டுகள்</item>
-      <item quantity="one">செயலில் உள்ள 1 நம்பக ஏஜென்ட்</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> நம்பக ஏஜென்ட்டுகள் இயங்குகின்றன</item>
+      <item quantity="one">1 நம்பக ஏஜென்ட் இயங்குகிறது</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"புளூடூத்"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"புளூடூத்தை இயக்கு"</string>
@@ -625,7 +646,15 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"மேம்பட்டவை"</string>
     <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="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>
@@ -646,7 +675,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ஸ்பீக்கர் ஃபோனாக"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"இசை மற்றும் மீடியாவிற்காக"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"அமைப்புகளை நினைவில்கொள்"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"அனுப்புதல்"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"வயர்லெஸ் காட்சியை இயக்கு"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"அருகில் சாதனங்கள் எதுவுமில்லை."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"இணைக்கிறது"</string>
@@ -664,16 +693,16 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"வைஃபையை இயக்க <xliff:g id="REQUESTER">%s</xliff:g> விரும்புகிறது"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"வைஃபையை முடக்க <xliff:g id="REQUESTER">%s</xliff:g> விரும்புகிறது"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"டேப்லெட்டானது வேறொரு சாதனத்தைத் தொடும்போது தரவு பரிமாற்றத்தை அனுமதி"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"மொபைலானது வேறொரு சாதனத்தைத் தொடும்போது தரவு பரிமாற்றத்தை அனுமதிக்கவும்"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"டேப்லெட்டானது வேறொரு சாதனத்தைத் தொடும்போது தரவுப் பரிமாற்றத்தை அனுமதி"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"வேறொரு சாதனத்தைத் தொடும்போது டேட்டா பரிமாற்றத்தை அனுமதி"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFCஐ இயக்கு"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC ஆனது இந்தச் சாதனம் மற்றும் அருகிலுள்ள பிற சாதனங்கள் அல்லது இலக்குகளுக்கு இடையே (எ.கா: கட்டண முனையங்கள், ஆக்சஸ் ரீடர்கள், ஊடாடத்தக்க விளம்பரங்கள் அல்லது குறிகள்) தரவைப் பரிமாற்றும்."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android பீம்"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC வழியாகப் பயன்பாட்டின் உள்ளடக்கத்தைப் பரிமாற்றுவதை அனுமதிக்கும்"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC வழியாக ஆப்ஸ் உள்ளடக்கத்தைப் பரிமாற்றும்"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"முடக்கப்பட்டுள்ளது"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC முடக்கப்பட்டுள்ளதால் கிடைக்கவில்லை"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android பீம்"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"இந்த அம்சம் இயக்கப்பட்டிருக்கும் போது, சாதனங்களை ஒன்றுக்கொன்று அருகில் வைத்துப் பிடிப்பதன் மூலம் பயன்பாட்டு உள்ளடக்கத்தை மற்றொரு NFC திறன் வாய்ந்த சாதனத்திற்குப் பீம் செய்யலாம். எடுத்துக்காட்டாக, உங்கள் உலாவிப் பக்கங்கள், YouTube வீடியோக்கள், தொடர்புகள், மேலும் பலவற்றைப் பீம் செய்யலாம்.\n\nசாதனங்களை ஒன்றுக்கொன்று மிகவும் அருகில் கொண்டுவந்து (அவற்றின் பின்பக்கம் சேர்ந்தார்போல்), உங்கள் திரையைத் தட்டவும். எதைப் பகிர வேண்டும் என்பதைப் பயன்பாடு தீர்மானிக்கும்."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"இந்த அம்சம் இயக்கப்பட்டிருக்கும் போது, சாதனங்களை அருகில் வைத்துப் பிடித்து, ஆப்ஸ் உள்ளடக்கத்தை மற்றொரு NFC திறன் வாய்ந்த சாதனத்தில் தெரியுமாறு புரொஜக்ட் செய்யலாம். எடுத்துக்காட்டாக, உங்கள் இணையப் பக்கங்கள், YouTube வீடியோக்கள், தொடர்புகள், மேலும் பலவற்றை மற்றொரு சாதனத்தில் தெரியுமாறு புரொஜக்ட் செய்யலாம்.\n\nசாதனங்களின் பின்புறத்தை அருகில் கொண்டுவந்து, உங்கள் திரையில் தட்டவும். புரொஜக்ட் செய்ய வேண்டிய உள்ளடக்கத்தை மற்றொரு சாதனத்தில் இந்த அம்சம் காட்டும்."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"வைஃபை"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"வைஃபையை இயக்கு"</string>
     <string name="wifi_settings" msgid="29722149822540994">"வைஃபை"</string>
@@ -686,18 +715,21 @@
     <string name="wifi_error" msgid="3207971103917128179">"பிழை"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"இந்த நாட்டில் 5 GHz அலைவரிசை இல்லை"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"விமானப் பயன்முறையில்"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"நெட்வொர்க் அறிவிப்பைத் திற"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"கடவுச்சொல் கேட்காத நெட்வொர்க்குகளின் அறிவிப்புகள்"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"உயர்தரமான பொது நெட்வொர்க் கிடைக்கும் போது தெரிவி"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"தானாகவே வைஃபையை இயக்கு"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"உயர்தரம் எனச் சேமிக்கப்பட்ட நெட்வொர்க்குகளுக்கு (எடுத்துக்காட்டு: உங்கள் வீட்டு நெட்வொர்க்) அருகில் இருக்கும் போது, வைஃபை இயக்கப்படும்"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"வைஃபை ஸ்கேனிங் முடக்கப்பட்டுள்ளதால், கிடைக்கவில்லை"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"அம்சத்தைப் பயன்படுத்த, நெட்வொர்க் மதிப்பீட்டு வழங்குநரைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"வேகம் குறைந்த இணைப்புகளைத் தவிர்"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"சிறப்பான இணைய இணைப்பைப் பெறும் வரை வைஃபை நெட்வொர்க்கைப் பயன்படுத்தாதே"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"நல்ல இணைய இணைப்பு கொண்ட நெட்வொர்க்குகளை மட்டும் பயன்படுத்து"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"திறந்த நெட்வொர்க்குகளுடன் இணை"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"கடவுச்சொல் கேட்காத நெட்வொர்க்குகளுடன் இணை"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"உயர்தரமான பொது நெட்வொர்க்குகளுடன் தானாக இணை"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"சான்றிதழ்களை நிறுவு"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"இருப்பிடத்தைத் துல்லியமாக அறிவதை மேம்படுத்த, முறைமையின் பயன்பாடுகளும் சேவைகளும் வைஃபை முடக்கத்தில் இருக்கும் போதும் வைஃபை நெட்வொர்க்குகளை ஸ்கேன் செய்யும். இதை <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேன் செய்தல் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> மாற்ற முடியும்."</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"அம்சத்தைப் பயன்படுத்த, நெட்வொர்க் மதிப்பீட்டு வழங்குநரைத் தேர்ந்தெடுக்கவும்"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"அம்சத்தைப் பயன்படுத்த, இணங்கும் நெட்வொர்க் மதிப்பீட்டு வழங்குநரைத் தேர்ந்தெடுக்கவும்"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"சான்றிதழ்களை நிறுவுதல்"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"இருப்பிடத்தை மேலும் துல்லியமாக அறிய, சாதனத்தின் ஆப்ஸ் மற்றும் சேவைகள் வைஃபை நெட்வொர்க்குகளை ஸ்கேன் செய்யும். இதை <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேனிங் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> மாற்றிக் கொள்ளலாம்."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"இருப்பிடத்தின் துல்லியத்தன்மையை மேம்படுத்த, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ஸ்கேனிங் அமைப்புகளில்<xliff:g id="LINK_END_1">LINK_END</xliff:g> வைஃபை ஸ்கேனிங்கை இயக்கவும்."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"மீண்டும் காட்டாதே"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"உறக்கநிலையில் Wi-Fi இயக்கு"</string>
@@ -707,9 +739,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"வைஃபையை மேம்படுத்துதல்"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"வைஃபையை இயக்கத்தில் இருக்கும்போது பேட்டரி பயன்பாட்டைக் குறை"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"வைஃபை இன் பேட்டரி பயன்பாட்டை வரம்பிடு"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"வைஃபையில் இணைய அணுகல் இல்லை எனில், மொபைல் தரவிற்கு மாறவும்."</string>
-    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"தானாகவே மொபைல் தரவிற்கு மாறு"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"வைஃபையில் இணைய அணுகல் இல்லாத போது, மொபைல் தரவைப் பயன்படுத்தும். தரவு உபயோகத்திற்குக் கட்டணம் விதிக்கப்படலாம்."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"வைஃபையில் இணைய அணுகல் இல்லை எனில், மொபைல் டேட்டாவிற்கு மாறவும்."</string>
+    <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"தானாகவே மொபைல் டேட்டாவிற்கு மாறு"</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"வைஃபையில் இணைய அணுகல் இல்லாத போது, மொபைல் டேட்டாவைப் பயன்படுத்தும். தரவு உபயோகத்திற்குக் கட்டணம் விதிக்கப்படலாம்."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"நெட்வொர்க்கைச் சேர்"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"வைஃபை விருப்பத்தேர்வுகள்"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"வைஃபை தானாக இயக்கப்படும்"</string>
@@ -717,7 +749,7 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"வைஃபை நெட்வொர்க்குகள்"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS புஷ் பொத்தான்"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"மேலும் விருப்பங்கள்"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin உள்ளீடு"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS பின் உள்ளீடு"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"வைஃபை டைரக்ட்"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ஸ்கேன் செய்"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"மேம்பட்டவை"</string>
@@ -727,7 +759,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"நெட்வொர்க்கை நீக்கு"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"நெட்வொர்க்கை மாற்று"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC குறியில் எழுது"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"கிடைக்கும் நெட்வொர்க்குகளைப் பார்க்க, வைஃபையை இயக்கவும்."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"இருக்கும் நெட்வொர்க்குகளைப் பார்க்க, வைஃபையை இயக்கவும்."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"வைஃபை நெட்வொர்க்கைத் தேடுகிறது…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"வைஃபை நெட்வொர்க்கை மாற்றுவதற்கான அனுமதி உங்களுக்கு இல்லை."</string>
     <string name="wifi_more" msgid="3195296805089107950">"மேலும்"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,9 +936,10 @@
     <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>
+    <string name="display_settings_title" msgid="1708697328627382561">"திரை அமைப்பு"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ஒலி"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ஒலியளவுகள்"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"இசை விளைவுகள்"</string>
@@ -919,7 +960,7 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"திரைப் பூட்டின் ஒலி"</string>
     <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"தட்டும் போது அதிர்வுறு"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"இரைச்சலை நீக்குதல்"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"இசை, வீடியோ, கேம்கள், &amp; பிற மீடியா"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"இசை, வீடியோ, கேம்ஸ் &amp; பிற மீடியா"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"ரிங்டோன் &amp; அறிவிப்புகள்"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"அறிவிப்புகள்"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"அலாரங்கள்"</string>
@@ -951,8 +992,9 @@
     <string name="search_settings" msgid="1910951467596035063">"தேடு"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"தேடல் அமைப்பு மற்றும் வரலாற்றை நிர்வகிக்கவும்"</string>
     <string name="search_settings_no_results" msgid="8799027492641230999">"முடிவுகள் இல்லை"</string>
-    <string name="display_settings" msgid="7965901687241669598">"தோற்றம்"</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>
@@ -968,7 +1010,7 @@
     <string name="auto_brightness_summary_default" msgid="7225666614394726845">"விரும்பும் ஒளிர்வு இயல்பு நிலையாகும்"</string>
     <string name="auto_brightness_summary_high" msgid="7172304165631136027">"விரும்பும் ஒளிர்வு அதிகமாகும்"</string>
     <string name="auto_brightness_summary_very_high" msgid="979277812582279078">"விரும்பும் ஒளிர்வு மிகவும் அதிகமாகும்"</string>
-    <string name="auto_brightness_off_title" msgid="2996864829946190795">"முடக்கு"</string>
+    <string name="auto_brightness_off_title" msgid="2996864829946190795">"ஆஃப்"</string>
     <string name="auto_brightness_very_low_title" msgid="8252988638614126320">"மிகவும் குறைவு"</string>
     <string name="auto_brightness_low_title" msgid="1632186441514863377">"குறைவு"</string>
     <string name="auto_brightness_default_title" msgid="936771997353506620">"இயல்பு"</string>
@@ -980,24 +1022,23 @@
     <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="screen_timeout" msgid="4351334843529712571">"உறக்கநிலையிலிரு"</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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"வால்பேப்பர்"</string>
@@ -1007,12 +1048,12 @@
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"திரையைத் தனிப்பயனாக்கு"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"வால்பேப்பர் தேர்வு"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"ஸ்கிரீன் சேவர்"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"சார்ஜ் ஆகும் போது அல்லது டாக்கில் இருக்கும் போது"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"சார்ஜ் ஆகும் போது அல்லது சாதனத்தில் இணைந்திருக்கும்போது"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"இவற்றில் ஒன்று"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"சார்ஜ் செய்யப்படும்போது"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"சாதனத்தில் இணைந்திருக்கும்போது"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"ஒருபோதும் வேண்டாம்"</string>
-    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"முடக்கத்தில்"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ஆஃப்"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"மொபைல் உறக்கநிலையில் அல்லது சார்ஜாகும்போது, நிகழ்வுகளைக் கட்டுப்படுத்த பகல்கனாவை இயக்கு."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"தொடங்க வேண்டிய நேரம்"</string>
     <string name="screensaver_settings_current" msgid="4663846038247130023">"தற்போதைய ஸ்கிரீன் சேவர்"</string>
@@ -1020,8 +1061,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="7337555569694794132">"எப்போதும் இயக்கத்தில் வை / பேட்டரியை அதிகமாகப் பயன்படுத்தும்"</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="6978257596231155345">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைக் காட்டு. அதே நேரதில் பேட்டரியை அதிகமாகப் பயன்படுத்தும்."</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>
@@ -1050,11 +1097,11 @@
     <string name="sim_enter_ok" msgid="6475946836899218919">"சரி"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ரத்துசெய்"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"பல SIMகள் உள்ளன"</string>
-    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"மொபைல் தரவிற்கான சிம்மைத் தேர்வுசெய்யவும்."</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"மொபைல் டேட்டாவிற்கான சிம்மைத் தேர்வுசெய்யவும்."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"தரவு சிம்மினை மாற்றவா?"</string>
-    <string name="sim_change_data_message" msgid="5854582807996717811">"<xliff:g id="OLD_SIM">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_SIM">%1$s</xliff:g> இன் மொபைல் தரவைப் பயன்படுத்தவா?"</string>
+    <string name="sim_change_data_message" msgid="5854582807996717811">"<xliff:g id="OLD_SIM">%2$s</xliff:g>க்குப் பதிலாக <xliff:g id="NEW_SIM">%1$s</xliff:g> இன் மொபைல் டேட்டாவைப் பயன்படுத்தவா?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"விருப்ப சிம் கார்டை மாற்றவா?"</string>
-    <string name="sim_preferred_message" msgid="8466930554330635780">"உங்கள் சாதனத்தில் <xliff:g id="NEW_SIM">%1$s</xliff:g> சிம் மட்டுமே உள்ளது. மொபைல் தரவு, அழைப்புகள் மற்றும் SMS செய்திகளுக்கு இந்தச் சிம்மையே பயன்படுத்தவா?"</string>
+    <string name="sim_preferred_message" msgid="8466930554330635780">"உங்கள் சாதனத்தில் <xliff:g id="NEW_SIM">%1$s</xliff:g> சிம் மட்டுமே உள்ளது. மொபைல் டேட்டா, அழைப்புகள் மற்றும் SMS செய்திகளுக்கு இந்தச் சிம்மையே பயன்படுத்தவா?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"சிம் பின் குறியீடு தவறானது, உங்கள் சாதனத்தைத் திறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ள வேண்டும்."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
       <item quantity="other">சிம்மின் பின் குறியீடு தவறானது, உங்களிடம் <xliff:g id="NUMBER_1">%d</xliff:g> முயற்சிகள் மீதமுள்ளன.</item>
@@ -1112,7 +1159,7 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"கிடைக்கிறது (படிக்க மட்டும்)"</string>
     <string name="memory_size" msgid="6629067715017232195">"மொத்த இடம்"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"கணக்கிடுகிறது..."</string>
-    <string name="memory_apps_usage" msgid="5128673488173839077">"பயன்பாடுகள் &amp; பயன்பாட்டுத் தரவு"</string>
+    <string name="memory_apps_usage" msgid="5128673488173839077">"ஆப்ஸ் &amp; ஆப்ஸ் டேட்டா"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"மீடியா"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"பதிவிறக்கங்கள்"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"படங்கள், வீடியோக்கள்"</string>
@@ -1192,16 +1239,16 @@
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"<xliff:g id="NAME">^1</xliff:g> இல் உள்ள பயன்பாடுகள், படங்கள் அல்லது தரவைப் பயன்படுத்த, அதை மீண்டும் செருகவும். \n\nசாதனம் இல்லையெனில், இந்தச் சேமிப்பகத்தை அகற்றிவிடவும். \n\nஅவ்வாறு அகற்றினால், அதிலுள்ள தரவு இனி கிடைக்காது. \n\nபயன்பாடுகளை மீண்டும் நிறுவிக்கொள்ளலாம், எனினும் அவற்றின் தரவு மீண்டும் கிடைக்காது."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g>ஐ அகற்றவா?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"<xliff:g id="NAME">^1</xliff:g> இல் சேமிக்கப்பட்ட அனைத்து பயன்பாடுகள், படங்கள் மற்றும் தரவு ஆகியவற்றை நிரந்தரமாக இழப்பீர்கள்."</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"பயன்பாடுகள்"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"ஆப்ஸ்"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"படங்கள்"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"வீடியோக்கள்"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ஆடியோ"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"தற்காலிகத் தரவு"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"பிற"</string>
-    <string name="storage_detail_system" msgid="4629506366064709687">"முறைமை"</string>
+    <string name="storage_detail_system" msgid="4629506366064709687">"சிஸ்டம்"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> இல் உலாவு"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"பயன்பாடுகள் சேமித்த பகிர்ந்த கோப்புகள், இணையம் அல்லது புளூடூத்திலிருந்து இறக்கிய கோப்புகள், Android கோப்புகள் போன்றவை மற்றவையில் அடங்கும். \n\n<xliff:g id="NAME">^1</xliff:g> இன் பார்க்கக்கூடிய உள்ளடக்கத்தைப் பார்க்க, உலாவுக என்பதைத் தட்டவும்."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Android <xliff:g id="VERSION">%s</xliff:g> பதிப்பை இயக்குவதற்குப் பயன்படுத்தப்படும் கோப்புகளும் இயங்குதளத்தில் அடங்கும்"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Android <xliff:g id="VERSION">%s</xliff:g> பதிப்பை இயக்குவதற்குப் பயன்படுத்தப்படும் ஃபைல்களும் இயங்குதளத்தில் அடங்கும்"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> சேமிப்பகத்தின் <xliff:g id="SIZE">^2</xliff:g> அளவைப் பயன்படுத்தி, படங்கள், இசை, பயன்பாடுகள் அல்லது பிற தரவைச் சேமித்திருக்கலாம். \n\nவிவரங்களைப் பார்க்க, <xliff:g id="USER_1">^1</xliff:g>க்கு மாறவும்."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>ஐ அமைக்கவும்"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"கையடக்க சேமிப்பகமாகப் பயன்படுத்தவும்"</string>
@@ -1226,7 +1273,7 @@
     <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"நகர்த்தும்போது: \n• <xliff:g id="NAME">^1</xliff:g>ஐ அகற்ற வேண்டாம். \n• சில பயன்பாடுகள் சரியாக வேலை செய்யாது. \n• சாதனம் சார்ஜ் செய்யப்பட்டிருக்க வேண்டும்."</string>
     <string name="storage_wizard_ready_title" msgid="5381632402953258267">"<xliff:g id="NAME">^1</xliff:g> தயார்"</string>
     <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"<xliff:g id="NAME">^1</xliff:g> படங்களையும் பிற மீடியாவையும் பயன்படுத்த, தயாராக உள்ளது."</string>
-    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"புதிய <xliff:g id="NAME">^1</xliff:g> வேலை செய்கிறது. \n\nசாதனத்திற்கு படங்கள், கோப்புகள், பயன்பாட்டுத் தரவை நகர்த்த, அமைப்புகள் &gt; சேமிப்பகம் என்பதற்குச் செல்லவும்."</string>
+    <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"புதிய <xliff:g id="NAME">^1</xliff:g> வேலை செய்கிறது. \n\nசாதனத்திற்கு படங்கள், கோப்புகள், ஆப்ஸ் டேட்டாவை நகர்த்த, அமைப்புகள் &gt; சேமிப்பகம் என்பதற்குச் செல்லவும்."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>ஐ நகர்த்தவும்"</string>
     <string name="storage_wizard_move_confirm_body" msgid="5176432115206478941">"<xliff:g id="APP">^1</xliff:g>ஐயும் அதன் தரவையும் <xliff:g id="NAME_0">^2</xliff:g>க்கு நகர்த்த ஒருசில வினாடிகள் மட்டுமே எடுக்கும். நகர்த்தப்படும்போது பயன்பாட்டைப் பயன்படுத்த முடியாது. \n\nநகர்த்தும்போது <xliff:g id="NAME_1">^2</xliff:g>ஐ அகற்ற வேண்டாம்."</string>
     <string name="storage_wizard_move_progress_title" msgid="4443920302548035674">"<xliff:g id="APP">^1</xliff:g> நகர்த்தப்படுகிறது…"</string>
@@ -1235,7 +1282,7 @@
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"இந்த <xliff:g id="NAME_0">^1</xliff:g> வேகம் குறைவானது போல் தெரிகிறது. \n\nநீங்கள் தொடரலாம், இந்த இடத்திற்கு நகர்த்தப்பட்ட பயன்பாடுகள் தடங்கல்களுடன் இயங்கலாம் மற்றும் தரவைப் பரிமாற்றுவதற்கு அதிக நேரம் எடுக்கலாம். \n\nசிறந்த செயல்திறனுக்கு, வேகமான <xliff:g id="NAME_1">^1</xliff:g>ஐப் பயன்படுத்தவும்."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"பேட்டரி நிலை"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"பேட்டரி நிலை"</string>
-    <string name="apn_settings" msgid="3743170484827528406">"APNகள்"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"APN பட்டியல்"</string>
     <string name="apn_edit" msgid="1354715499708424718">"ஆக்சஸ் பாயிண்ட்டைத் திருத்து"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"அமைக்கப்படவில்லை"</string>
     <string name="apn_name" msgid="4115580098369824123">"பெயர்"</string>
@@ -1273,6 +1320,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>
@@ -1291,17 +1339,22 @@
       <item quantity="one">1 கணக்கு மீட்டமைக்கப்படும்</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"சாதனச் சேமிப்பகமும் எல்லாத் தரவும் மீட்டமைக்கப்படும்"</string>
-    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"இது, உங்கள் டேப்லெடின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா தரவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"அமைப்பு மற்றும் பயன்பாட்டுத் தரவு, மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட பயன்பாடுகள்"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"இது, உங்கள் மொபைலின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள பின்வரும் எல்லா தரவையும் அழித்துவிடும்:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"கணினி, பயன்பாட்டுத் தரவு மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கிய பயன்பாடுகள்"</li></string>
+    <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"இது, உங்கள் டேப்லெடின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள எல்லா டேட்டாவையும் அழித்துவிடும், இவற்றில் உள்ளடங்குவன:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் டேட்டா, மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட பயன்பாடுகள்"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"இது, உங்கள் மொபைலின் "<b>"அகச் சேமிப்பிடத்தில்"</b>" உள்ள பின்வரும் எல்லா டேட்டாவையும் அழித்துவிடும்:\n\n"<li>"உங்கள் Google கணக்கு"</li>\n<li>"சிஸ்டம், ஆப்ஸ் டேட்டா மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கிய பயன்பாடுகள்"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"தற்போது, பின்வரும் கணக்குகளில் உள்நுழைந்துள்ளீர்கள்:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"இந்தச் சாதனத்தில் பிற பயனர்கள் உள்ளனர்.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"இசை"</li>\n<li>"படங்கள்"</li>\n<li>"பிற பயனர் தரவு"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"இ-சிம்மை ஆதரிக்கும் தொலைத்தொடர்பு நிறுவனங்கள்"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"இதைச் செய்வதால், உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிப்பதற்கு, "<b>"USB சேமிப்பிடத்தை"</b>" அழிக்க வேண்டியிருக்கும்."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"SD கார்டு"</b>" அழிக்கப்பட வேண்டும்."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB சேமிப்பிடத்தை அழி"</string>
     <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>
@@ -1317,37 +1370,26 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"போர்ட்டபிள் ஹாட்ஸ்பாட்"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"புளூடூத் டெதெரிங்"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"டெதெரிங்"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"ஹாட்ஸ்பாட்டும் இணைப்பு முறையும்"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"ஹாட்ஸ்பாட் &amp; டெதெரிங்"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ஹாட்ஸ்பாட்டும் இணைப்பு முறையும் இயக்கத்திலுள்ளன"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ஹாட்ஸ்பாட் இயக்கத்திலுள்ளது"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"இணைப்பு முறை"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, இணைக்கவோ போர்ட்டபிள் ஹாட்ஸ்பாட்டுகளைப் பயன்படுத்தவோ முடியாது"</string>
+    <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>
-    <string name="sms_application_title" msgid="4903928270533250448">"SMS பயன்பாடு"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS பயன்பாட்டை மாற்றவா?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="CURRENT_APP">%2$s</xliff:g> க்குப் பதிலாக <xliff:g id="NEW_APP">%1$s</xliff:g> ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> ஐ உங்கள் SMS பயன்பாடாகப் பயன்படுத்தவா?"</string>
@@ -1376,7 +1418,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>
@@ -1421,14 +1463,17 @@
     <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>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"கடவுச்சொற்கள் பொருந்தவில்லை"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"பின்கள் பொருந்தவில்லை"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"திறப்பதற்கான தேர்வு"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"எப்படித் திறக்க வேண்டும்?"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"கடவுச்சொல் அமைக்கப்பட்டது"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"பின் அமைக்கப்பட்டது"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"வடிவம் அமைக்கப்பட்டது"</string>
@@ -1466,9 +1511,9 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"திரையைத் திறப்பதற்கான வடிவத்தை வரைய வேண்டும்"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"வடிவத்தைக் காணும்படி செய்"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"சுயவிவரப் பேட்டர்னை வரையும் போது காட்டு"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"தட்டும் போது அதிர்வுறு"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"பவர் பொத்தான் உடனே பூட்டும்"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> பயன்படுத்தாத போது"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"தட்டும் போது அதிர்வது"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"பவர் அழுத்தினால் பூட்டும் சூழல்"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> வழியாகத் திறக்காத நேரங்களில்"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"திறப்பதற்கான வடிவத்தை அமை"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"திறப்பதற்கான வடிவத்தை மாற்று"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"திறப்பதற்கான வடிவத்தை எப்படி வரைவது"</string>
@@ -1486,16 +1531,19 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"சாதனத் திரைப் பூட்டைப் போன்றது"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"பயன்பாடுகளை நிர்வகி"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"நிறுவப்பட்ட பயன்பாடுகளை நிர்வகி மற்றும் அகற்று"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"பயன்பாட்டுத் தகவல்"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"ஆப்ஸ் தகவல்"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"அமைப்புகளை நிர்வகிக்கும், விரைவு துவக்கத்திற்கான குறுக்குவழிகளை அமைக்கும்"</string>
     <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"மேலும் அமைப்பு விருப்பங்களை இயக்கு"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"பயன்பாட்டுத் தகவல்"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"ஆப்ஸ் தகவல்"</string>
     <string name="storage_label" msgid="8700867073480107253">"சேமிப்பிடம்"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"இயல்பாகத் திற"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"இயல்புநிலைகள்"</string>
@@ -1537,10 +1585,10 @@
     <string name="show_running_services" msgid="5736278767975544570">"இயங்கும் சேவைகளைக் காட்டு"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"தற்காலிகச் சேமிப்பின் செயல்முறைகளைக் காட்டு"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"அவசரப் பயன்பாடு"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"பயன்பாட்டு அமைப்பை மீட்டமை"</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"ஆப்ஸ் அமைப்பை மீட்டமை"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"அமைப்பை மீட்டமைக்கவா?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"இது, பின்வருபவற்றின் எல்லா விருப்பத்தேர்வுகளையும் மீட்டமைக்கும்:\n\n "<li>"முடக்கப்பட்ட பயன்பாடுகள்"</li>\n" "<li>"முடக்கப்பட்ட பயன்பாட்டின் அறிவிப்புகள்"</li>\n" "<li>"செயல்பாடுகளுக்கான இயல்புநிலைப் பயன்பாடுகள்"</li>\n" "<li>"பயன்பாடுகளுக்கான பின்புலத் தரவின் வரையறைகள்"</li>\n" "<li>"ஏதேனும் அனுமதி வரையறைகள்"</li>\n\n" எந்தப் பயன்பாட்டுத் தரவையும் இழக்கமாட்டீர்கள்."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"பயன்பாடுகளை மீட்டமை"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"இது, பின்வருபவற்றின் எல்லா விருப்பத்தேர்வுகளையும் மீட்டமைக்கும்:\n\n "<li>"முடக்கப்பட்ட ஆப்ஸ்"</li>\n" "<li>"முடக்கப்பட்ட ஆப்ஸின் அறிவிப்புகள்"</li>\n" "<li>"செயல்பாடுகளுக்கான இயல்புநிலைப் பயன்பாடுகள்"</li>\n" "<li>"ஆப்ஸ்களுக்கான பின்புல டேட்டாவின் கட்டுப்பாடுகள்"</li>\n" "<li>"ஏதேனும் அனுமதிக் கட்டுப்பாடுகள்"</li>\n\n" எந்த ஆப்ஸ் டேட்டாவையும் இழக்கமாட்டீர்கள்."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"ஆப்ஸை மீட்டமை"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"காலி இடத்தை நிர்வகி"</string>
     <string name="filter" msgid="2018011724373033887">"வடிகட்டு"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"வடிப்பான் விருப்பங்களைத் தேர்வுசெய்யவும்"</string>
@@ -1558,13 +1606,13 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB சேமிப்பிடம்"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD கார்டின் சேமிப்பிடம்"</string>
     <string name="recompute_size" msgid="7722567982831691718">"அளவை மீண்டும் கணக்கிடுகிறது…"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"பயன்பாட்டுத் தரவை நீக்கவா?"</string>
-    <string name="clear_data_dlg_text" msgid="3951297329833822490">"பயன்பாட்டின் எல்லா தகவலும் நிரந்தரமாக நீக்கப்படும். இதில் எல்லா கோப்புகளும், அமைப்புகளும், கணக்குகளும், தரவுத்தளங்களும், மேலும் பலவும் அடங்கும்."</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"ஆப்ஸ் டேட்டாவை நீக்கவா?"</string>
+    <string name="clear_data_dlg_text" msgid="3951297329833822490">"பயன்பாட்டின் எல்லா தகவலும் நிரந்தரமாக நீக்கப்படும். இதில் எல்லா ஃபைல்களும், அமைப்புகளும், கணக்குகளும், தரவுத்தளங்களும், மேலும் பலவும் அடங்கும்."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"சரி"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ரத்துசெய்"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"நிறுவிய பயன்பாடுகளின் பட்டியலில் பயன்பாடு இல்லை."</string>
-    <string name="clear_data_failed" msgid="7214074331627422248">"பயன்பாட்டுத் தரவை அழிக்க முடியவில்லை."</string>
+    <string name="clear_data_failed" msgid="7214074331627422248">"ஆப்ஸ் டேட்டாவை அழிக்க முடியவில்லை."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"தரவை அழி"</string>
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"பயன்பாட்டிற்கான தரவை அழிக்க முடியவில்லை."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"உங்கள் டேப்லெடில் பின்வருவனவற்றை இந்தப் பயன்பாடு அணுகலாம்:"</string>
@@ -1637,8 +1685,8 @@
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> செயல்முறைகள், <xliff:g id="NUMSERVICES">%2$d</xliff:g> சேவை"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"சாதன நினைவகம்"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"பயன்பாட்டின் RAM பயன்பாடு"</string>
-    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"முறைமை"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"பயன்பாடுகள்"</string>
+    <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"சிஸ்டம்"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"ஆப்ஸ்"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"காலி"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"பயன்படுத்தப்பட்டது"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"தற்காலிகச் சேமிப்பு"</string>
@@ -1659,6 +1707,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>
@@ -1673,7 +1725,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"கைமுறை விசைப்பலகை அமைப்பு"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" ஐச் செருக Space விசையை இருமுறை அழுத்தவும்"</string>
     <string name="show_password" msgid="4837897357002495384">"கடவுச்சொற்களைக் காட்டு"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"உள்ளிடும் போதே எழுத்துக்குறிகளைச் சற்று நேரம் காட்டும்"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"உள்ளிடும் போதே எழுத்துகளைச் சற்று நேரம் காட்டும்"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"கடவுச்சொற்கள் மற்றும் கிரெடிட் கார்டு எண்கள் போன்ற தனிப்பட்ட தரவு உள்பட நீங்கள் உள்ளிடும் எல்லா உரையையும் இந்த பிழைத்திருத்தி சேகரிக்கலாம். இது <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> பயன்பாட்டிலிருந்து வந்ததாகும். பிழைத்திருத்தியைப் பயன்படுத்தவா?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"அமைப்பு"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"மொழி"</string>
@@ -1757,9 +1809,10 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"திரைப் படிப்பான்கள், திரை, ஊடாடல் கட்டுப்பாடுகள்"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"காட்சி அமைப்புகள்"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"உங்கள் தேவைகளுக்கேற்ப இந்தச் சாதனத்தைத் தனிப்பயனாக்கலாம். இந்த அணுகல்தன்மை அம்சங்களை அமைப்புகளுக்குச் சென்று மாற்றலாம்."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"எழுத்துரு அளவை அதிகரிக்கவும்"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"திரைப் படிப்பான்கள்"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ஆடியோ &amp; திரையில் காட்டப்படும் உரை"</string>
-    <string name="display_category_title" msgid="685461049938269166">"காட்சி"</string>
+    <string name="display_category_title" msgid="685461049938269166">"திரை அமைப்பு"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"ஊடாடல் கட்டுப்பாடுகள்"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"பதிவிறக்கிய சேவைகள்"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"சோதனை முயற்சி"</string>
@@ -1794,7 +1847,7 @@
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"குறிப்பான் நகர்வதை நிறுத்தியதும் கிளிக் செய்"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"கிளிக்கிற்கு முந்தைய தாமதம்"</string>
     <string name="accessibility_summary_default_combination" msgid="90096949592817459">"<xliff:g id="STATE">%1$s</xliff:g> / <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
-    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"இயக்கப்பட்டுள்ளது"</string>
+    <string name="accessibility_summary_state_enabled" msgid="8359913912320966304">"ஆன்"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"முடக்கப்பட்டுள்ளது"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"விரைவு அமைப்புகளில் காட்டு"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"சரிப்படுத்தும் முறை"</string>
@@ -1819,8 +1872,8 @@
       <item quantity="one">மிக அதிக தாமதம் (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> மிவி)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"அமைப்பு"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"இயக்கத்தில்"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"முடக்கத்தில்"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ஆன்"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ஆஃப்"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"முன்னோட்டம்"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"நிலையான விருப்பங்கள்"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"மொழி"</string>
@@ -1873,12 +1926,16 @@
       <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>
+    <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>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"அமைப்பு"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"அச்சுப்பொறிகளைச் சேர்"</string>
-    <string name="print_feature_state_on" msgid="8098901852502441048">"இயக்கத்தில்"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"ஆன்"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"முடக்கப்பட்டுள்ளது"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"சேவையைச் சேர்"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"அச்சுப்பொறியைச் சேர்"</string>
@@ -1908,11 +1965,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"பயன்பாட்டைப் பயன்படுத்தாத போது, அதைப் பின்னணியில் இயக்கலாம்"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"பயன்பாட்டைப் பயன்படுத்தாத போது, அதன் பின்னணி செயல்பாடு வரம்பிடப்படும்"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"பின்னணியில் இயங்குவதற்குப் பயன்பாடு அனுமதிக்கப்படவில்லை"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"முழு சார்ஜ் ஆனதிலிருந்து திரை உபயோகம்"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"திரையின் பயன்பாடு (முழு சார்ஜ் ஆன பிறகு)"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"திரை நுகர்வு"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"மொபைல் நெட்வொர்க்கை ஸ்கேன் செய்தல்"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> முன்பு"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"முழு சார்ஜ் ஆனதிலிருந்து பயன்பாட்டின் உபயோகம் (<xliff:g id="TIME">^1</xliff:g> முன்பு)"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"முழு சார்ஜ் ஆன பிறகு ஆப்ஸின் பயன்பாடு (<xliff:g id="TIME">^1</xliff:g> முன்பு)"</string>
     <string name="power_usage_list_summary_device" msgid="7036566616386864302">"முழு சார்ஜ் ஆனதிலிருந்து சாதனத்தின் உபயோகம் (<xliff:g id="TIME">^1</xliff:g> முன்பு)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"முழு சார்ஜ் ஆனதிலிருந்து, திரை இயக்கத்தில் இருந்த நேரம்"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"முழு சார்ஜ் ஆனதிலிருந்து சாதன உபயோகம்"</string>
@@ -1920,7 +1977,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>
@@ -1933,12 +1990,35 @@
     <string name="awake" msgid="387122265874485088">"சாதனம் விழித்திருக்கும் நேரம்"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"வைஃபை இயக்க நேரம்"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"வைஃபை இயக்க நேரம்"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"மேம்பட்ட பேட்டரி உபயோகம்"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"மேம்பட்ட பேட்டரி பயன்பாடு"</string>
     <string name="history_details_title" msgid="3608240585315506067">"வரலாறு விவரங்கள்"</string>
-    <string name="battery_details_title" msgid="6101394441569858580">"பேட்டரி உபயோகம்"</string>
+    <string name="battery_details_title" msgid="6101394441569858580">"பேட்டரி பயன்பாடு"</string>
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் மொபைலைத் தொடர்ந்து செயல்பாட்டில் வைப்பதால், எப்போதும் போல் மொபைலால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, பயன்பாட்டை நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, பயன்பாட்டை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் டேப்லெட்டைத் தொடர்ந்து செயல்பாட்டில் வைப்பதால், எப்போதும் போல் டேப்லெட்டால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, பயன்பாட்டை நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, பயன்பாட்டை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் சாதனத்தைத் தொடர்ந்து செயல்பாட்டில் வைப்பதால், எப்போதும் போல் சாதனத்தால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, பயன்பாட்டை நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, பயன்பாட்டை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> உங்கள் மொபைலைத் தொடர்ந்து செயல்பாட்டில் வைத்திருக்கும் என்பதால், எப்போதும் போல் மொபைலால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, <xliff:g id="APP_1">%1$s</xliff:g>ஐ நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, பயன்பாட்டை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> உங்கள் டேப்லெட்டைத் தொடர்ந்து செயல்பாட்டில் வைத்திருக்கும் என்பதால், எப்போதும் போல் டேப்லெட்டால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, <xliff:g id="APP_1">%1$s</xliff:g>ஐ நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, பயன்பாட்டை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> உங்கள் சாதனத்தைத் தொடர்ந்து செயல்பாட்டில் வைத்திருக்கும் என்பதால், எப்போதும் போல் சாதனத்தால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, <xliff:g id="APP_1">%1$s</xliff:g>ஐ நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, பயன்பாட்டை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"பயன்பாட்டை நிறுத்து"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"பின்னணி உபயோகத்தை முடக்கி, பயன்பாட்டை நிறுத்தவா?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> உங்கள் மொபைலைத் தொடர்ந்து செயல்பாட்டில் வைத்திருக்கும் என்பதால், எப்போதும் போல் மொபைலால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, <xliff:g id="APP_1">%1$s</xliff:g> பயன்பாட்டை நிறுத்தி, பின்னணியில் அது இயங்குவதைத் தடுக்கலாம்."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> உங்கள் டேப்லெட்டைத் தொடர்ந்து செயல்பாட்டில் வைத்திருக்கும் என்பதால், எப்போதும் போல் டேப்லெட்டால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, <xliff:g id="APP_1">%1$s</xliff:g> பயன்பாட்டை நிறுத்தி, பின்னணியில் அது இயங்குவதைத் தடுக்கலாம்."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> உங்கள் சாதனத்தைத் தொடர்ந்து செயல்பாட்டில் வைத்திருக்கும் என்பதால், எப்போதும் போல் சாதனத்தால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, <xliff:g id="APP_1">%1$s</xliff:g> பயன்பாட்டை நிறுத்தி, பின்னணியில் அது இயங்குவதைத் தடுக்கலாம்."</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="7774807745601479888">"<xliff:g id="APP">%1$s</xliff:g>ஐப் பயன்படுத்தாத போதும், அது உங்கள் இருப்பிடத்தை அடிக்கடிக் கோருவதால், எப்போதும் போல் மொபைலால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, இந்தப் பயன்பாட்டிற்கான இருப்பிட அணுகலை முடக்கலாம்."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"<xliff:g id="APP">%1$s</xliff:g>ஐப் பயன்படுத்தாத போதும், அது உங்கள் இருப்பிடத்தை அடிக்கடிக் கோருவதால், எப்போதும் போல் டேப்லெட்டால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, இந்தப் பயன்பாட்டிற்கான இருப்பிட அணுகலை முடக்கலாம்."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"<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>
@@ -1950,10 +2030,10 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"மொபைலின் செயல்படாநிலை"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"இதர அமைப்பு"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
-    <string name="power_apps" msgid="2043554781293951327">"பயன்பாடுகள்"</string>
+    <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_system" msgid="8290455327965307383">"சிஸ்டம்"</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>
@@ -1976,7 +2056,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"கணக்கிடப்பட்ட ஆற்றல் பயன்பாடு"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"உண்மையில் பயன்படுத்திய ஆற்றல்"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"உடனே நிறுத்து"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"பயன்பாட்டுத் தகவல்"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"ஆப்ஸ் தகவல்"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"பயன்பாட்டு அமைப்பு"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"திரை அமைப்பு"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"வைஃபை அமைப்பு"</string>
@@ -2005,18 +2085,19 @@
     <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>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"கடைசியாக முழுவதும் சார்ஜ் ஆனதிலிருந்து பிரேக் டவுன்"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"விரிவான தகவல் (கடைசியாக முழு சார்ஜ் ஆன பிறகு)"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"கடைசியாக முழு சார்ஜ் செய்தது:"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"மீதமிருக்கும் பேட்டரி நேரம் தோராயமானதாகும், உபயோகத்தின் அடிப்படையில் மாறலாம்"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"மேலே உள்ள பேட்டரி பயன்பாட்டுத் தகவல் தோராயமானதே. பயன்படுத்துவதன் அடிப்படையில் இந்தத் தகவல் மாறலாம்"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"உபயோகத்தில் இருக்கும் போது"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"பின்னணியில் இருக்கும் போது"</string>
-    <string name="battery_detail_power_usage" msgid="6485766868610469101">"பேட்டரி உபயோகம்"</string>
+    <string name="battery_detail_power_usage" msgid="6485766868610469101">"பேட்டரி பயன்பாடு"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"மொத்தப் பயன்பாட்டு உபயோகத்தில் <xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"முழு சார்ஜ் ஆனதிலிருந்து"</string>
-    <string name="battery_detail_manage_title" msgid="9094314252105828014">"பேட்டரி உபயோகத்தை நிர்வகி"</string>
+    <string name="battery_detail_manage_title" msgid="9094314252105828014">"பேட்டரி பயன்பாட்டை நிர்வகி"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"கணக்கிடப்பட்ட மீதமுள்ள நேரம்"</string>
     <string name="estimated_charging_time_left" msgid="5614442409326164691">"முழு சார்ஜ் ஆக"</string>
     <string name="estimated_time_description" msgid="8760210909000037089">"உபயோகத்தின் அடிப்படையில் கணிப்பு நேரம் மாறலாம்"</string>
@@ -2029,7 +2110,7 @@
     <string name="process_dex2oat_label" msgid="2592408651060518226">"பயன்பாட்டிற்கான மேம்படுத்தல்"</string>
     <string name="battery_saver" msgid="1426682272004907982">"பேட்டரி சேமிப்பான்"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"தானாகவே இயக்கு"</string>
-    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"எப்போதும் வேண்டாம்"</string>
+    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ஒருபோதும் வேண்டாம்"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> பேட்டரி இருக்கும் போது"</string>
     <string name="battery_percentage" msgid="723291197508049369">"பேட்டரி சதவீதம்"</string>
     <string name="battery_percentage_description" msgid="8511658577507384014">"பேட்டரி சதவீதத்தை நிலைப் பட்டியில் காட்டும்"</string>
@@ -2065,7 +2146,7 @@
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 மணிநேரம்"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 மணிநேரம்"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 நாள்"</string>
-    <string name="menu_show_system" msgid="8864603400415567635">"அமைப்பைக் காட்டு"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"எல்லாம் காட்டு"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"சிஸ்டத்திற்கு உரியவற்றை மறை"</string>
     <string name="menu_show_percentage" msgid="4717204046118199806">"சதவீதத்தில் காட்டு"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"Uss ஐப் பயன்படுத்து"</string>
@@ -2099,8 +2180,8 @@
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"வைஃபை அமைப்பைப் புதுப்பிக்கிறது"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"புளூடூத் அமைப்புகளைப் புதுப்பிக்கிறது"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="gadget_state_on" msgid="6909119593004937688">"இயக்கத்தில்"</string>
-    <string name="gadget_state_off" msgid="5220212352953066317">"முடக்கத்தில்"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"ஆன்"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"ஆஃப்"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"இயக்குகிறது"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"முடக்குகிறது"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"வைஃபை"</string>
@@ -2150,23 +2231,23 @@
     <string name="backup_section_title" msgid="7952232291452882740">"காப்புப் பிரதி &amp; மீட்டெடுத்தல்"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"தனிப்பட்ட தரவு"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"தரவை காப்புப்பிரதியெடு"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"பயன்பாட்டுத் தரவு, வைஃபை கடவுச்சொற்கள் மற்றும் Google சேவையகங்களுக்கான பிற அமைப்புகளைக் காப்புப் பிரதியெடு"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"ஆப்ஸ் டேட்டா, வைஃபை கடவுச்சொற்கள் மற்றும் Google சேவையகங்களுக்கான பிற அமைப்புகளைக் காப்புப் பிரதியெடு"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"காப்புப்பிரதி கணக்கு"</string>
-    <string name="include_app_data_title" msgid="2829970132260278394">"பயன்பாட்டுத் தரவு உட்பட"</string>
+    <string name="include_app_data_title" msgid="2829970132260278394">"ஆப்ஸ் டேட்டா உட்பட"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"தானியங்கு மீட்டெடுப்பு"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"பயன்பாட்டை மீண்டும் நிறுவும்போது, காப்புப் பிரதி எடுத்த அமைப்புகளையும் தரவையும் மீட்டெடு"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"காப்புப் பிரதிச் சேவை செயலில் இல்லை"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"தற்போது எந்தக் கணக்கும் காப்புப் பிரதி எடுக்கப்பட்ட தரவைச் சேமிப்பதில்லை"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"உங்கள் வைஃபை கடவுச்சொற்கள், புத்தகக்குறிகள், பிற அமைப்புகள் மற்றும் பயன்பாட்டுத் தரவைக் காப்புப் பிரதியெடுப்பதை நிறுத்துவதுடன், Google சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழித்துவிட வேண்டுமா?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள் மற்றும் அழைப்பு பதிவு போன்றவை) பயன்பாட்டுத் தரவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள் மற்றும் கோப்புகள் போன்றவை) காப்புப் பிரதி எடுப்பதை நிறுத்தி, தொலைநிலை சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழிக்கவா?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள், அழைப்பு பதிவு போன்றவை) பயன்பாட்டுத் தரவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள், கோப்புகள் போன்றவை) தொலைநிலையில் தானாகக் காப்புப் பிரதி எடுக்கும்.\n\nதானியங்கு காப்புப் பிரதியை இயக்கும் போது, சாதனம் மற்றும் பயன்பாட்டுத் தரவானது குறிப்பிட்ட கால இடைவெளியில் தொலைநிலையில் சேமிக்கப்படும். பயன்பாட்டுத் தரவு என்பது, தொடர்புகள், செய்திகள், படங்கள் போன்ற மிகவும் முக்கிய தரவு உட்பட, பயன்பாடு சேமித்த (டெவெலப்பர் அமைப்புகளைப் பொறுத்து) எந்தத் தரவாகவும் இருக்கலாம்."</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"உங்கள் வைஃபை கடவுச்சொற்கள், புத்தகக்குறிகள், பிற அமைப்புகள் மற்றும் ஆப்ஸ் டேட்டாவைக் காப்புப் பிரதியெடுப்பதை நிறுத்துவதுடன், Google சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழித்துவிட வேண்டுமா?"</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள் மற்றும் அழைப்பு பதிவு போன்றவை) ஆப்ஸ் டேட்டாவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள் மற்றும் கோப்புகள் போன்றவை) காப்புப் பிரதி எடுப்பதை நிறுத்தி, தொலைநிலை சேவையகங்களில் உள்ள எல்லா நகல்களையும் அழிக்கவா?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"சாதனத் தரவையும் (வைஃபை கடவுச்சொற்கள், அழைப்பு பதிவு போன்றவை) ஆப்ஸ் டேட்டாவையும் (பயன்பாடுகளில் சேமிக்கப்பட்டிருக்கும் அமைப்புகள், கோப்புகள் போன்றவை) தொலைநிலையில் தானாகக் காப்புப் பிரதி எடுக்கும்.\n\nதானியங்கு காப்புப் பிரதியை இயக்கும் போது, சாதனம் மற்றும் ஆப்ஸ் டேட்டாவானது குறிப்பிட்ட கால இடைவெளியில் தொலைநிலையில் சேமிக்கப்படும். ஆப்ஸ் டேட்டா என்பது, தொடர்புகள், செய்திகள், படங்கள் போன்ற மிகவும் முக்கிய தரவு உட்பட, பயன்பாடு சேமித்த (டெவெலப்பர் அமைப்புகளைப் பொறுத்து) எந்தத் தரவாகவும் இருக்கலாம்."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"சாதன நிர்வாகி அமைப்புகள்"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"சாதன நிர்வாகிப் பயன்பாடு"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"இந்தச் சாதன நிர்வாகிப் பயன்பாட்டைச் செயலற்றதாக்கு"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"பயன்பாட்டை நிறுவல் நீக்கு"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"செயலற்றதாக்கி, நிறுவல் நீக்கு"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"சாதன நிர்வாகிப் பயன்பாடுகள்"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"சாதன நிர்வாகி ஆப்ஸ்"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"சாதன நிர்வாகிப் பயன்பாடுகள் எதுவுமில்லை"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"தனிப்பட்டவை"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"பணியிடம்"</string>
@@ -2184,7 +2265,7 @@
     <string name="sound_category_sound_title" msgid="1488759370067953996">"பொதுவானவை"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"அறிவிப்பு பதிவு"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"அழைப்பின் ரிங்டோன் &amp; அதிர்வு"</string>
-    <string name="sound_category_system_title" msgid="1480844520622721141">"அமைப்பு"</string>
+    <string name="sound_category_system_title" msgid="1480844520622721141">"சிஸ்டம்"</string>
     <string name="wifi_setup_title" msgid="2970260757780025029">"வைஃபை அமைவு"</string>
     <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"வைஃபை நெட்வொர்க் <xliff:g id="NETWORK_NAME">%s</xliff:g> உடன் இணை"</string>
     <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"வைஃபை நெட்வொர்க் <xliff:g id="NETWORK_NAME">%s</xliff:g> உடன் இணைக்கிறது…"</string>
@@ -2230,7 +2311,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"பயன்பாடுகளால் எந்நேரத்திலும் தரவை ஒத்திசைக்கவும், அனுப்பவும் பெறவும் முடியும்"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"பின்புலத் தரவை முடக்கவா?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"பின்புலத் தரவை முடக்குவது பேட்டரியின் ஆயுளை நீட்டிக்கிறது மற்றும் தரவு பயன்பாட்டைக் குறைக்கிறது. சில பயன்பாடுகள் தொடர்ந்து பின்புலத் தரவு இணைப்பைப் பயன்படுத்தலாம்."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"பயன்பாட்டின் தரவைத் தானாக ஒத்திசை"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"பயன்பாட்டின் டேட்டாவைத் தானாக ஒத்திசை"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"ஒத்திசைவு முடக்கத்தில்"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"ஒத்திசைவு முடக்கத்தில்"</string>
     <string name="sync_error" msgid="5060969083117872149">"ஒத்திசைவுப் பிழை"</string>
@@ -2277,13 +2358,13 @@
     <string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g> இல் <xliff:g id="NUMBER">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> இல் <xliff:g id="NUMBER">%1$s</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
     <string name="select_all" msgid="1562774643280376715">"எல்லாவற்றையும் தேர்ந்தெடு"</string>
-    <string name="data_usage_summary_title" msgid="3804110657238092929">"தரவுப் பயன்பாடு"</string>
-    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"தரவுப் பயன்பாடு"</string>
-    <string name="data_usage_accounting" msgid="7170028915873577387">"மொபைல் நிறுவனத்தின் தரவு கணக்கிடலும் சாதனத்தின் கணக்கிடலும் வேறுபடலாம்."</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"டேட்டா பயன்பாடு"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"டேட்டா பயன்பாடு"</string>
+    <string name="data_usage_accounting" msgid="7170028915873577387">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"பயன்பாட்டின் பயன்பாடு"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"பயன்பாட்டுத் தகவல்"</string>
-    <string name="data_usage_cellular_data" msgid="9168928285122125137">"மொபைல் தரவு"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"தரவு வரம்பை அமை"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ஆப்ஸ் தகவல்"</string>
+    <string name="data_usage_cellular_data" msgid="9168928285122125137">"மொபைல் டேட்டா"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"டேட்டா வரம்பை அமை"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"தரவு பயன்பாட்டு சுழற்சி"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"பயன்பாட்டின் பயன்பாடு"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"தரவு ரோமிங்"</string>
@@ -2295,21 +2376,21 @@
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"ஈதர்நெட் பயன்பாட்டைக் காட்டு"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"ஈதர்நெட் பயன்பாட்டை மறை"</string>
     <string name="data_usage_menu_metered" msgid="6235119991372755026">"நெட்வொர்க் கட்டுப்பாடுகள்"</string>
-    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"தரவைத் தானாக ஒத்திசை"</string>
+    <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"டேட்டாவைத் தானாக ஒத்திசை"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"சிம் கார்டுகள்"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"மொபைல் நெட்வொர்க்குகள்"</string>
     <string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"வரம்பில் நிறுத்தப்பட்டது"</string>
-    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"தரவைத் தானாக ஒத்திசை"</string>
-    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"தனிப்பட்ட தரவைத் தானாக ஒத்திசை"</string>
-    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"பணித் தரவைத் தானாக ஒத்திசை"</string>
+    <string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"தனிப்பட்ட டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="account_settings_menu_auto_sync_work" msgid="329565580969147026">"பணி டேட்டாவைத் தானாக ஒத்திசை"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"சுழற்சியை மாற்று…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"தரவு பயன்பாட்டின் சுழற்சியை மீட்டமைப்பதற்கான மாதத்தின் நாள்:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"இந்தக் கால நேரத்தில், எந்தப் பயன்பாடுகளும் தரவைப் பயன்படுத்தவில்லை."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"முன்புலம்"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"பின்புலம்"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"வரையறுக்கப்பட்டது"</string>
-    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"மொபைல் தரவை முடக்கவா?"</string>
-    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"மொபைல் தரவு வரம்பை அமை"</string>
+    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"மொபைல் டேட்டாவை முடக்கவா?"</string>
+    <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"மொபைல் டேட்டா வரம்பை அமை"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G தரவு வரம்பை அமை"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G தரவு வரம்பை அமை"</string>
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"வைஃபை தரவின் வரம்பை அமை"</string>
@@ -2320,35 +2401,35 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"மொபைல்"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"ஏதுமில்லை"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"மொபைல் தரவு"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"மொபைல் டேட்டா"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G தரவு"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G தரவு"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"முன்புலம்:"</string>
     <string name="data_usage_background_label" msgid="2722008379947694926">"பின்புலம்:"</string>
     <string name="data_usage_app_settings" msgid="2279171379771253165">"பயன்பாட்டு அமைப்பு"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"பின்புலத் தரவு"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"பின்னணியில் மொபைல் தரவைப் பயன்படுத்துவதை இயக்கு"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"இந்தப் பயன்பாட்டிற்கான பின்புலத் தரவை வரம்பிட, முதலில் மொபைல் தரவு வரம்பை அமைக்கவும்."</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"பின்னணியில் மொபைல் டேட்டாவைப் பயன்படுத்துவதை இயக்கு"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"இந்தப் பயன்பாட்டிற்கான பின்புலத் தரவை வரம்பிட, முதலில் மொபைல் டேட்டா வரம்பை அமைக்கவும்."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"பின்புலத் தரவை வரம்பிடவா?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"மொபைல் நெட்வொர்க்குகள் மட்டும் கிடைக்கும்போது பின்புலத் தரவைச் சார்ந்திருக்கும் பயன்பாட்டின் வேலையை இந்த அம்சம் நிறுத்தலாம்.\n\nபயன்பாட்டில் மிகவும் பொருத்தமான தரவு பயன்பாட்டின் கட்டுப்பாடுகளை அமைப்புகளில் கண்டறியலாம்."</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"மொபைல் தரவு வரம்பை அமைத்தால் மட்டுமே, பின்னணித் தரவைக் கட்டுப்படுத்த முடியும்."</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"தரவைத் தானாக ஒத்திசைப்பதை இயக்கவா?"</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"மொபைல் டேட்டா வரம்பை அமைத்தால் மட்டுமே, பின்னணித் தரவைக் கட்டுப்படுத்த முடியும்."</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"டேட்டாவைத் தானாக ஒத்திசைப்பதை இயக்கவா?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"இணையத்தில் உங்கள் கணக்குகளில் நீங்கள் செய்யும் எந்த மாற்றங்களும் தானாகவே டேப்லெட்டில் நகலெடுக்கப்படும்.\n\nசில கணக்குகள், டேப்லெட்டில் செய்யும் எந்த மாற்றங்களையும் தானாகவே இணையத்தில் நகலெடுக்கலாம். Google கணக்கு இப்படிதான் செயல்படுகிறது."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"இணையத்தில் உங்கள் கணக்குகளில் நீங்கள் செய்யும் எந்த மாற்றங்களும் தானாகவே மொபைலில் நகலெடுக்கப்படும்.\n\nசில கணக்குகள், மொபைலில் செய்யும் எந்த மாற்றங்களையும் தானாகவே இணையத்தில் நகலெடுக்கலாம். Google கணக்கு இப்படிதான் செயல்படுகிறது."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"தரவைத் தானாக ஒத்திசைப்பதை முடக்கவா?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"இது தரவு மற்றும் பேட்டரியின் பயன்பாட்டைச் சேமிக்கும், ஆனால் சமீபத்திய தகவலைச் சேகரிக்க ஒவ்வொரு கணக்கையும் கைமுறையாக நீங்கள் ஒத்திசைக்க வேண்டும். புதுப்பிக்கப்படும்போது அறிவிப்புகளைப் பெற மாட்டீர்கள்."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"டேட்டாவைத் தானாக ஒத்திசைப்பதை முடக்கவா?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"இவ்வாறு செய்வதால் டேட்டா மற்றும் பேட்டரியின் பயன்பாட்டைக் குறைக்கும், ஆனால் சமீபத்திய தகவலைச் சேகரிக்க ஒவ்வொரு கணக்கையும் கைமுறையாக ஒத்திசைக்க வேண்டும். புதுப்பிக்கப்படும்போது அறிவிப்புகளைப் பெற மாட்டீர்கள்."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"பயன்பாட்டு சுழற்சியை மீட்டமைப்பதற்கான தேதி"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"ஒவ்வொரு மாதத்தின் தேதி:"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"ஒவ்வொரு மாதமும்:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"அமை"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"தரவு பயன்பாட்டு எச்சரிக்கையை அமை"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"தரவு பயன்பாட்டு வரம்பை அமை"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"டேட்டா பயன்பாட்டு எச்சரிக்கையை அமை"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"டேட்டா பயன்பாட்டு வரம்பை அமை"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"தரவு பயன்பாட்டை வரம்பிடுக"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"நீங்கள் அமைத்துள்ள வரம்பை அடைந்ததும், மொபைல் தரவை டேப்லெட் முடக்கும்.\n\nதரவு உபயோகத்தை டேப்லெட் அளவிட்டாலும், உங்கள் தொலைத்தொடர்பு நிறுவனம் வேறுவிதமாக அளவிடலாம். எனவே, பாதுகாப்பான அளவில் வரம்பை அமைக்கவும்."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"நீங்கள் அமைத்துள்ள வரம்பை அடைந்ததும், மொபைல் தரவை மொபைல் முடக்கும்.\n\nதரவு உபயோகத்தை மொபைல் அளவிட்டாலும், உங்கள் தொலைத்தொடர்பு நிறுவனம் வேறுவிதமாக அளவிடலாம். எனவே, பாதுகாப்பான அளவில் வரம்பை அமைக்கவும்."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"நீங்கள் அமைத்துள்ள வரம்பை அடைந்ததும், மொபைல் டேட்டாவை டேப்லெட் முடக்கும்.\n\nதரவு உபயோகத்தை டேப்லெட் அளவிட்டாலும், உங்கள் தொலைத்தொடர்பு நிறுவனம் வேறுவிதமாக அளவிடலாம். எனவே, பாதுகாப்பான அளவில் வரம்பை அமைக்கவும்."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"நீங்கள் அமைத்துள்ள வரம்பை அடைந்ததும், மொபைல் டேட்டாவை மொபைல் முடக்கும்.\n\nதரவு உபயோகத்தை மொபைல் அளவிட்டாலும், உங்கள் தொலைத்தொடர்பு நிறுவனம் வேறுவிதமாக அளவிடலாம். எனவே, பாதுகாப்பான அளவில் வரம்பை அமைக்கவும்."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"பின்புலத் தரவை வரம்பிடவா?"</string>
-    <string name="data_usage_restrict_background" msgid="434093644726734586">"பின்னணி மொபைல் தரவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"பின்னணி மொபைல் தரவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது.\n\nஇதனால் இந்த டேப்லெட்டைப் பயன்படுத்தும் எல்லாப் பயனர்களும் பாதிக்கப்படுவார்கள்."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"பின்னணி மொபைல் தரவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது.\n\nஇதனால் இந்த மொபைலைப் பயன்படுத்தும் எல்லாப் பயனர்களும் பாதிக்கப்படுவார்கள்."</string>
+    <string name="data_usage_restrict_background" msgid="434093644726734586">"பின்னணி மொபைல் டேட்டாவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"பின்னணி மொபைல் டேட்டாவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது.\n\nஇதனால் இந்த டேப்லெட்டைப் பயன்படுத்தும் எல்லாப் பயனர்களும் பாதிக்கப்படுவார்கள்."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"பின்னணி மொபைல் டேட்டாவைக் கட்டுப்படுத்தினால், வைஃபையுடன் இணைக்கும் வரை சில பயன்பாடுகளும் சேவைகளும் வேலை செய்யாது.\n\nஇதனால் இந்த மொபைலைப் பயன்படுத்தும் எல்லாப் பயனர்களும் பாதிக்கப்படுவார்கள்."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"எச்சரிக்கை"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"வரம்பு"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"அகற்றப்பட்ட பயன்பாடுகள்"</string>
@@ -2358,11 +2439,11 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: உங்கள் டேப்லெட் அளவீட்டின் படி <xliff:g id="TOTAL">%1$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது. உங்கள் மொபைல் நிறுவனத்தின் தரவு பயன்பாட்டின் கணக்கு மாறுபடலாம்."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: உங்கள் தொலைபேசி அளவீட்டின் படி, <xliff:g id="TOTAL">%1$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது. உங்கள் மொபைல் நிறுவனத்தின் தரவு பயன்பாட்டின் கணக்கு மாறுபடலாம்."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"நெட்வொர்க் கட்டுப்பாடுகள்"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"பின்னணித் தரவு கட்டுப்படுத்தப்பட்டிருக்கும் போது, கட்டண நெட்வொர்க்குகள் மொபைல் நெட்வொர்க்குகள் போன்று கருதப்படும். இந்த நெட்வொர்க்குகளைப் பயன்படுத்திப் பெரிய அளவிலான கோப்புகளைப் பதிவிறக்கும் முன், பயன்பாடுகள் எச்சரிக்கக்கூடும்."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"பின்னணி டேட்டா கட்டுப்படுத்தப்பட்டிருக்கும் போது, கட்டண நெட்வொர்க்குகள் மொபைல் நெட்வொர்க்குகள் போன்று கருதப்படும். இந்த நெட்வொர்க்குகளைப் பயன்படுத்திப் பெரிய அளவிலான ஃபைல்களைப் பதிவிறக்கும் முன், அறிவிப்புகளை ஆப்ஸ் வழங்கும்."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"மொபைல் நெட்வொர்க்குகள்"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"கட்டண வைஃபை நெட்வொர்க்குகள்"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"கட்டண நெட்வொர்க்குகளைத் தேர்வுசெய்ய, வைஃபையை இயக்கவும்."</string>
-    <string name="data_usage_disclaimer" msgid="6887858149980673444">"மொபைல் நிறுவனத்தின் தரவு கணக்கிடலும் சாதனத்தின் கணக்கிடலும் வேறுபடலாம்."</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"அவசர அழைப்பு"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"அழைப்பிற்குத் திரும்பு"</string>
     <string name="vpn_name" msgid="4689699885361002297">"பெயர்"</string>
@@ -2416,7 +2497,7 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"சுயவிவரத்தை மாற்று"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"சுயவிவரத்தை நீக்கு"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN ஐ எப்போதும் இயக்கத்தில் வை"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"VPNகள் எதுவும் சேர்க்கப்படவில்லை"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"VPN எதுவும் சேர்க்கப்படவில்லை"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"VPNஐ எப்போதும் இணைத்தே வைத்திருக்கும்"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"இந்தப் பயன்பாடு ஆதரிக்கவில்லை"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"\"எப்போதும் இயக்கத்தில்\" செயலிலுள்ளது"</string>
@@ -2429,7 +2510,7 @@
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN இலிருந்து துண்டிக்கப்பட்டது"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"ஏதுமில்லை"</string>
     <string name="vpn_missing_cert" msgid="5357192202207234745">"சான்றிதழ் இல்லை. சுயவிவரத்தைத் திருத்தவும்."</string>
-    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"அமைப்பு"</string>
+    <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"சிஸ்டம்"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"பயனர்"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"முடக்கு"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"இயக்கு"</string>
@@ -2495,10 +2576,10 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"பயனர்"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"கட்டுப்படுத்தப்பட்ட சுயவிவரம்"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"புதியவரைச் சேர்க்கவா?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"கூடுதல் பயனர்களை உருவாக்கி, சாதனத்தைப் பிறருடன் பகிரலாம். ஒவ்வொரு பயனருக்கும் பயன்பாடுகள், வால்பேப்பர் மற்றும் பலவற்றைத் தனிப்பயனாக்கத் தனி இடம் இருக்கும். ஒவ்வொருவருக்கும் பயன்படக்கூடிய வைஃபை போன்ற சாதன அமைப்புகளையும் அவர்கள் சரிசெய்யலாம்.\n\nபுதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"கூடுதல் பயனர்களை உருவாக்கி, சாதனத்தைப் பிறருடன் பகிரலாம். ஒவ்வொரு பயனருக்கும் ஆப்ஸ், வால்பேப்பர் மற்றும் பலவற்றைத் தனிப்பயனாக்கத் தனி இடம் இருக்கும். ஒவ்வொருவருக்கும் பயன்படக்கூடிய வைஃபை போன்ற சாதன அமைப்புகளையும் அவர்கள் சரிசெய்யலாம்.\n\nபுதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"புதியவரைச் சேர்க்கும் போது, அவர் தனக்கான இடத்தை அமைக்க வேண்டும்.\n\nஇருக்கும் பயன்பாடுகளை எவரும் புதுப்பிக்கலாம்."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"இப்போது பயனரை அமைக்கவா?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"இவர் சாதனத்தில் இருப்பதை உறுதிசெய்து, அவருக்கான இடத்தை அமைக்கவும்"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"இந்தச் சாதனத்தை இவர் பயன்படுத்தும் நிலையிலும், அவருக்கான அமைப்புகளை அவரே செய்து கொள்பவராகவும் இருக்க வேண்டும்."</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"இப்போது சுயவிவரத்தை அமைக்கவா?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"இப்போது அமை"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"இப்போது இல்லை"</string>
@@ -2506,7 +2587,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"தொலைபேசியின் உரிமையாளர் மட்டுமே பயனர்களை நிர்வகிக்க முடியும்."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"வரையறுக்கப்பட்ட சுயவிவரங்களால் கணக்குகளைச் சேர்க்க முடியாது"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"சாதனத்திலிருந்து <xliff:g id="USER_NAME">%1$s</xliff:g> ஐ நீக்கு"</string>
-    <string name="user_lockscreen_settings" msgid="4965661345247084878">"பூட்டுத் திரை அமைப்புகள்"</string>
+    <string name="user_lockscreen_settings" msgid="4965661345247084878">"லாக் ஸ்கிரீன் அமைப்புகள்"</string>
     <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"பூட்டுத் திரையிலிருந்து பயனர்களைச் சேர்"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"புதியவர்"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"புதிய சுயவிவரம்"</string>
@@ -2522,7 +2603,7 @@
     <string name="user_adding_new_user" msgid="1521674650874241407">"புதிய பயனரைச் சேர்க்கிறது…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"பயனரை நீக்கு"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"நீக்கு"</string>
-    <string name="user_guest" msgid="8475274842845401871">"கெஸ்ட்"</string>
+    <string name="user_guest" msgid="8475274842845401871">"வேறொருவர்"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"அழைக்கப்பட்டவரை அகற்று"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"அழைக்கப்பட்டவரை அகற்றவா?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"இந்த அமர்வின் எல்லா பயன்பாடுகளும், தரவும் நீக்கப்படும்."</string>
@@ -2542,7 +2623,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"அமைப்பானது, டேப்லெட்டில் உள்ள அனைவரையும் பாதிக்கும்."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"அமைப்பானது, தொலைபேசியில் உள்ள அனைவரையும் பாதிக்கும்."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"மொழியை மாற்றவும்"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"தட்டி கட்டணம் செலுத்துதல்"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"தட்டி, கட்டணம் செலுத்துதல்"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"இது எவ்வாறு இயங்குகிறது"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"ஸ்டோர்களில் உங்கள் மொபைல் மூலம் பணம் செலுத்தவும்"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"இயல்பு கட்டணப் பயன்பாடு"</string>
@@ -2564,7 +2645,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>
@@ -2599,8 +2680,8 @@
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"புளூடூத் இணைத்தல் மற்றும் அமைப்புகளின் மாற்றத்தை அனுமதி"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"மற்றொரு NFC சாதனத்தை <xliff:g id="DEVICE_NAME">%1$s</xliff:g> தொடும்போது தரவுப் பரிமாற்றத்தை அனுமதி"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"டேப்லெட்டானது வேறொரு சாதனத்தைத் தொடும்போது தரவு பரிமாற்றத்தை அனுமதி"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"தொலைபேசியானது வேறொரு சாதனத்தைத் தொடும்போது தரவு பரிமாற்றத்தை அனுமதி"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"டேப்லெட்டானது வேறொரு சாதனத்தைத் தொடும்போது தரவுப் பரிமாற்றத்தை அனுமதி"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"வேறொரு சாதனத்தைத் தொடும்போது டேட்டா பரிமாற்றத்தை அனுமதி"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"இருப்பிடம்"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"பயன்பாடுகள் உங்கள் இருப்பிடத் தகவலைப் பயன்படுத்தலாம்"</string>
     <string name="wizard_back" msgid="5567007959434765743">"பின் செல்"</string>
@@ -2615,7 +2696,7 @@
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"சிம் கார்டுகள் மாற்றப்பட்டன"</string>
     <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"செயல்பாடுகளை அமைக்க, தட்டவும்"</string>
-    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"மொபைல் தரவு இல்லை"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"மொபைல் டேட்டா இல்லை"</string>
     <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"தரவு சிம்மைத் தேர்ந்தெடுக்க, தட்டவும்"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"அழைப்புகளுக்கு எப்போதும் இதை பயன்படுத்து"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"தரவுக்கான SIMஐத் தேர்ந்தெடுக்கவும்"</string>
@@ -2653,12 +2734,15 @@
       <item quantity="other">மறைந்துள்ள %d உருப்படிகளைக் காட்டு</item>
       <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_title" msgid="4771589228992391573">"நெட்வொர்க் &amp; இன்டர்நெட்"</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="app_and_notification_dashboard_title" msgid="7838365599185397539">"பயன்பாடுகள் &amp; அறிவிப்புகள்"</string>
-    <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"அனுமதிகள், இயல்புப் பயன்பாடுகள்"</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>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"இயல்புப் பயன்பாடுகள்"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"மொழிகள், நேரம், காப்புப் பிரதி, புதுப்பிப்புகள்"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"திறப்பதற்கு ஸ்லைடு செய்தல், கடவுச்சொல், வடிவம், பின்"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"பணிச்சுமை, பணி, சுயவிவரம்"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"பணி சுயவிவரம், நிர்வகிக்கப்படும் சுயவிவரம், ஒருங்கிணை, ஒருங்கிணைத்தல், பணி, சுயவிவரம்"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"சைகை"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"சைகைகள்"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"கட்டணம் செலுத்தவும், தட்டவும், கட்டணம் செலுத்துதல்"</string>
     <string name="keywords_backup" msgid="470070289135403022">"காப்புப்பிரதி, காப்புப் பிரதி"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"சைகை"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"வைஃபை NFC குறியை அமை"</string>
     <string name="write_tag" msgid="8571858602896222537">"எழுது"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"எழுத, குறியைத் தட்டவும்..."</string>
@@ -2718,7 +2803,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC குறி எழுதக்கூடியது அல்ல. வேறொரு குறியைப் பயன்படுத்தவும்."</string>
     <string name="default_sound" msgid="8821684447333687810">"இயல்பு ஒலி"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"ரிங் ஒலியளவு: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"ஒலியளவு, அதிர்வு, தொந்தரவு செய்ய வேண்டாம்"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"ஒலியளவு, அதிர்வு, தொந்தரவு செய்யாதே"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ரிங்கர் \"அதிர்வு நிலைக்கு\" அமைக்கப்பட்டது"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ரிங்கர் \"நிசப்த நிலைக்கு\" அமைக்கப்பட்டது"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"ரிங் ஒலியளவு: 80%"</string>
@@ -2731,14 +2816,14 @@
     <string name="notification_unknown_sound_title" msgid="2535027767851838335">"பயன்பாடு வழங்கும் ஒலி"</string>
     <string name="notification_sound_default" msgid="565135733949733766">"இயல்பு அறிவிப்பு ஒலி"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"இயல்பு அலார ஒலி"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"அழைப்பு வருகையில் அதிர்வுறு"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"அழைப்பு வருகையில் அதிர்வது"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"பிற ஒலிகள்"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"டயல்பேடு டோன்கள்"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"திரையைப் பூட்டும் போது"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"சார்ஜிங்கின் போது"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"டாக்கிங் ஒலிகள்"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"தொடுதலின் போது"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"தட்டும் போது அதிர்வுறு"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"தட்டும் போது அதிர்வது"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"சார்ஜ் ஸ்பீக்கரை இயக்கு"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"எல்லா ஆடியோவும்"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"மீடியா ஆடியோ மட்டும்"</string>
@@ -2751,8 +2836,8 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> தானியங்கு விதிகள் இயக்கப்பட்டன</item>
       <item quantity="one">1 தானியங்கு விதி இயக்கப்பட்டது</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"தொந்தரவு செய்ய வேண்டாம் விருப்பத்தேர்வுகள்"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"முதன்மை அனுமதிப்பவை:"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'தொந்தரவு செய்யாதே\' விருப்பத்தேர்வுகள்"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"அனுமதிக்கப்படுபவை:"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"தானியங்கு விதிகள்"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"டிஎன்டி விதிகளை அமை"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ஒலி &amp; அதிர்வுகளை வரம்பிடு"</string>
@@ -2778,12 +2863,12 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"அறிவிப்புகள்"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"மேம்பட்டவை"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"பணி அறிவிப்புகள்"</string>
-    <string name="notification_badging_title" msgid="5938709971403474078">"அறிவிப்புப் புள்ளிகளை அனுமதி"</string>
+    <string name="notification_badging_title" msgid="5938709971403474078">"அறிவிப்புப் புள்ளிகளைக் காட்டு"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"ஒளியைச் சிமிட்டு"</string>
-    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"பூட்டுத் திரையில்"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"திரை பூட்டியிருக்கும்போது"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"எல்லா அறிவிப்பு விவரத்தையும் காட்டு"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"முக்கிய அறிவிப்பு உள்ளடக்கத்தை மறை"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"ஒருபோதும் அறிவிப்புகளைக் காட்டாதே"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"முக்கியத் தகவலை மறை"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"அறிவிப்புகளை ஒருபோதும் காட்டாதே"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"சாதனம் பூட்டப்பட்டிருக்கும் போது, எப்படி அறிவிப்புகளைக் காட்ட வேண்டும்?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"அறிவிப்புகள்"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"எல்லா பணி அறிவிப்பு விவரத்தையும் காட்டு"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2817,7 +2907,7 @@
     <string name="no_notification_listeners" msgid="3487091564454192821">"அறிவிப்பு அணுகலைக் கோரும் பயன்பாடுகள் எதுவும் நிறுவப்படவில்லை."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g>க்கான அறிவிப்பு அணுகலை அனுமதிக்கவா?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"தொடர்புப் பெயர்கள், நீங்கள் பெறும் செய்திகள் போன்ற தனிப்பட்ட தகவல் உட்பட எல்லா அறிவிப்புகளையும் <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ஆல் படிக்க முடியும். இந்தப் பயன்பாட்டினால் அறிவிப்புகளை நிராகரிக்கவோ அல்லது அறிவிப்புகளில் உள்ள செயல் பொத்தான்களைத் தூண்டவோ முடியும். \n\nஇது தொந்தரவு செய்ய வேண்டாம் எனும் விருப்பத்தை இயக்க அல்லது முடக்குவதற்கான அனுமதியையும், தொடர்புடையை அமைப்புகளை மாற்றுவதற்கான அனுமதியையும் பயன்பாட்டிற்கு அளிக்கும்."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>க்கு அறிவிப்பு அணுகலை முடக்கினால், தொந்தரவு செய்ய வேண்டாம் என்பதற்கான அணுகலும் முடக்கப்படலாம்."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>க்கு அறிவிப்பு அணுகலை முடக்கினால், \'தொந்தரவு செய்யாதே\' அணுகலும் முடக்கப்படலாம்."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"முடக்கு"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"ரத்துசெய்"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR உதவிச் சேவைகள்"</string>
@@ -2833,18 +2923,16 @@
     <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="manage_zen_access_title" msgid="2611116122628520522">"\'தொந்தரவு செய்யாதே\' அணுகல்"</string>
+    <string name="zen_access_empty_text" msgid="8772967285742259540">"\'தொந்தரவு செய்யாதே\' அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
-    <string name="app_notifications_off_desc" msgid="4882445501376722969">"இந்தச் சாதனத்தில் இந்தப் பயன்பாட்டின் அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"இந்தப் பயன்பாட்டின் அறிவிப்புகளை Android இயங்குதளம் இந்தச் சாதனத்தில் காட்டாது"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"இந்தச் சாதனத்தில் இந்த வகையிலான அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="notification_channels" msgid="5346841743182627500">"வகைகள்"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"மற்றவை"</string>
     <string name="no_channels" msgid="3077375508177744586">"இந்தப் பயன்பாடு எந்த அறிவிப்புகளையும் இடுகையிடவில்லை"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"பயன்பாட்டில் உள்ள கூடுதல் அமைப்புகள்"</string>
-    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"எல்லாப் பயன்பாடுகளுக்கும் இயக்கப்பட்டது"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"அனைத்திற்கும் இயக்கப்பட்டுள்ளது"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> பயன்பாடுகளுக்கு முடக்கப்பட்டுள்ளது</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> பயன்பாட்டிற்கு முடக்கப்பட்டுள்ளது</item>
@@ -2853,17 +2941,17 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> வகைகள் நீக்கப்பட்டன</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> வகை நீக்கப்பட்டது</item>
     </plurals>
-    <string name="notification_toggle_on" msgid="650145396718191048">"இயக்கப்பட்டுள்ளது"</string>
+    <string name="notification_toggle_on" msgid="650145396718191048">"ஆன்"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"முடக்கப்பட்டுள்ளது"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"எல்லாம் தடு"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"இந்த அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"அறிவிப்புகளைக் காட்டு"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"ஷேட்டில் அல்லது துணைச் சாதனங்களில் அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
-    <string name="notification_badge_title" msgid="6370122441168519809">"அறிவிப்புப் புள்ளியை அனுமதி"</string>
+    <string name="notification_badge_title" msgid="6370122441168519809">"அறிவிப்புப் புள்ளியைக் காட்டு"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"அறிவிப்புப் புள்ளியைக் காட்டு"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"தொந்தரவு செய்ய வேண்டாம் அமைப்பை மாற்றவும்"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"தொந்தரவு செய்ய வேண்டாம் என்பது முன்னுரிமை மட்டும் என்பதாக அமைக்கப்படும் போது இந்த அறிவிப்புகளைத் தொடர்ந்து குறுக்கிட அனுமதிக்கவும்"</string>
-    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"பூட்டுத் திரையில்"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'தொந்தரவு செய்யாதே\' எனும் அமைப்பைப் புறக்கணி"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"முக்கியச் செய்திகளை மட்டும் காட்டுமாறு அமைக்கப்பட்டிருந்தால், இந்த அறிவிப்புகளை அனுமதிக்கும்"</string>
+    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"திரை பூட்டியிருக்கும்போது"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"தடுக்கப்பட்டது"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"முன்னுரிமை"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"முக்கியமானவை"</string>
@@ -2875,7 +2963,7 @@
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"நீக்கு"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"மறுபெயரிடு"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"விதியின் பெயர்"</string>
-    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"விதியின் பெயரை உள்ளிடு"</string>
+    <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"விதியின் பெயரை உள்ளிடுக"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"விதியின் பெயர் ஏற்கனவே உபயோகத்தில் உள்ளது"</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"மேலும் சேர்"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"விதியை நீக்கு"</string>
@@ -2904,7 +2992,7 @@
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"நாட்கள்"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ஏதுமில்லை"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"தினமும்"</string>
-    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"அலாரம் முடிவு நேரத்தை மீறிச் செயல்படலாம்"</string>
+    <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"முடிவு நேரத்தைச் சார்ந்து அலாரம் இயங்குவது"</string>
     <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"முடிவு நேரம் அல்லது அடுத்த அலாரத்தில் நிறுத்து (எது முதலில் வருகிறதோ)"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -2913,11 +3001,12 @@
     <string name="zen_mode_messages" msgid="5886440273537510894">"செய்திகள்"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"எல்லா செய்திகளும்"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"தேர்ந்தெடுத்த செய்திகள்"</string>
-    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"எவரிடமிருந்தும்"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"அனைவரிடமிருந்தும்"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"தொடர்புகளிலிருந்து மட்டுமே"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"நட்சத்திரமிட்ட தொடர்புகளிலிருந்து மட்டுமே"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ஏதுமில்லை"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"அலாரங்கள்"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"அலாரங்கள் எப்போதும் முதன்மையானவை, ஒலியை எழுப்பும்"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"நினைவூட்டல்கள்"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"நிகழ்வுகள்"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"எல்லா அழைப்பாளர்களும்"</string>
@@ -2925,7 +3014,7 @@
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"மீண்டும் மீண்டும் அழைப்பவர்கள்"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g> நிமிடங்களுக்குள் இரண்டாவது முறையாக அதே எண்ணிலிருந்து அழைப்பு வந்தால், அனுமதி"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"தானாகவே இயக்கு"</string>
-    <string name="zen_mode_when_never" msgid="8809494351918405602">"எப்போதும் வேண்டாம்"</string>
+    <string name="zen_mode_when_never" msgid="8809494351918405602">"ஒருபோதும் வேண்டாம்"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ஒவ்வொரு இரவும்"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"வார இறுதிநாட்கள்"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"தொடக்க நேரம்"</string>
@@ -2943,20 +3032,20 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> வரை அலாரங்கள் மட்டும் என மாற்று"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"எப்போதும் குறுக்கிடு என மாற்று"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"திரை இயக்கப்பட்டிருக்கும் போது தடு"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"தொந்தரவு செய்ய வேண்டாம் என்பதன் மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள், திரையில் குறுக்கிடுவதை அல்லது தோன்றுவதைத் தடு"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\'தொந்தரவு செய்யாதே\' மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள், திரையில் குறுக்கிடுவதை அல்லது தோன்றுவதைத் தடு"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"திரை முடக்கப்பட்டிருக்கும் போது தடு"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"தொந்தரவு செய்ய வேண்டாம் என்பதன் மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள் வரும் போது, திரையை இயக்குவதை அல்லது அறிவிப்பு ஒளி ஒளிர்வதைத் தடு"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"தொந்தரவு செய்ய வேண்டாம் என்பதன் மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள் வரும் போது, திரையை இயக்குவதைத் தடுக்கும்"</string>
-    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"முடக்கத்தில்"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\'தொந்தரவு செய்யாதே\' மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள் வரும் போது, திரையை இயக்குவதை அல்லது அறிவிப்பு ஒளி ஒளிர்வதைத் தடு"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"\'தொந்தரவு செய்யாதே\' மூலம் நிசப்தமாக்கப்பட்ட அறிவிப்புகள் வரும் போது, திரையை இயக்குவதைத் தடுக்கும்"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ஆஃப்"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"திரை இயக்கப்பட்டிருக்கும் போது"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"திரை முடக்கப்பட்டிருக்கும் போது"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"திரை இயக்கத்தில் அல்லது முடக்கத்தில் உள்ள போது"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"அறிவிப்பு அமைப்பு"</string>
     <string name="device_feedback" msgid="3238056036766293294">"சாதனம் பற்றி கருத்தை அனுப்பு"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"நிர்வாகிப் பின்னை உள்ளிடவும்"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"இயக்கு"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"முடக்கு"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"திரையைப் பொருத்துதல்"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"ஆன்"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"ஆஃப்"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"திரையில் பொருத்துதல்"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"இந்த அமைப்பு இயக்கப்பட்டிருக்கும் போது, நடப்புத் திரையைக் காட்சியில் வைத்திருக்க, திரையைப் பின்செய்தல் அம்சத்தைப் பயன்படுத்தலாம், பின் செய்ததை விலக்கும் வரை நடப்புத் திரை காட்சியில் தோன்றும்.\n\nதிரையைப் பின்செய்தல் அம்சத்தைப் பயன்படுத்த:\n\n1. திரையைப் பின்செய்தல் இயக்கத்தில் இருப்பதை உறுதிப்படுத்தவும்.\n\n2. பின் செய்ய விரும்பும் திரையைத் திறக்கவும்.\n\n3. மேலோட்டப் பார்வை என்பதைத் தட்டவும்.\n\n4. மேலே ஸ்வைப் செய்து, பின் செய் எனும் ஐகானைத் தட்டவும்."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"அகற்றும் முன் திறத்தல் வடிவத்தைக் கேள்"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"அகற்றும் முன் பின்னைக் கேள்"</string>
@@ -2965,19 +3054,14 @@
     <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>
-    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"இந்தச் சாதனத்தைத் துவக்கும் முன், பேட்டர்ன் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, பேட்டர்னைக் கேட்பதை அமைக்கவா?"</string>
-    <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_pin" msgid="2317181134653424679">"இந்தச் சாதனத்தைத் துவக்கும் முன், பின் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடப்பட்டாலோ, அதில் உள்ள உங்கள் டேட்டாவைப் பாதுகாக்க இதைக் கடைபிடிக்கலாம். சாதனத்தைத் தொடங்கும் போது, பின்னைக் கேட்பதை அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"இந்தச் சாதனத்தைத் துவக்கும் முன், பேட்டர்ன் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடப்பட்டாலோ, அதில் உள்ள உங்கள் டேட்டாவைப் பாதுகாக்க இதைக் கடைபிடிக்கலாம். சாதனத்தைத் தொடங்கும் போது, பேட்டர்னைக் கேட்பதை அமைக்கவா?"</string>
+    <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="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>
@@ -2991,21 +3075,21 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI தொடர்புடைய தகவல்"</string>
     <string name="slot_number" msgid="3762676044904653577">"(ஸ்லாட்<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"இயல்பாகத் திற"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"திறக்கும் இணைப்புகள்"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"இணைப்புகளைத் திறக்க"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"ஆதரிக்கப்படும் இணைப்புகளைத் திறத்தல்"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"கேட்காமலே திறக்கும்"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"ஆதரிக்கப்படும் இணைப்புகள்"</string>
     <string name="app_launch_other_defaults_title" msgid="2516812499807835178">"பிற இயல்புகள்"</string>
-    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> இல் <xliff:g id="SIZE">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
+    <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>: <xliff:g id="SIZE">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"அகச் சேமிப்பிடம்"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"வெளிப்புறச் சேமிப்பிடம்"</string>
-    <string name="app_data_usage" msgid="7942375313697452803">"தரவுப் பயன்பாடு"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"டேட்டா பயன்பாடு"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"உபயோகம்: <xliff:g id="DATE">%2$s</xliff:g> முதல், <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="storage_used" msgid="7128074132917008743">"பயன்படுத்திய சேமிப்பிடம்"</string>
     <string name="change" msgid="6657848623929839991">"மாற்று"</string>
     <string name="change_storage" msgid="600475265207060436">"சேமிப்பிடத்தை மாற்றவும்"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"பயன்பாடு அறிவிப்புகள்"</string>
-    <string name="notifications_enabled" msgid="6983396130566021385">"இயக்கத்தில்"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"ஆப்ஸ் அறிவிப்புகள்"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"ஆன்"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"எல்லாம் முடக்கப்பட்டன"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> வகைகளில் <xliff:g id="COUNT_0">%1$d</xliff:g> முடக்கப்பட்டது"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"தடுக்கப்பட்டுள்ளன"</string>
@@ -3035,7 +3119,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"தனிப்பட்டவை"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"பணியிடம்"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"பயன்பாடுகள்: எல்லாம்"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"பயன்பாடுகள்: முடக்கப்பட்டன"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ஆப்ஸ்: ஆஃப் செய்தவை"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"வகைகள்: அதிக முக்கியத்துவம்"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"வகைகள்: குறைந்த முக்கியத்துவம்"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"வகைகள்: முடக்கப்பட்டன"</string>
@@ -3044,10 +3128,10 @@
     <string name="configure_apps" msgid="6685680790825882528">"பயன்பாடுகளை உள்ளமை"</string>
     <string name="unknown_app" msgid="5275921288718717656">"அறியப்படாத பயன்பாடு"</string>
     <string name="app_permissions" msgid="4148222031991883874">"பயன்பாட்டு அனுமதிகள்"</string>
-    <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g>ஐப் பயன்படுத்தும் பயன்பாடுகள்"</string>
+    <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> ஆகியவற்றைப் பயன்படுத்தும் பயன்பாடுகள்"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"இயக்க, தட்டவும்"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"சாதனத்தை இயக்க, திரையின் எந்த இடத்திலும் இருமுறை தட்டவும்"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"திறக்கும் இணைப்புகள்"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"இணைப்புகளைத் திறக்க"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"ஆதரிக்கப்படும் இணைப்புகளைத் திறக்காது"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g>ஐ மட்டும் திறக்கும்"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> மற்றும் பிற URLகளைத் திறக்கக்கூடியவை"</string>
@@ -3069,13 +3153,13 @@
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"ஏற்கிறேன்"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"ஏற்கவில்லை"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"குரல் உள்ளீட்டைத் தேர்வுசெய்க"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"உலாவி பயன்பாடு"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"உலாவி"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"இயல்பு உலாவி இல்லை"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"ஃபோன் பயன்பாடு"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"ஃபோன்"</string>
     <string name="default_app" msgid="6864503001385843060">"(இயல்பு)"</string>
-    <string name="system_app" msgid="9068313769550747372">"(முறைமை)"</string>
+    <string name="system_app" msgid="9068313769550747372">"(சிஸ்டம்)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(முறைமை இயல்பு)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"பயன்பாட்டுச் சேமிப்பகம்"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ஆப்ஸ் சேமிப்பகம்"</string>
     <string name="usage_access" msgid="5479504953931038165">"பயன்பாட்டு அணுகல்"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"பயன்பாட்டு அணுகல் அனுமதி"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"பயன்பாட்டு உபயோக விருப்பத்தேர்வுகள்"</string>
@@ -3091,14 +3175,23 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"சராசரியாக <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"பேட்டரி மேம்படுத்தல்"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"பேட்டரி சேமிப்பு"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"உபயோகம் குறித்த எச்சரிக்கைகள்"</string>
-    <string name="show_all_apps" msgid="1512506948197818534">"சாதனத்தின் முழு உபயோகத்தைக் காட்டு"</string>
+    <string name="show_all_apps" msgid="1512506948197818534">"முழு பயன்பாட்டைக் காட்டு"</string>
     <string name="hide_extra_apps" msgid="5016497281322459633">"பயன்பாட்டின் உபயோகத்தை காட்டு"</string>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"மேம்படுத்தப்படாதவை"</string>
-    <string name="high_power_on" msgid="6216293998227583810">"மேம்படுத்தப்படாதது"</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>
-    <string name="high_power_system" msgid="7362862974428225301">"பேட்டரி மேம்படுத்தல் இல்லை"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"பேட்டரியைச் சேமிக்காது"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"பேட்டரி மேம்படுத்தலைப் பயன்படுத்தவில்லை எனில், உங்கள் பேட்டரி மிக விரைவில் தீர்ந்துவிடக்கூடும்."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"எப்போதும் பின்னணியில் இயங்க, பயன்பாட்டை அனுமதிக்கவா?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"எப்போதும் பின்னணியில் இயங்குவதற்கு <xliff:g id="APP_NAME">%1$s</xliff:g>ஐ அனுமதிப்பதால், பேட்டரி நிலை குறையக்கூடும். \n\nஇதை அமைப்புகள் &gt; பயன்பாடுகள் &amp; அறிவிப்புகள் என்பதற்குச் சென்று, மாற்றலாம்."</string>
@@ -3115,19 +3208,19 @@
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"இந்தப் பிழை அறிக்கை உங்கள் ஐடி நிர்வாகியுடன் பகிரப்படுகிறது. மேலும் விவரங்களுக்கு அவரைத் தொடர்புகொள்ளவும்."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"பகிர்"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"வேண்டாம்"</string>
-    <string name="usb_use_charging_only" msgid="2180443097365214467">"இந்தச் சாதனத்தை சார்ஜ் செய்"</string>
+    <string name="usb_use_charging_only" msgid="2180443097365214467">"இந்தச் சாதனத்தை சார்ஜ் செய்ய"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"இந்தச் சாதனத்தைச் சார்ஜ் செய்யும்"</string>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"பவரை சப்ளை செய்"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"பவர் சப்ளை செய்ய"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"இணைத்துள்ள சாதனம் சார்ஜாகும். இது USB சார்ஜிங்கை ஆதரிக்கும் சாதனங்களில் மட்டுமே வேலை செய்யும்."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"கோப்புகளை இடமாற்று"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"ஃபைல்களைப் பரிமாற்ற"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"கோப்புகளை மற்றொரு சாதனத்திற்கு இடமாற்றும்"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"படங்கள் பரிமாற்றம் (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"படங்களைப் பரிமாற்ற (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"MTP ஆதரிக்கப்படவில்லை எனில், படங்கள் அல்லது கோப்புகளைப் பரிமாற்றும் (PTP)"</string>
-    <string name="usb_use_MIDI" msgid="870922185938298263">"சாதனத்தை MIDI ஆகப் பயன்படுத்து"</string>
+    <string name="usb_use_MIDI" msgid="870922185938298263">"சாதனத்தை MIDIயாகப் பயன்படுத்த"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"இந்தச் சாதனத்தை MIDI ஆகப் பயன்படுத்தும்"</string>
     <string name="usb_use" msgid="3256040963685055320">"USBஐ இதற்குப் பயன்படுத்து:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"இந்தச் சாதனம் சார்ஜாகிறது"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"இந்தச் சாதனத்தைச் சார்ஜ் செய்வதற்கு"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"பவரைச் சப்ளை செய்கிறது"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"கோப்புகளை இடமாற்றுகிறது"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"படங்களை இடமாற்றுகிறது (PTP)"</string>
@@ -3175,28 +3268,28 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"ஏதுமில்லை"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"இந்தப் பயன்பாட்டின் உபயோக அணுகலை முடக்குவதால், பணி விவரத்தில் உள்ள பயன்பாடுகளுக்கான தரவுப் பயன்பாட்டைக் கண்காணிப்பதிலிருந்து உங்கள் நிர்வாகியைத் தடுக்க முடியாது"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> எழுத்துக்குறிகள் பயன்படுத்தப்பட்டன"</string>
-    <string name="draw_overlay" msgid="6564116025404257047">"பிற பயன்பாடுகளின் மேலே காட்டு"</string>
-    <string name="system_alert_window_settings" msgid="8466613169103527868">"பிற பயன்பாடுகளின் மேலே காட்டு"</string>
-    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"பயன்பாடுகள்"</string>
-    <string name="system_alert_window_access_title" msgid="6297115362542361241">"பிற பயன்பாடுகளின் மேலே காட்டு"</string>
+    <string name="draw_overlay" msgid="6564116025404257047">"பிற ஆப்ஸின் மேலே காட்டு"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"பிற ஆப்ஸின் மேலே காட்டு"</string>
+    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"ஆப்ஸ்"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"பிற ஆப்ஸின் மேலே காட்டு"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"பிற பயன்பாடுகளின் மேலே காட்டுவதை அனுமதி"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"பிற பயன்பாடுகளின் மேலே காட்டுவதற்கான அனுமதி"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"நீங்கள் பயன்படுத்தும் பிற பயன்பாடுகளின் மேலே உள்ளடக்கத்தைக் காட்ட, இந்தப் பயன்பாட்டை அனுமதிக்கும். மேலும், அந்தப் பயன்பாடுகளை நீங்கள் பயன்படுத்தும் போது இது குறுக்கிடக்கூடும் அல்லது அவை தோன்றும் அல்லது செயல்படும் விதத்தை மாற்றக்கூடும்."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr விர்ச்சுவல் ரியாலிட்டி லிஷனர் ஸ்டீரியோ உதவிச் சேவை"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"சாதனம் விழிப்பூட்டல் சாளரம் உரையாடல் காட்டு பிற பயன்பாடுகளின் மேல்"</string>
-    <string name="overlay_settings" msgid="6930854109449524280">"பிற பயன்பாடுகளின் மேலே காட்டு"</string>
+    <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="write_settings" msgid="4797457275727195681">"சாதன அமைப்புகளை மாற்று"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"முறைமை அமைப்புகளை எழுது மாற்று"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_1">%2$d</xliff:g> இல் <xliff:g id="COUNT_0">%1$d</xliff:g> பயன்பாடுகள் முறைமை அமைப்புகளை மாற்ற அனுமதிக்கப்பட்டுள்ளன"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"பிற பயன்பாடுகளை நிறுவலாம்"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"முறைமை அமைப்புகளை மாற்றலாம்"</string>
     <string name="write_settings_title" msgid="4232152481902542284">"முறைமை அமைப்புகளை மாற்றலாம்"</string>
-    <string name="write_system_settings" msgid="3482913590601096763">"முறைமை அமைப்புகளை மாற்று"</string>
+    <string name="write_system_settings" msgid="3482913590601096763">"சாதன அமைப்புகளை மாற்று"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"பயன்பாடானது முறைமை அமைப்புகளை மாற்றுவதற்கான அனுமதி"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"முறைமை அமைப்புகளை மாற்ற அனுமதி"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"இது முறைமை அமைப்புகளை மாற்ற, பயன்பாட்டை அனுமதிக்கும்."</string>
@@ -3225,25 +3318,25 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"செவ் 6:02PM"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"செவ் 6:03PM"</string>
     <string name="disconnected" msgid="4836600637485526329">"இணைக்கப்படவில்லை"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> தரவு பயன்படுத்தப்பட்டுள்ளது"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"பயன்படுத்திய டேட்டா: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகளுக்கு முடக்கப்பட்டுள்ளது</item>
       <item quantity="one">1 பயன்பாட்டிற்கு முடக்கப்பட்டுள்ளது</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"எல்லாப் பயன்பாடுகளுக்கும் இயக்கப்பட்டது"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"அனைத்திற்கும் இயக்கப்பட்டுள்ளது"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் நிறுவப்பட்டுள்ளன"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 பயன்பாடுகள் நிறுவப்பட்டன"</string>
-    <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> பயன்படுத்தப்பட்டுள்ளது - <xliff:g id="FREE_SPACE">%2$s</xliff:g> மீதமுள்ளது"</string>
+    <string name="storage_summary" msgid="3801281635351732202">"பயன்படுத்தியது: <xliff:g id="PERCENTAGE">%1$s</xliff:g>, காலியிடம்: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"சாதனச் சேமிப்பகம்: <xliff:g id="PERCENTAGE">%1$s</xliff:g> பயன்படுத்தப்பட்டது - <xliff:g id="FREE_SPACE">%2$s</xliff:g> பயன்படுத்துவதற்கு உள்ளது"</string>
     <string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> நிமிடங்களாக எந்தச் செயல்பாடும் இல்லை எனில், உறக்கநிலைக்குச் செல்லும்"</string>
-    <string name="display_dashboard_summary" msgid="4145888780290131488">"வால்பேப்பர், உறக்கநிலை, எழுத்துரு அளவு"</string>
+    <string name="display_dashboard_summary" msgid="4145888780290131488">"வால்பேப்பர், உறக்கம், எழுத்தின் அளவு"</string>
     <string name="display_summary_example" msgid="9102633726811090523">"10 நிமிடங்களாக எந்தச் செயல்பாடும் இல்லை எனில், உறக்கநிலைக்குச் செல்லும்"</string>
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> இல் சராசரியாக <xliff:g id="USED_MEMORY">%1$s</xliff:g> நினைவகம் பயன்படுத்தப்பட்டுள்ளது"</string>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"தற்போதைய பயனர்: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"உள்நுழைந்துள்ள முகவரி: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> இயல்பு பயன்பாடாகும்"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"இயக்கு / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"முடக்கு"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"ஆன் / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_off_summary" msgid="6474350053215707957">"ஆஃப்"</string>
     <string name="backup_disabled" msgid="485189128759595412">"காப்புப் பிரதி முடக்கப்பட்டுள்ளது"</string>
     <string name="about_summary" msgid="924181828102801010">"Android <xliff:g id="VERSION">%1$s</xliff:g>க்குப் புதுப்பிக்கப்பட்டது"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"செயல் அனுமதிக்கப்படவில்லை"</string>
@@ -3268,9 +3361,9 @@
     <string name="condition_zen_title" msgid="2679168532600816392">"தொந்தரவு செய்யவேண்டாம்: இயக்கத்தில்(<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"பேட்டரிசேமிப்பான்: இயக்கத்தில்"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"செயல்திறன் குறைக்கப்பட்டது. இருப்பிடச் சேவைகளும் பின்புலத் தரவும் முடக்கப்பட்டுள்ளன."</string>
-    <string name="condition_cellular_title" msgid="1327317003797575735">"மொபைல் தரவு முடக்கப்பட்டுள்ளது"</string>
+    <string name="condition_cellular_title" msgid="1327317003797575735">"மொபைல் டேட்டா முடக்கப்பட்டுள்ளது"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"வைஃபை மூலம் மட்டுமே இணையம் கிடைக்கும்"</string>
-    <string name="condition_bg_data_title" msgid="2483860304802846542">"தரவு சேமிப்பான் இயக்கப்பட்டது"</string>
+    <string name="condition_bg_data_title" msgid="2483860304802846542">"டேட்டா சேமிப்பான் இயக்கப்பட்டது"</string>
     <string name="condition_bg_data_summary" msgid="656957852895282228">"வைஃபை மூலம் மட்டுமே பின்புலத் தரவு செயல்படும். இதனால் வைஃபை கிடைக்காத போது சில பயன்பாடுகள் அல்லது சேவைகள் பாதிக்கப்படலாம்."</string>
     <string name="condition_work_title" msgid="7293722361184366648">"பணி சுயவிவரம் முடக்கப்பட்டது"</string>
     <string name="condition_work_summary" msgid="7543202177571590378">"உங்கள் பணி சுயவிவரத்துடன் தொடர்புடைய பயன்பாடுகள், பின்புல ஒத்திசைவு மற்றும் பிற அம்சங்கள் ஆகியவை முடக்கப்பட்டன."</string>
@@ -3278,6 +3371,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>
@@ -3285,45 +3387,44 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"டெலிஃபோனி மானிட்டரில் செய்த மாற்றத்தைப் பயன்படுத்த, சாதனத்தை மறுதொடக்கம் செய்யவும்"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"தானியங்கு முறைமை புதுப்பிப்புகள்"</string>
     <string name="usage" msgid="2977875522080448986">"பயன்பாடு"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"மொபைல் தரவு உபயோகம்"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"வைஃபை தரவுப் பயன்பாடு"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"மொபைல் டேட்டா பயன்பாடு"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"வைஃபை டேட்டா பயன்பாடு"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ஈதர்நெட் தரவுப் பயன்பாடு"</string>
     <string name="wifi" msgid="1081550856200013637">"வைஃபை"</string>
     <string name="ethernet" msgid="6600095783781389720">"ஈதர்நெட்"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> மொபைல் தரவு"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> மொபைல் டேட்டா"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> வைஃபை தரவு"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ஈதர்நெட் தரவு"</string>
-    <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="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>
       <item quantity="one">1 கட்டுப்பாடு</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"மொபைல் நிறுவனத்தின் தரவு கணக்கிடலானது சாதனத்தின் கணக்கிடலிலிருந்து வேறுபடலாம்"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"தரவு எச்சரிக்கையை அமை"</string>
-    <string name="data_warning" msgid="209133958008062117">"தரவு எச்சரிக்கை"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"தரவு வரம்பை அமை"</string>
-    <string name="data_limit" msgid="1885406964934590552">"தரவு வரம்பு"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"டேட்டா பயன்பாட்டு எச்சரிக்கையை அமை"</string>
+    <string name="data_warning" msgid="209133958008062117">"டேட்டா பயன்பாட்டு எச்சரிக்கை"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"டேட்டா வரம்பை அமை"</string>
+    <string name="data_limit" msgid="1885406964934590552">"டேட்டா வரம்பு"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தப்பட்டது: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"உள்ளமை"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"தரவு உபயோகத்தில் உள்ளடங்கும் பிற பயன்பாடுகள்"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
-      <item quantity="other">தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, வரம்பற்ற தரவைப் பயன்படுத்த <xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் அனுமதிக்கப்பட்டன</item>
-      <item quantity="one">தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, வரம்பற்ற தரவைப் பயன்படுத்த 1 பயன்பாடு அனுமதிக்கப்பட்டது</item>
+      <item quantity="other">டேட்டா சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, பயனரின் எல்லா தகவலையும் பயன்படுத்த <xliff:g id="COUNT">%1$d</xliff:g> பயன்பாடுகள் அனுமதிக்கப்பட்டுள்ளன</item>
+      <item quantity="one">டேட்டா சேமிப்பான் இயக்கப்பட்டிருக்கும் போது, பயனரின் எல்லா தகவலையும் பயன்படுத்த 1 பயன்பாடு அனுமதிக்கப்பட்டுள்ளது</item>
     </plurals>
-    <string name="data_saver_title" msgid="398458827917495765">"தரவுச் சேமிப்பான்"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"வரம்பற்ற தரவு அணுகல்"</string>
+    <string name="data_saver_title" msgid="398458827917495765">"டேட்டா சேமிப்பான்"</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>
+    <string name="data_saver_on" msgid="6774217590237934709">"ஆன்"</string>
+    <string name="data_saver_off" msgid="6892309031162738794">"ஆஃப்"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"வரம்பற்ற தரவு பயன்பாடு"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"தரவு சேமிப்பான் இயக்கப்பட்டிருக்கும் போது வரம்பற்ற தரவை அணுக அனுமதி"</string>
-    <string name="home_app" msgid="4066188520886810030">"முகப்புப் பயன்பாடு"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"டேட்டா சேமிப்பான் இயக்கப்பட்டிருக்கும் போது வரம்பற்ற தரவை அணுக அனுமதி"</string>
+    <string name="home_app" msgid="4066188520886810030">"முகப்பு"</string>
     <string name="no_default_home" msgid="7184117487704520238">"இயல்பு முகப்பு இல்லை"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"பாதுகாப்பான தொடக்கம்"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"சாதனத்தைத் தொடங்க, வடிவம் தேவை. முடக்கப்பட்டிருக்கும் போது, இந்தச் சாதனம் அழைப்புகள், செய்திகள், அறிவிப்புகள் அல்லது அலாரங்கள் ஆகியவற்றைப் பெற முடியாது."</string>
@@ -3332,7 +3433,7 @@
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"மற்றொரு கைரேகையைச் சேர்க்கவும்"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"வேறு விரலைப் பயன்படுத்தித் திறக்கவும்"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"இயக்கத்தில் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_off_summary" msgid="8309471955051162327">"முடக்கத்தில் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="battery_saver_off_summary" msgid="8309471955051162327">"ஆஃப் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"ஒருபோதும் தானாக இயக்காதே"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"%1$s பேட்டரியில் தானாகவே இயக்கு"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"பேட்டரி மேம்படுத்தலைப் பயன்படுத்தவில்லை"</string>
@@ -3369,10 +3470,10 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"எதுவுமில்லை"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"மதிப்பீட்டுத் தகவல் இல்லை."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"மதிப்பீட்டுத் தகவலில் இந்த விசை இல்லை."</string>
-    <string name="special_access" msgid="3458780842491881155">"சிறப்புப் பயன்பாட்டு அணுகல்"</string>
+    <string name="special_access" msgid="3458780842491881155">"பயன்பாட்டின் சிறப்பு அணுகல்"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகளால் வரம்பற்ற தரவைப் பயன்படுத்த முடியும்</item>
-      <item quantity="one">1 பயன்பாட்டால் வரம்பற்ற தரவைப் பயன்படுத்த முடியும்</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகளால் எல்லா தகவலையும் பயன்படுத்த முடியும்</item>
+      <item quantity="one">1 பயன்பாட்டால் எல்லா தகவலையும் பயன்படுத்த முடியும்</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"பயனர் தரவை அழித்து, கோப்பு முறைமையாக்கத்திற்கு மாற்ற வேண்டுமா?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"அழித்து, மாற்று"</string>
@@ -3381,8 +3482,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>
@@ -3451,29 +3551,36 @@
     <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_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="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"அறிவிப்புகளுக்கு, உணர்வியின் மீது ஸ்வைப் செய்க"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"அறிவிப்புகளைப் பார்க்க, மொபைலின் பின்புறத்தில் உள்ள கைரேகை உணர்வியில் கீழே ஸ்வைப் செய்யவும்."</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="assist_gesture_title" msgid="7746563137898655539">"அசிஸ்ட் சைகை"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"உணர்திறன்"</string>
-    <string name="gesture_setting_on" msgid="3455094265233870280">"இயக்கு"</string>
-    <string name="gesture_setting_off" msgid="5230169535435881894">"முடக்கு"</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="gesture_setting_on" msgid="3455094265233870280">"ஆன்"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"ஆஃப்"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"பூட்லோடர் ஏற்கனவே திறந்துள்ளது"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"முதலில் இணையத்துடன் இணைக்கவும்"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"இணையத்துடன் இணைக்கவும் (அ) மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளவும்"</string>
@@ -3487,11 +3594,14 @@
     <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"உங்கள் சேமிப்பகம் இப்போது சேமிப்பக நிர்வாகியால் நிர்வகிக்கப்படுகிறது"</string>
     <string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> இன் கணக்குகள்"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"உள்ளமைக்கவும்"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"தரவைத் தானாக ஒத்திசை"</string>
-    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"தனிப்பட்ட தரவைத் தானாக ஒத்திசை"</string>
-    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"பணித் தரவைத் தானாக ஒத்திசை"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"பயன்பாடுகள் தானாகவே தரவைப் புதுப்பிக்க அனுமதி"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"தனிப்பட்ட டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="auto_sync_work_account_title" msgid="4489172450037434152">"பணி டேட்டாவைத் தானாக ஒத்திசை"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"பயன்பாடுகள் தானாகவே டேட்டாவைப் புதுப்பிக்க அனுமதி"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"கணக்கு ஒத்திசைவு"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> இல் <xliff:g id="ID_1">%1$d</xliff:g>க்கு ஒத்திசைவை முடக்கு"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"எல்லாவற்றுக்கும் ஒத்திசைவை இயக்கு"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"எல்லாவற்றுக்கும் ஒத்திசைவை முடக்கு"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"நிர்வகிக்கப்படும் சாதனத் தகவல்"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"உங்கள் நிறுவனம் நிர்வகிக்கும் மாற்றங்களும் அமைப்புகளும்"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> நிர்வகிக்கும் மாற்றங்களும் அமைப்புகளும்"</string>
@@ -3562,16 +3672,17 @@
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"படங்களும் வீடியோக்களும்"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"இசையும் ஆடியோவும்"</string>
-    <string name="storage_games" msgid="7703159201697117621">"கேம்கள்"</string>
-    <string name="storage_other_apps" msgid="5524321740031718083">"பிற பயன்பாடுகள்"</string>
-    <string name="storage_files" msgid="8581083146777364063">"கோப்புகள்"</string>
+    <string name="storage_games" msgid="7703159201697117621">"கேம்ஸ்"</string>
+    <string name="storage_other_apps" msgid="5524321740031718083">"பிற ஆப்ஸ்"</string>
+    <string name="storage_files" msgid="8581083146777364063">"ஃபைல்கள்"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> இல் பயன்படுத்தியது:"</string>
-    <string name="storage_percent_full" msgid="6095012055875077036">"உபயோகம்"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"பயன்பாடு"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"பயன்பாட்டை அழி"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"இந்த இன்ஸ்டண்ட் பயன்பாட்டை அகற்றவா?"</string>
-    <string name="game_storage_settings" msgid="3410689937046696557">"கேம்கள்"</string>
-    <string name="audio_files_title" msgid="4777048870657911307">"ஆடியோ கோப்புகள்"</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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ஆன்"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"இன்ஸ்டண்ட் பயன்பாடு"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"சேமிப்பக நிர்வாகியை முடக்கவா?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"திரைப்படம் &amp; டிவி பயன்பாடுகள்"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"பயன்படுத்திய இட அளவு"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"மூவி &amp; டிவி ஆப்ஸ்"</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="698847081680980774">"புதியதாகவும் உற்சாகமூட்டும் விதமாகவும் என்ன உள்ளது?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"சிறந்த 5 அம்சங்களைப் பார்க்கவும்"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS பதிவின் நிலை"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"பதிவு செய்யப்பட்டது"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"பதிவு செய்யப்படவில்லை"</string>
 </resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 1dc9f03e3de766afa69b29403db3aad501df3fee..8835eaa8f254a03ff372a772472d25d936deff6e 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -122,8 +122,8 @@
     <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"పుష్ బటన్"</item>
-    <item msgid="1624323946324499595">"పీర్ పరికరం నుండి పిన్‌"</item>
-    <item msgid="5366790421523328066">"ఈ పరికరం నుండి పిన్‌"</item>
+    <item msgid="1624323946324499595">"పీర్ డివైజ్ నుండి పిన్‌"</item>
+    <item msgid="5366790421523328066">"ఈ డివైజ్ నుండి పిన్‌"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"కనెక్ట్ చేయబడింది"</item>
@@ -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>
@@ -162,7 +152,7 @@
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"వినియోగ సమయం"</item>
     <item msgid="4796160515314745154">"చివరిగా ఉపయోగించినది"</item>
-    <item msgid="2502754479975776899">"అనువర్తనం పేరు"</item>
+    <item msgid="2502754479975776899">"యాప్ పేరు"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -272,7 +262,7 @@
     <item msgid="587124103118495063">"ICC SMSను వ్రాయండి"</item>
     <item msgid="2320577158869025503">"సెట్టింగ్‌లను సవరించండి"</item>
     <item msgid="1545733463471924009">"పైభాగంలో గీయండి"</item>
-    <item msgid="3609046903962454582">"నోటిఫికేషన్‌లను ప్రాప్యత చేయండి"</item>
+    <item msgid="3609046903962454582">"నోటిఫికేషన్‌లను యాక్సెస్ చేయండి"</item>
     <item msgid="4671646036128214513">"కెమెరా"</item>
     <item msgid="1097324338692486211">"ఆడియోను రికార్డ్ చేయండి"</item>
     <item msgid="5031552983987798163">"ఆడియో ప్లే చేయండి"</item>
@@ -311,7 +301,7 @@
     <item msgid="6628873315024166197">"స్క్రీన్‌ను ఆన్ చేయడం"</item>
     <item msgid="3253368931113490863">"ఖాతాలను పొందడం"</item>
     <item msgid="780392378084812901">"నేపథ్యంలో అమలు చేయడం"</item>
-    <item msgid="2629748510881309577">"ప్రాప్యత వాల్యూమ్"</item>
+    <item msgid="2629748510881309577">"యాక్సెస్ సామర్థ్య వాల్యూమ్"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"స్థానం"</item>
@@ -339,7 +329,7 @@
     <item msgid="4370895547001583812">"SMS/MMSను వ్రాయండి"</item>
     <item msgid="4218544235221631789">"సెట్టింగ్‌లను సవరించండి"</item>
     <item msgid="736541391767350377">"పైభాగంలో గీయండి"</item>
-    <item msgid="5530815681721654194">"నోటిఫికేషన్‌లను ప్రాప్యత చేయండి"</item>
+    <item msgid="5530815681721654194">"నోటిఫికేషన్‌లను యాక్సెస్ చేయండి"</item>
     <item msgid="781213371706962767">"కెమెరా"</item>
     <item msgid="1720492593061838172">"ఆడియోను రికార్డ్ చేయండి"</item>
     <item msgid="3493046322001257041">"ఆడియో ప్లే చేయండి"</item>
@@ -378,7 +368,7 @@
     <item msgid="5832543806893763620">"స్క్రీన్‌ను ఆన్ చేయడం"</item>
     <item msgid="5258373962467495905">"ఖాతాలను పొందడం"</item>
     <item msgid="334625385979270703">"నేపథ్యంలో అమలు చేయడం"</item>
-    <item msgid="9039213578110332702">"ప్రాప్యత వాల్యూమ్"</item>
+    <item msgid="9039213578110332702">"యాక్సెస్ సామర్థ్య వాల్యూమ్"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"తక్కువ సేపు"</item>
@@ -461,7 +451,7 @@
   </string-array>
   <string-array name="proc_stats_process_states">
     <item msgid="5069825997142785829">"స్థిరం"</item>
-    <item msgid="5779398140277006695">"అధిక కార్యాచరణ"</item>
+    <item msgid="5779398140277006695">"ప్రముఖ కార్యకలాపం"</item>
     <item msgid="1439598363694578255">"ముఖ్యం (ముందుభాగం)"</item>
     <item msgid="3396458970745718652">"ముఖ్యం (నేపథ్యం)"</item>
     <item msgid="5214825238247511992">"బ్యాకప్"</item>
@@ -470,9 +460,9 @@
     <item msgid="918687422516982498">"సేవ (పునఃప్రారంభమవుతోంది)"</item>
     <item msgid="6807727069641853029">"రిసీవర్"</item>
     <item msgid="6782857406100845127">"హోమ్"</item>
-    <item msgid="2860945127596974299">"చివరి కార్యాచరణ"</item>
-    <item msgid="8610560843693675830">"కాష్ చేసినవి (కార్యాచరణ)"</item>
-    <item msgid="4338089220026248848">"కాష్ చేసినవి (కార్యాచరణ క్లయింట్)"</item>
+    <item msgid="2860945127596974299">"చివరి కార్యకలాపం"</item>
+    <item msgid="8610560843693675830">"కాష్ చేసినవి (కార్యకలాపం)"</item>
+    <item msgid="4338089220026248848">"కాష్ చేసినవి (కార్యకలాపం క్లయింట్)"</item>
     <item msgid="6652164677254579050">"కాష్ చేసినవి (ఖాళీ)"</item>
   </string-array>
   <string-array name="color_picker">
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index d9489362cb1d1deb184bf16b4bd56387d8420e34..d51730bb82920c390f572afe03e1a7fff4df41f0 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -30,17 +30,19 @@
     </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>
     <string name="header_category_personal" msgid="3310195187905720823">"వ్యక్తిగతం"</string>
-    <string name="header_category_access" msgid="7580499097416970962">"ప్రాప్యత"</string>
+    <string name="header_category_access" msgid="7580499097416970962">"యాక్సెస్"</string>
     <string name="header_category_system" msgid="2816866961183068977">"సిస్టమ్"</string>
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"డేటా కనెక్షన్‌ను ప్రారంభించండి"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"డేటా కనెక్షన్‌ను నిలిపివేయండి"</string>
     <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>
@@ -149,14 +158,17 @@
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"బ్లూటూత్ కనెక్షన్ అభ్యర్థన"</string>
     <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"కి కనెక్ట్ చేయడానికి నొక్కండి."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"మీరు \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"కు కనెక్ట్ చేయాలనుకుంటున్నారా?"</string>
-    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ఫోన్ పుస్తకం ప్రాప్యత అభ్యర్థన"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> మీ పరిచయాలు మరియు కాల్ చరిత్రకు ప్రాప్యత కోరుతోంది. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>కి ప్రాప్యత ఇవ్వాలా?"</string>
+    <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"ఫోన్ పుస్తకం యాక్సెస్ అభ్యర్థన"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> మీ పరిచయాలు మరియు కాల్ చరిత్రకు యాక్సెస్ కోరుతోంది. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>కి యాక్సెస్ ఇవ్వాలా?"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"మళ్లీ అడగవద్దు"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"మళ్లీ అడగవద్దు"</string>
-    <string name="bluetooth_map_request" msgid="4595727689513143902">"సందేశ ప్రాప్యత అభ్యర్థన"</string>
-    <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_map_request" msgid="4595727689513143902">"సందేశ యాక్సెస్ అభ్యర్థన"</string>
+    <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) -->
@@ -236,7 +248,7 @@
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB నిల్వ చదవడానికి-మాత్రమే మౌంట్ చేయబడింది."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD కార్డు చదవడానికి-మాత్రమే మౌంట్ చేయబడింది."</string>
     <string name="skip_label" msgid="47510779345218297">"దాటవేయి"</string>
-    <string name="next_label" msgid="4693520878012668114">"తదుపరి"</string>
+    <string name="next_label" msgid="4693520878012668114">"తర్వాత"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"భాషలు"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"భాషా ప్రాధాన్యతలు"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"తీసివేయి"</string>
@@ -269,9 +281,9 @@
     <string name="done" msgid="6942539184162713160">"పూర్తయింది"</string>
     <string name="settings_label" msgid="1626402585530130914">"సెట్టింగ్‌లు"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"సెట్టింగ్‌లు"</string>
-    <string name="settings_shortcut" msgid="3936651951364030415">"సెట్టింగ్‌ల సత్వరమార్గం"</string>
+    <string name="settings_shortcut" msgid="3936651951364030415">"సెట్టింగ్‌ల షార్ట్‌కట్"</string>
     <string name="activity_list_empty" msgid="6428823323471264836">"సరిపోలే కార్యాచరణలు కనుగొనబడలేదు."</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"ఎయిర్‌ప్లైన్ మోడ్"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"ఎయిర్‌ప్లేన్ మోడ్"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"మరిన్ని"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"వైర్‌లెస్ &amp; నెట్‌వర్క్‌లు"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, బ్లూటూత్, ఎయిర్‌ప్లేన్ మోడ్, మొబైల్ నెట్‌వర్క్‌లు &amp; VPNలను నిర్వహించు"</string>
@@ -329,8 +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>
-    <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"గుప్తీకరణ &amp; ఆధారాలు"</string>
+    <string name="security_settings_title" msgid="4918904614964215087">"భద్రత &amp; స్థానం"</string>
+    <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>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"లాక్ స్క్రీన్ ప్రాధాన్యతలు"</string>
@@ -354,47 +366,46 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"దీనిని తర్వాత చేయి"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"వేలిముద్ర సెటప్‌ను దాటవేయాలా?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"మీరు మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఒక మార్గంగా ఎంచుకున్నారు. ఇప్పుడు దాటవేసినా, దీన్ని తర్వాత సెటప్ చేయాల్సి ఉంటుంది. కేవలం ఒక నిమిషంలో సెటప్‌ను పూర్తి చేయవచ్చు."</string>
     <string name="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>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"మరొకటి జోడించు"</string>
-    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"తదుపరి"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"తర్వాత"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"మీ ఫోన్‌ను అన్‌లాక్ చేయడంతో పాటుగా, కొనుగోళ్లు మరియు యాప్ యాక్సెస్‌ను అనుమతించడానికి కూడా మీ వేలిముద్రను ఉపయోగించవచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" స్క్రీన్ లాక్ ఎంపిక నిలిపివేయబడింది. మరింత తెలుసుకోవాలంటే, మీ సంస్థ యొక్క నిర్వాహకులను సంప్రదించండి. "<annotation id="admin_details">"మరిన్ని వివరాలు"</annotation>\n\n"ఇప్పటికీ మీరు మీ వేలిముద్రను ఉపయోగించి కొనుగోళ్లను ప్రమాణీకరించవచ్చు మరియు అనువర్తనాన్ని ప్రాప్యత చేయవచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
+    <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" స్క్రీన్ లాక్ ఎంపిక నిలిపివేయబడింది. మరింత తెలుసుకోవాలంటే, మీ సంస్థ యొక్క నిర్వాహకులను సంప్రదించండి. "<annotation id="admin_details">"మరిన్ని వివరాలు"</annotation>\n\n"ఇప్పటికీ మీరు మీ వేలిముద్రను ఉపయోగించి కొనుగోళ్లను ప్రమాణీకరించవచ్చు మరియు యాప్‌ను యాక్సెస్ చేయవచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"వేలిని పైకి ఎత్తి, ఆపై మళ్లీ సెన్సార్‌ను తాకండి"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"మీరు గరిష్టంగా <xliff:g id="COUNT">%d</xliff:g> వేలిముద్రలను జోడించవచ్చు"</string>
     <string name="fingerprint_intro_error_max" msgid="6864066984678078441">"మీరు గరిష్ట సంఖ్యలో వేలిముద్రలను జోడించారు"</string>
@@ -404,21 +415,21 @@
     <string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"మీరు మీ కార్యాలయ ప్రొఫైల్‌ని అన్‌లాక్ చేయడానికి, కొనుగోళ్లను ప్రమాణీకరించడానికి లేదా కార్యాలయ అనువర్తనాలకు సైన్ ఇన్ చేయడానికి మీ వేలిముద్రలను ఉపయోగించలేరు"</string>
     <string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"అవును, తీసివేయి"</string>
     <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"కొనసాగడానికి మీ వేలిముద్రను ఉపయోగించండి."</string>
-    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"గుప్తీకరణ"</string>
+    <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ఎన్‌క్రిప్షన్"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"టాబ్లెట్‌ను గుప్తీకరించండి"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ఫోన్‌ను గుప్తీకరించండి"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"గుప్తీకరించబడింది"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"మీరు మీ ఖాతాలను, సెట్టింగ్‌లను, డౌన్‌లోడ్ చేసిన యాప్‌లను మరియు వాటి డేటాను, మీడియాను మరియు ఇతర ఫైల్‌లను గుప్తీకరించవచ్చు. మీరు మీ టాబ్లెట్‍ను గుప్తీకరించిన తర్వాత ఒకవేళ స్క్రీన్ లాక్‌ను సెటప్ చేసినట్లయితే (అంటే, ఆకృతి లేదా సంఖ్యాత్మక పిన్‌ లేదా పాస్‌వర్డ్), టాబ్లెట్‌ను పవర్ ఆన్ చేసే ప్రతిసారి దాన్ని డీక్రిప్ట్ చేయడానికి స్క్రీన్‍ను అన్‌లాక్ చేయాలి. డీక్రిప్ట్ చేయడానికి గల ఇంకొక మార్గం ఫ్యాక్టరీ డేటా రీసెట్‌ను అమలు చేయడం మాత్రమే, అలా చేస్తే మీ మొత్తం డేటా తొలగించబడుతుంది.\n\nగుప్తీకరణకు ఒక గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది. మీరు తప్పనిసరిగా ఛార్జ్ చేసిన బ్యాటరీతో ప్రారంభించాలి మరియు ప్రాసెస్ అంతటా మీ టాబ్లెట్‌ను ప్లగిన్ చేసి ఉంచాలి. మీరు అంతరాయం కలిగిస్తే, మీ డేటాలో కొంత భాగాన్ని లేదా అంతటినీ కోల్పోతారు"</string>
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"మీరు మీ ఖాతాలను, సెట్టింగ్‌లను, డౌన్‌లోడ్ చేసిన యాప్‌లను మరియు వాటి డేటాను, మీడియాను మరియు ఇతర ఫైల్‌లను గుప్తీకరించవచ్చు. మీరు మీ ఫోన్‌ను గుప్తీకరించిన తర్వాత ఒకవేళ స్క్రీన్ లాక్‌ను సెటప్ చేసినట్లయితే (అంటే, ఆకృతి లేదా సంఖ్యాత్మక పిన్‌ లేదా పాస్‌వర్డ్), ఫోన్‌ను పవర్ ఆన్ చేసే ప్రతిసారి దాన్ని డీక్రిప్ట్ చేయడానికి స్క్రీన్‍ను అన్‌లాక్ చేయాలి. డీక్రిప్ట్ చేయడానికి గల ఇంకొక మార్గం ఫ్యాక్టరీ డేటా రీసెట్‌ను అమలు చేయడం మాత్రమే, అలా చేస్తే మీ మొత్తం డేటా తొలగించబడుతుంది.\n\nగుప్తీకరణకు ఒక గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది. మీరు తప్పనిసరిగా ఛార్జ్ చేసిన బ్యాటరీతో ప్రారంభించాలి మరియు ప్రాసెస్ అంతటా మీ ఫోన్‌ను ప్లగిన్ చేసి ఉంచాలి. మీరు అంతరాయం కలిగిస్తే, మీ డేటాలో కొంత భాగాన్ని లేదా అంతటినీ కోల్పోతారు."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"టాబ్లెట్‌ను గుప్తీకరించు"</string>
-    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ఫోన్‌ను గుప్తీకరించు"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"టాబ్లెట్‌ను ఎన్‌క్రిప్ట్ చేయి"</string>
+    <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ఫోన్‌ను ఎన్‌క్రిప్ట్ చేయి"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"మీ బ్యాటరీని ఛార్జ్ చేసి, మళ్లీ ప్రయత్నించండి."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"మీ ఛార్జర్‌ను ప్లగిన్ చేసి, మళ్లీ ప్రయత్నించండి."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"లాక్ స్క్రీన్ పిన్‌ లేదా పాస్‌వర్డ్ లేదు"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"మీరు గుప్తీకరణను ప్రారంభించడానికి ముందు లాక్ స్క్రీన్ పిన్‌ లేదా పాస్‌వర్డ్‌ను సెట్ చేయాల్సి ఉంటుంది."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"గుప్తీకరించాలా?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"గుప్తీకరణ చర్య స్థిరమైనది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. గుప్తీకరణకు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో టాబ్లెట్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"గుప్తీకరణ చర్య తిరిగి రద్దు చేయలేనిది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. గుప్తీకరణకు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో ఫోన్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"ఎన్‌క్రిప్షన్ చర్య స్థిరమైనది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. ఎన్‌క్రిప్షన్‌కు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో టాబ్లెట్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"ఎన్‌క్రిప్షన్ చర్య తిరిగి రద్దు చేయలేనిది మరియు మీరు దీనికి అంతరాయం కలిగిస్తే, డేటాను కోల్పోతారు. ఎన్‌క్రిప్షన్‌కు గంట లేదా అంతకంటే ఎక్కువ సమయం పడుతుంది, ఈ సమయంలో ఫోన్ అనేకసార్లు పునఃప్రారంభించబడుతుంది."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"గుప్తీకరిస్తోంది"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"మీ టాబ్లెట్ గుప్తీకరించబడుతున్నప్పుడు వేచి ఉండండి. <xliff:g id="PERCENT">^1</xliff:g>% పూర్తయింది."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"మీ ఫోన్ గుప్తీకరించబడుతున్నప్పుడు వేచి ఉండండి. <xliff:g id="PERCENT">^1</xliff:g>% పూర్తయింది."</string>
@@ -428,9 +439,9 @@
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి దాన్ని ఆఫ్ చేసి, ఆపై ఆన్ చేయండి."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"హెచ్చరిక: మీరు అన్‌లాక్ చేయడానికి చేసే ప్రయత్నాల్లో మరో <xliff:g id="COUNT">^1</xliff:g> సార్లు విఫలమైతే మీ పరికరం తొలగించబడుతుంది!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"మీ పాస్‌వర్డ్‌ను టైప్ చేయండి"</string>
-    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"గుప్తీకరణ విఫలమైంది"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"గుప్తీకరణకు అంతరాయం ఏర్పడింది మరియు పూర్తి చేయడం సాధ్యం కాదు. దీని ఫలితంగా, మీ టాబ్లెట్‌లోని డేటాకు ఇకపై ప్రాప్యత ఉండదు. \n\n మీ టాబ్లెట్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ టాబ్లెట్‌ను సెటప్ చేసేటప్పుడు, మీరు మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"గుప్తీకరణ ఆటంకపరచబడింది అందువల్ల పూర్తి చేయడం సాధ్యం కాదు. ఫలితంగా, మీ ఫోన్‌లోని డేటాకు ఇకపై ప్రాప్యత ఉండదు. \n\nమీ ఫోన్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ ఫోన్‌ను సెటప్ చేసేటప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
+    <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ఎన్‌క్రిప్షన్ విఫలమైంది"</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"గుప్తీకరణకు అంతరాయం ఏర్పడింది మరియు పూర్తి చేయడం సాధ్యం కాదు. దీని ఫలితంగా, మీ టాబ్లెట్‌లోని డేటాకు ఇకపై యాక్సెస్ ఉండదు. \n\n మీ టాబ్లెట్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ టాబ్లెట్‌ను సెటప్ చేసేటప్పుడు, మీరు మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"ఎన్‌క్రిప్షన్ ఆటంకపరచబడింది అందువల్ల పూర్తి చేయడం సాధ్యం కాదు. ఫలితంగా, మీ ఫోన్‌లోని డేటాకు ఇకపై యాక్సెస్ ఉండదు. \n\nమీ ఫోన్‌ను ఉపయోగించడాన్ని పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాల్సి ఉంటుంది. మీరు రీసెట్ తర్వాత మీ ఫోన్‌ను సెటప్ చేసేటప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేయబడిన ఏదైనా డేటాను పునరుద్ధరించడానికి మీకు అవకాశం ఉంటుంది."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"డిక్రిప్షన్ విజయవంతం కాలేదు"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"మీరు నమోదు చేసిన పాస్‌వర్డ్ సరైనది, కానీ దురదృష్టవశాత్తూ మీ డేటా పాడైంది. \n\nమీ టాబ్లెట్‌ను ఉపయోగించడం పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాలి. మీరు రీసెట్ చేసిన తర్వాత మీ టాబ్లెట్‌ను సెటప్ చేసినప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేసిన ఏదైనా డేటాను పునరుద్ధరించుకునే అవకాశం మీకు అందించబడుతుంది."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"మీరు నమోదు చేసిన పాస్‌వర్డ్ సరైనది, కానీ దురదృష్టవశాత్తూ మీ డేటా పాడైంది. \n\nమీ ఫోన్‌ను ఉపయోగించడం పునఃప్రారంభించడానికి, మీరు ఫ్యాక్టరీ రీసెట్‌ను అమలు చేయాలి. మీరు రీసెట్ చేసిన తర్వాత మీ ఫోన్‌ను సెటప్ చేసినప్పుడు, మీ Google ఖాతాకు బ్యాకప్ చేసిన ఏదైనా డేటాను పునరుద్ధరించుకునే అవకాశం మీకు అందించబడుతుంది."</string>
@@ -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>
@@ -473,7 +486,7 @@
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"వేలిముద్ర + పాస్‌వర్డ్"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"వేలిముద్ర లేకుండా కొనసాగండి"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"మీరు మీ వేలిముద్రను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. భద్రత కోసం, ఈ ఎంపికకు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"నిర్వాహకులు, గుప్తీకరణ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"నిర్వాహకులు, ఎన్‌క్రిప్షన్ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ఏదీ వద్దు"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"స్వైప్"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"ఆకృతి"</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="1688030823464420974">"మీరు తర్వాత ప్రయత్నంలో తప్పు నమూనాను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"మీరు తర్వాత ప్రయత్నంలో తప్పు పిన్‌ను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"మీరు తర్వాత ప్రయత్నంలో తప్పు పాస్‌వర్డ్‌ను నమోదు చేస్తే, ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది"</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="5047439819181833824">"చాలా ఎక్కువ తప్పు ప్రయత్నాలు చేసారు. ఈ పరికరం యొక్క డేటా తొలగించబడుతుంది."</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>
@@ -566,9 +587,9 @@
     <string name="lockpassword_ok_label" msgid="313822574062553672">"సరే"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"రద్దు చేయి"</string>
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"రద్దు చేయి"</string>
-    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"తదుపరి"</string>
+    <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"తర్వాత"</string>
     <string name="lock_setup" msgid="3355847066343753943">"సెటప్ పూర్తయింది."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"పరికర నిర్వాహకుల అనువర్తనాలు"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"పరికర నిర్వాహకుల యాప్‌లు"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"సక్రియ అనువర్తనాలు లేవు"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> సక్రియంగా ఉన్న యాప్‌లు</item>
@@ -597,7 +618,7 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"దీనితో జత చేయడానికి:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ఇది ఈ పాస్‌కీని చూపుతోందని నిర్ధారించుకోండి:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"దీని నుండి:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ఈ పరికరంతో జత చేయాలా?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"దీనితో జత చేయడానికి:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>దీనిలో టైప్ చేయండి:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, ఆపై తిరిగి వెళ్లు లేదా Enter నొక్కండి."</string>
-    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"మీ పరిచయాలు మరియు కాల్ చరిత్రను ప్రాప్యత చేయడానికి <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ని అనుమతించండి"</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"మీ పరిచయాలు మరియు కాల్ చరిత్రను యాక్సెస్ చేయడానికి <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ని అనుమతించండి"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>కి కనెక్ట్ చేయడం సాధ్యపడలేదు."</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"పరికరాల కోసం స్కాన్ చేయి"</string>
@@ -611,7 +632,7 @@
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"పరిచయాలు మరియు కాల్ చరిత్ర"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"ఈ పరికరంతో జత చేయాలా?"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"ఫోన్ పుస్తకాన్ని భాగస్వామ్యం చేయాలా?"</string>
-    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> మీ పరిచయాలను మరియు కాల్ చరిత్రను ప్రాప్యత చేయాలనుకుంటోంది."</string>
+    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> మీ పరిచయాలను మరియు కాల్ చరిత్రను యాక్సెస్ చేయాలనుకుంటోంది."</string>
     <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> బ్లూటూత్‌తో జత చేయాలనుకుంటోంది. కనెక్ట్ చేసినప్పుడు, ఇది మీ పరిచయాలు మరియు కాల్ చరిత్రకి ప్రాప్యతని కలిగి ఉంటుంది."</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"జత చేసిన పరికరాలు"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"అందుబాటులో ఉన్న పరికరాలు"</string>
@@ -626,11 +647,19 @@
     <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>
     <string name="bluetooth_disconnect_hid_profile" msgid="3282295189719352075">"ఇన్‌పుట్ పరికరం నుండి <xliff:g id="DEVICE_NAME">%1$s</xliff:g> డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
-    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ద్వారా ఇంటర్నెట్ ప్రాప్యత డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
+    <string name="bluetooth_disconnect_pan_user_profile" msgid="8037627994382458698">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ద్వారా ఇంటర్నెట్ యాక్సెస్ డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="tablet" msgid="1262792320446274407">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ఈ టాబ్లెట్ ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం నుండి డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
     <string name="bluetooth_disconnect_pan_nap_profile" product="default" msgid="5700332050175684571">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ఈ ఫోన్ ఇంటర్నెట్ కనెక్షన్‌ను భాగస్వామ్యం నుండి డిస్‌కనెక్ట్ చేయబడుతుంది."</string>
     <string name="bluetooth_device_advanced_title" msgid="6066342531927499308">"జత చేయబడిన బ్లూటూత్ పరికరం"</string>
@@ -639,7 +668,7 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"దీని కోసం ఉపయోగించు"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"పేరు మార్చు"</string>
     <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"ఇన్‌కమింగ్ ఫైల్ బదిలీలను అనుమతించు"</string>
-    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ఇంటర్నెట్ ప్రాప్యత కోసం పరికరానికి కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ఇంటర్నెట్ యాక్సెస్ కోసం పరికరానికి కనెక్ట్ చేయబడింది"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"స్థానిక ఇంటర్నెట్ కనెక్షన్‌ను పరికరంతో భాగస్వామ్యం చేయడం"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"డాక్ సెట్టింగ్‌లు"</string>
     <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"ఆడియో కోసం డాక్‌ను ఉపయోగించు"</string>
@@ -667,9 +696,9 @@
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"టాబ్లెట్ మరో పరికరాన్ని తాకినప్పుడు డేటా మార్పిడిని అనుమతించు"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"ఫోన్ మరో పరికరాన్ని తాకినప్పుడు డేటా పరస్పర మార్పిడికి అనుమతించండి"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFCని ఆన్ చేయండి"</string>
-    <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC ఈ పరికరం మరియు ఇతర సమీప పరికరాలు లేదా చెల్లింపు టెర్మినల్‌లు, ప్రాప్యత రీడర్‌లు మరియు పరస్పర చర్య కలిగి ఉండే ప్రకటనలు లేదా ట్యాగ్‌ల వంటి లక్ష్యాల మధ్య డేటా మార్పిడి చేస్తుంది."</string>
+    <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC ఈ పరికరం మరియు ఇతర సమీప పరికరాలు లేదా చెల్లింపు టెర్మినల్‌లు, యాక్సెస్ రీడర్‌లు మరియు పరస్పర చర్య కలిగి ఉండే ప్రకటనలు లేదా ట్యాగ్‌ల వంటి లక్ష్యాల మధ్య డేటా మార్పిడి చేస్తుంది."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"అనువర్తన కంటెంట్‌ను NFC ద్వారా పంపడానికి సిద్ధంగా ఉంది"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"యాప్ కంటెంట్‌ను NFC ద్వారా పంపడానికి సిద్ధంగా ఉంది"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ఆఫ్‌లో ఉంది"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC ఆఫ్ చేయబడినందున అందుబాటులో లేదు"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -679,25 +708,28 @@
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi సెట్టింగ్‌లు"</string>
     <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
-    <string name="wifi_settings_summary" msgid="668767638556052820">"వైర్‌లెస్ ప్రాప్యత స్థానాలను సెటప్ చేయండి &amp; నిర్వహించండి"</string>
+    <string name="wifi_settings_summary" msgid="668767638556052820">"వైర్‌లెస్ యాక్సెస్ స్థానాలను సెటప్ చేయండి &amp; నిర్వహించండి"</string>
     <string name="wifi_select_network" msgid="4210954938345463209">"Wi‑Fiను ఎంచుకోండి"</string>
     <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fiను ప్రారంభిస్తోంది…"</string>
     <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fiని ఆపివేస్తోంది…"</string>
-    <string name="wifi_error" msgid="3207971103917128179">"లోపం"</string>
+    <string name="wifi_error" msgid="3207971103917128179">"ఎర్రర్"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"ఈ దేశంలో 5 GHz బ్యాండ్ అందుబాటులో లేదు"</string>
-    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ఎయిర్‌ప్లైన్ మోడ్‌లో"</string>
+    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"ఎయిర్‌ప్లేన్ మోడ్‌లో"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"ఓపెన్ నెట్‌వర్క్ నోటిఫికేషన్"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"అధిక నాణ్యత ఉన్న పబ్లిక్ నెట్‌వర్క్ అందుబాటులో ఉన్నప్పుడు తెలియజేస్తుంది"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fiని స్వయంచాలకంగా ఆన్ చేయి"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"మీ ఇంటి నెట్‌వర్క్‌ల వంటి సేవ్ చేసిన అధిక నాణ్యత గల నెట్‌వర్క్‌లు అందుబాటులో ఉన్నప్పుడు Wi‑Fi తిరిగి ఆన్ చేయబడుతుంది"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi స్కానింగ్ ఆఫ్ చేయబడినందున అందుబాటులో లేదు"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ఉపయోగించడానికి, నెట్‌వర్క్ రేటింగ్ ప్రదాతను ఎంచుకోండి"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"బలహీన కనెక్షన్‌లను నివారించు"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Wi‑Fi నెట్‌వర్క్ ఉత్తమ ఇంటర్నెట్ కనెక్షన్‌ను కలిగి ఉంటే మినహా ఉపయోగించవద్దు"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ఉత్తమ ఇంటర్నెట్ కనెక్షన్ ఉన్న నెట్‌వర్క్‌లను మాత్రమే ఉపయోగించు"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"ఓపెన్ నెట్‌వర్క్‌లకు కనెక్ట్ చేయి"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"అధిక నాణ్యత గల పబ్లిక్ నెట్‌వర్క్‌లకు స్వయంచాలకంగా కనెక్ట్ చేస్తుంది"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"ప్రమాణపత్రాలను ఇన్‌స్టాల్ చేయి"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి, సిస్టమ్ అనువర్తనాలు మరియు సేవలు ఇప్పటికీ 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="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"ఉపయోగించడానికి, నెట్‌వర్క్ రేటింగ్ ప్రదాతను ఎంచుకోండి"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"ఉపయోగించడానికి, అనుకూల నెట్‌వర్క్ రేటింగ్ ప్రదాతను ఎంచుకోండి"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"సర్టిఫికెట్లను ఇన్‌స్టాల్ చేయి"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచడానికి, సిస్టమ్ యాప్‌లు మరియు సేవలు ఇప్పటికీ 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"స్థాన ఖచ్చితత్వాన్ని మెరుగుపరచాలంటే, <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>స్కానింగ్ సెట్టింగ్‌లు<xliff:g id="LINK_END_1">LINK_END</xliff:g>లో Wi-Fi స్కానింగ్‌ని ఆన్ చేయండి."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"మళ్లీ చూపవద్దు"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"నిద్రావస్థలో ఉన్నప్పుడు Wi‑Fiని ఆన్‌లో ఉంచు"</string>
@@ -707,9 +739,9 @@
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi అనుకూలీకరణ"</string>
     <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi‑Fi ఆన్‌లో ఉన్నప్పుడు బ్యాటరీ వినియోగాన్ని కనిష్టీకరించు"</string>
     <string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Wi‑Fi విని. బ్యాటరీ పరి. చేయి"</string>
-    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi‑Fiకి ఇంటర్నెట్ ప్రాప్యత లేకపోతే మొబైల్ డేటాకు మారండి."</string>
+    <string name="wifi_switch_away_when_unvalidated" msgid="1707247692180853058">"Wi‑Fiకి ఇంటర్నెట్ యాక్సెస్ లేకపోతే మొబైల్ డేటాకు మారండి."</string>
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"స్వయంచాలకంగా మొబైల్ డేటాకి మార్చు"</string>
-    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Wi‑Fiకి ఇంటర్నెట్ ప్రాప్యత లేనప్పుడు మొబైల్ డేటాను ఉపయోగిస్తుంది. డేటా వినియోగ ఛార్జీలు వర్తించవచ్చు."</string>
+    <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Wi‑Fiకి ఇంటర్నెట్ యాక్సెస్ లేనప్పుడు మొబైల్ డేటాను ఉపయోగిస్తుంది. డేటా వినియోగ ఛార్జీలు వర్తించవచ్చు."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"నెట్‌వర్క్‌ను జోడించండి"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi ప్రాధాన్యతలు"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi స్వయంచాలకంగా తిరిగి ఆన్ చేయబడుతుంది"</string>
@@ -760,9 +792,9 @@
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> ఆధారాలు"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP పద్ధతి"</string>
     <string name="please_select_phase2" msgid="5231074529772044898">"2వ దశ ప్రామాణీకరణ"</string>
-    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA ప్రమాణపత్రం"</string>
+    <string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA సర్టిఫికెట్"</string>
     <string name="wifi_eap_domain" msgid="8471124344218082064">"డొమైన్"</string>
-    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"వినియోగదారు ప్రమాణపత్రం"</string>
+    <string name="wifi_eap_user_cert" msgid="1291089413368160789">"వినియోగదారు సర్టిఫికెట్"</string>
     <string name="wifi_eap_identity" msgid="4359453783379679103">"గుర్తింపు"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"అనామక గుర్తింపు"</string>
     <string name="wifi_password" msgid="5948219759936151048">"పాస్‌వర్డ్"</string>
@@ -778,7 +810,8 @@
     <string name="wifi_use_system_certs" msgid="5270879895056893783">"సిస్టమ్ ప్రమాణపత్రాలను ఉపయోగించు"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"అందించవద్దు"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"ప్రామాణీకరించవద్దు"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"ప్రమాణపత్రం ఏదీ పేర్కొనబడలేదు. మీ కనెక్షన్ ప్రైవేట్‌గా ఉండదు."</string>
+    <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"సర్టిఫికెట్ ఏదీ పేర్కొనబడలేదు. మీ కనెక్షన్ ప్రైవేట్‌గా ఉండదు."</string>
+    <string name="wifi_ssid_too_long" msgid="3474753269579895244">"నెట్‌వర్క్ పేరు చాలా పొడవుగా ఉంది."</string>
     <string name="wifi_no_domain_warning" msgid="5223011964091727376">"తప్పనిసరిగా డొమైన్‌ను పేర్కొనాలి."</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS అందుబాటులో ఉంది"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS అందుబాటులో ఉంది)"</string>
@@ -790,7 +823,7 @@
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"కనెక్ట్ చేయడానికి సైన్ ఇన్ చేయాలా?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"మీరు నెట్‌వర్క్‌కు కనెక్ట్ చేయడానికి ముందు ఆన్‌లైన్‌లో సైన్ ఇన్ చేయాలని <xliff:g id="APP_NAME">%1$s</xliff:g> కోరుకుంటోంది."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"కనెక్ట్ చేయి"</string>
-    <string name="no_internet_access_text" msgid="7133561752896706392">"ఈ నెట్‌వర్క్‌కు ఇంటర్నెట్ ప్రాప్యత లేదు. కనెక్ట్ చేసి ఉంచాలా?"</string>
+    <string name="no_internet_access_text" msgid="7133561752896706392">"ఈ నెట్‌వర్క్‌కు ఇంటర్నెట్ యాక్సెస్ లేదు. కనెక్ట్ చేసి ఉంచాలా?"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"ఈ నెట్‌వర్క్ కోసం మళ్లీ అడగవద్దు"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi ఇంటర్నెట్‌కు కనెక్ట్ కాలేదు"</string>
     <string name="lost_internet_access_text" msgid="9029649339816197345">"Wi‑Fi కనెక్షన్ బలహీనంగా ఉన్నప్పుడు మీరు మొబైల్ నెట్‌వర్క్‌కు మారవచ్చు. డేటా వినియోగ ఛార్జీలు వర్తించవచ్చు."</string>
@@ -810,7 +843,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>
@@ -832,7 +864,7 @@
     <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"పరికర సమాచారం"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"ఈ కనెక్షన్‌ను గుర్తుంచుకో"</string>
-    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"పరికరాల కోసం శోధించు"</string>
+    <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"పరికరాల కోసం వెతుకు"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"శోధిస్తోంది..."</string>
     <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"పరికరం పేరు మార్చు"</string>
     <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"పీర్ పరికరాలు"</string>
@@ -847,13 +879,21 @@
     <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>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్ లోపం"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్ ఎర్రర్"</string>
     <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi హాట్‌స్పాట్‌ను సెటప్ చేయండి"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi హాట్‌స్పాట్ సెటప్"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK హాట్‌స్పాట్"</string>
@@ -896,6 +936,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>
@@ -948,11 +989,12 @@
     <string name="accessibility_category_personal" msgid="1263518850905945594">"వ్యక్తిగత ప్రొఫైల్ ఖాతాలు"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"కార్యాలయ ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_personal_account_title" msgid="2169071663029067826">"వ్యక్తిగత ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
-    <string name="search_settings" msgid="1910951467596035063">"శోధించు"</string>
+    <string name="search_settings" msgid="1910951467596035063">"వెతుకు"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"శోధన సెట్టింగ్‌లను మరియు చరిత్రను నిర్వహించు"</string>
     <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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు / బ్యాటరీ వినియోగం పెరుగుతుంది"</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="6978257596231155345">"ప్రదర్శన సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారం. బ్యాటరీ వినియోగం పెరుగుతుంది."</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>
@@ -1063,16 +1110,16 @@
     <string name="pin_failed" msgid="1848423634948587645">"సిమ్ పిన్ చర్య విఫలమైంది!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"టాబ్లెట్ స్థితి"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"ఫోన్ స్థితి"</string>
-    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"సిస్టమ్ నవీకరణలు"</string>
+    <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"Android సంస్కరణ"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"Android వెర్షన్"</string>
     <string name="security_patch" msgid="8438384045870296634">"Android భద్రతా అతికింపు స్థాయి"</string>
     <string name="model_info" msgid="1952009518045740889">"మోడల్"</string>
     <string name="hardware_info" msgid="2605080746512527805">"మోడల్ &amp; హార్డ్‌వేర్"</string>
-    <string name="hardware_revision" msgid="8893547686367095527">"హార్డ్‌వేర్ సంస్కరణ"</string>
+    <string name="hardware_revision" msgid="8893547686367095527">"హార్డ్‌వేర్ వెర్షన్"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ఉపకరణం ID"</string>
-    <string name="baseband_version" msgid="1848990160763524801">"బేస్‌బ్యాండ్ సంస్కరణ"</string>
-    <string name="kernel_version" msgid="9192574954196167602">"కెర్నల్ సంస్కరణ"</string>
+    <string name="baseband_version" msgid="1848990160763524801">"బేస్‌బ్యాండ్ వెర్షన్"</string>
+    <string name="kernel_version" msgid="9192574954196167602">"కెర్నల్ వెర్షన్"</string>
     <string name="build_number" msgid="3075795840572241758">"బిల్డ్ సంఖ్య"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux స్థితి"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"అందుబాటులో లేదు"</string>
@@ -1089,7 +1136,7 @@
     <string name="status_number" product="default" msgid="5123197324870153205">"నా ఫోన్ నంబర్"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
-    <string name="status_prl_version" msgid="1007470446618081441">"PRL సంస్కరణ"</string>
+    <string name="status_prl_version" msgid="1007470446618081441">"PRL వెర్షన్"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"మొబైల్ నెట్‌వర్క్ రకం"</string>
@@ -1192,7 +1239,7 @@
     <string name="storage_internal_forget_details" msgid="9028875424669047327">"ఈ <xliff:g id="NAME">^1</xliff:g> కలిగి ఉన్న అనువర్తనాలు, ఫోటోలు లేదా డేటాను ఉపయోగించడానికి, దాన్ని మళ్లీ చొప్పించండి. \n\nపరికరం అందుబాటులో లేకపోతే ప్రత్యామ్నాయంగా మీరు ఈ నిల్వను విస్మరించేలా ఎంచుకోవచ్చు. \n\nమీరు విస్మరించాలని ఎంచుకుంటే, పరికరంలో ఉన్న మొత్తం డేటాను శాశ్వతంగా కోల్పోతారు. \n\nమీరు తర్వాత అనువర్తనాలను మళ్లీ ఇన్‌స్టాల్ చేయవచ్చు, కానీ ఈ పరికరంలో నిల్వ చేసిన వాటి డేటాను కోల్పోతారు."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g>ని విస్మరించాలా?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"ఈ <xliff:g id="NAME">^1</xliff:g>లో నిల్వ చేయబడిన అన్ని అనువర్తనాలు, ఫోటోలు మరియు డేటాను శాశ్వతంగా కోల్పోతారు."</string>
-    <string name="storage_detail_apps" msgid="6141154016753507490">"అనువర్తనాలు"</string>
+    <string name="storage_detail_apps" msgid="6141154016753507490">"యాప్‌లు"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"చిత్రాలు"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"వీడియోలు"</string>
     <string name="storage_detail_audio" msgid="1197685141676483213">"ఆడియో"</string>
@@ -1201,7 +1248,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"సిస్టమ్"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>ని అన్వేషించండి"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"ఇతరంలో అనువర్తనాల ద్వారా సేవ్ చేయబడిన భాగస్వామ్య ఫైల్‌లు, ఇంటర్నెట్ లేదా బ్లూటూత్ నుండి డౌన్‌లోడ్ చేసిన ఫైల్‌లు, Android ఫైల్‌లు మొదలైనవి ఉంటాయి. \n\nఈ <xliff:g id="NAME">^1</xliff:g> మొత్తం కంటెంట్‌లను చూడటానికి, విశ్లేషించు నొక్కండి."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"సిస్టమ్‌లో Android సంస్కరణ <xliff:g id="VERSION">%s</xliff:g>ని అమలు చేయడానికి అవసరమైన ఫైల్‌లు ఉంటాయి"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"సిస్టమ్‌లో Android వెర్షన్ <xliff:g id="VERSION">%s</xliff:g>ని అమలు చేయడానికి అవసరమైన ఫైల్‌లు ఉంటాయి"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> <xliff:g id="SIZE">^2</xliff:g> నిల్వను ఉపయోగించి ఫోటోలు, సంగీతం, అనువర్తనాలు లేదా ఇతర డేటాని సేవ్ చేసి ఉండవచ్చు. \n\nవివరాలు వీక్షించాలంటే, <xliff:g id="USER_1">^1</xliff:g>కు మారండి."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"మీ <xliff:g id="NAME">^1</xliff:g> సెటప్ చేయండి"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"పోర్టబుల్ నిల్వగా ఉపయోగించు"</string>
@@ -1236,7 +1283,7 @@
     <string name="battery_status_title" msgid="9159414319574976203">"బ్యాటరీ స్థితి"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"బ్యాటరీ స్థాయి"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNలు"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"ప్రాప్యత స్థానాన్ని సవరించండి"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"యాక్సెస్ స్థానాన్ని సవరించండి"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"సెట్ చేయలేదు"</string>
     <string name="apn_name" msgid="4115580098369824123">"పేరు"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -1273,6 +1320,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>
@@ -1292,16 +1340,21 @@
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"అంతర్గత నిల్వను &amp; మొత్తం డేటాని రీసెట్ చేస్తుంది"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"ఇందువలన మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా, మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ఇందువలన మీ ఫోన్ "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన అనువర్తనాలు"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"ఇందువలన మీ ఫోన్ "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా మొత్తం డేటా ఎరేజ్ చేయబడుతుంది:\n\n"<li>"Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు యాప్ డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన యాప్‌లు"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"మీరు ప్రస్తుతం క్రింది ఖాతాలకు సైన్ ఇన్ చేసారు:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"ఈ పరికరంలో ఇతర వినియోగదారులు ఉన్నారు.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"సంగీతం"</li>\n<li>"ఫోటోలు"</li>\n<li>"ఇతర వినియోగదారు డేటా"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIMలో క్యారియర్‌లు"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"ఇది మొబైల్ సేవా ప్లాన్‌ని రద్దు చేయదు."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"USB నిల్వ"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"SD కార్డు"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB నిల్వను ఎరేజ్ చేయి"</string>
     <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>
@@ -1318,32 +1371,21 @@
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"బ్లూటూత్ టీథరింగ్"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"టీథరింగ్"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"హాట్‌స్పాట్ &amp; టీథరింగ్"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"హాట్‌స్పాట్ ఆన్, టీథెరింగ్"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"హాట్‌స్పాట్ ఆన్, టెథెరింగ్"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"హాట్‌స్పాట్ ఆన్"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"టీథెరింగ్"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"టెథెరింగ్"</string>
     <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 +1418,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>
@@ -1393,7 +1435,7 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPSకి సహాయంగా సర్వర్‌ను ఉపయోగించు (GPS పనితీరుని మెరుగుపరచడానికి ఎంపిక తీసియండి)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"స్థానం &amp; Google శోధన"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"శోధన ఫలితాలు మరియు ఇతర సేవలను మెరుగుపరచడం కోసం మీ స్థానాన్ని ఉపయోగించడానికి Googleని అనుమతించండి"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"నా స్థానానికి ప్రాప్యత"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"నా స్థానానికి యాక్సెస్"</string>
     <string name="location_access_summary" msgid="69031404093194341">"మీ స్థాన సమాచారాన్ని ఉపయోగించడానికి మీ అనుమతిని అడిగిన అనువర్తనాలను అనుమతించండి"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"స్థానం మూలాలు"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"టాబ్లెట్ పరిచయం"</string>
@@ -1421,8 +1463,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>
@@ -1485,17 +1530,20 @@
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"ఒకే లాక్‌ని ఉపయోగించండి"</string>
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"పరికర స్క్రీన్ లాక్ లాంటిది"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"అనువర్తనాలను నిర్వహించు"</string>
-    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలను నిర్వహించు మరియు తీసివేయి"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"అనువర్తన సమాచారం"</string>
+    <string name="manageapplications_settings_summary" msgid="1794401500935451259">"ఇన్‌స్టాల్ చేయబడిన యాప్‌లను నిర్వహించండి మరియు తీసివేయండి"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"యాప్ సమాచారం"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"అనువర్తనాలను నిర్వహించండి, శీఘ్ర ప్రారంభ సత్వరమార్గాలను సెటప్ చేయండి"</string>
     <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"మరిన్ని సెట్టింగ్‌ల ఎంపికలను ప్రారంభించు"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"అనువర్తన సమాచారం"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"యాప్ సమాచారం"</string>
     <string name="storage_label" msgid="8700867073480107253">"నిల్వ"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"డిఫాల్ట్‌గా తెరువు"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"డిఫాల్ట్‌లు"</string>
@@ -1508,7 +1556,7 @@
       <item quantity="other">%d అంశాలు</item>
       <item quantity="one">1 అంశం</item>
     </plurals>
-    <string name="clear_uri_btn_text" msgid="8575655132961012158">"ప్రాప్యతను తీసివేయి"</string>
+    <string name="clear_uri_btn_text" msgid="8575655132961012158">"యాక్సెస్‌ను తీసివేయి"</string>
     <string name="controls_label" msgid="7611113077086853799">"నియంత్రణలు"</string>
     <string name="force_stop" msgid="7435006169872876756">"ఫోర్స్ స్టాప్"</string>
     <string name="total_size_label" msgid="1048676419552557254">"మొత్తం"</string>
@@ -1523,9 +1571,9 @@
     <string name="disable_text" msgid="6544054052049395202">"నిలిపివేయి"</string>
     <string name="enable_text" msgid="9217362512327828987">"ప్రారంభించు"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"డేటాను క్లియర్ చేయి"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"నవీకరణలను అన్‌ఇన్‌స్టాల్ చేయండి"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"అప్‌డేట్‌లను అన్‌ఇన్‌స్టాల్ చేయండి"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"మీరు కొన్ని చర్యల కోసం ఈ అనువర్తనాన్ని డిఫాల్ట్‌గా ప్రారంభించడానికి ఎంచుకున్నారు."</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"మీరు విడ్జెట్‌లను సృష్టించడానికి మరియు వాటి డేటాను ప్రాప్యత చేయడానికి ఈ అనువర్తనాన్ని అనుమతించడాన్ని ఎంచుకున్నారు."</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"మీరు విడ్జెట్‌లను సృష్టించడానికి మరియు వాటి డేటాను యాక్సెస్ చేయడానికి ఈ యాప్‌ను ఎంచుకున్నారు."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"డిఫాల్ట్‌లు సెట్ చేయబడలేదు."</string>
     <string name="clear_activities" msgid="7408923511535174430">"డిఫాల్ట్‌లను క్లియర్ చేయి"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ఈ యాప్ మీ స్క్రీన్ కోసం రూపొందించబడి ఉండకపోవచ్చు. మీరు దీన్ని మీ స్క్రీన్‌కు ఎలా సర్దుబాటు చేయాలనేదాన్ని ఇక్కడ నియంత్రించవచ్చు."</string>
@@ -1537,14 +1585,14 @@
     <string name="show_running_services" msgid="5736278767975544570">"అమలయ్యే సేవలను చూపు"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"కాష్ చేసిన ప్రాసెస్‌లను చూపు"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"అత్యవసర యాప్"</string>
-    <string name="reset_app_preferences" msgid="1321050641018356925">"అనువర్తన ప్రాధాన్యతలను రీసెట్ చేయి"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"అనువర్తన ప్రాధాన్యతలను రీసెట్ చేయాలా?"</string>
-    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ఇది వీటి కోసం అన్ని ప్రాధాన్యతలను రీసెట్ చేస్తుంది:\n\n "<li>"నిలిపివేయబడిన అనువర్తనాలు"</li>\n" "<li>"నిలిపివేయబడిన అనువర్తన నోటిఫికేషన్‌లు"</li>\n" "<li>"చర్యల కోసం డిఫాల్ట్ అనువర్తనాలు"</li>\n" "<li>"అనువర్తనాల కోసం నేపథ్య డేటా పరిమితులు"</li>\n" "<li>"ఏవైనా అనుమతి పరిమితులు"</li>\n\n" మీరు అనువర్తన డేటాను కోల్పోరు."</string>
+    <string name="reset_app_preferences" msgid="1321050641018356925">"యాప్ ప్రాధాన్యతలను రీసెట్ చేయి"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"యాప్ ప్రాధాన్యతలను రీసెట్ చేయాలా?"</string>
+    <string name="reset_app_preferences_desc" msgid="4822447731869201512">"ఇది వీటి కోసం అన్ని ప్రాధాన్యతలను రీసెట్ చేస్తుంది:\n\n "<li>"నిలిపివేయబడిన యాప్‌లు"</li>\n" "<li>"నిలిపివేయబడిన యాప్ నోటిఫికేషన్‌లు"</li>\n" "<li>"చర్యల కోసం డిఫాల్ట్ యాప్‌లు"</li>\n" "<li>"యాప్‌ల కోసం నేపథ్య డేటా పరిమితులు"</li>\n" "<li>"ఏవైనా అనుమతి పరిమితులు"</li>\n\n" మీరు యాప్‌ డేటాను కోల్పోరు."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"అనువర్తనాలను రీసెట్ చేయి"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"నిల్వ ఖాళీని నిర్వహించు"</string>
     <string name="filter" msgid="2018011724373033887">"ఫిల్టర్ చేయి"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ఫిల్టర్ ఎంపికలను ఎంచుకోండి"</string>
-    <string name="filter_apps_all" msgid="8899612398848280352">"అన్ని అనువర్తనాలు"</string>
+    <string name="filter_apps_all" msgid="8899612398848280352">"అన్ని యాప్‌లు"</string>
     <string name="filter_apps_disabled" msgid="5862632369555319938">"నిలిపివేయబడిన అనువర్తనాలు"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"డౌన్‌లోడ్ చేయబడినవి"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"అమలయ్యేవి"</string>
@@ -1581,7 +1629,7 @@
     <string name="computing_size" msgid="1599186977475211186">"గణిస్తోంది…"</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"ప్యాకేజీ పరిమాణాన్ని గణించడం సాధ్యపడలేదు."</string>
     <string name="empty_list_msg" msgid="3552095537348807772">"మీరు ఇన్‌స్టాల్ చేయబడిన మూడవ-పక్ష అనువర్తనాలు ఏవీ కలిగి లేరు."</string>
-    <string name="version_text" msgid="9189073826278676425">"సంస్కరణ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
+    <string name="version_text" msgid="9189073826278676425">"వెర్షన్ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"తరలించు"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"టాబ్లెట్‌కు తరలించు"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ఫోన్‌కు తరలించు"</string>
@@ -1593,7 +1641,7 @@
     <string name="does_not_exist" msgid="1501243985586067053">"యాప్ ఉనికిలో లేదు."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"యాప్ కాపీ-రక్షితమైనది."</string>
     <string name="invalid_location" msgid="4354595459063675191">"ఇన్‌స్టాల్ స్థానం చెల్లదు."</string>
-    <string name="system_package" msgid="1352722848400644991">"సిస్టమ్ నవీకరణలను బాహ్య మీడియాలో ఇన్‌స్టాల్ చేయడం సాధ్యపడదు."</string>
+    <string name="system_package" msgid="1352722848400644991">"సిస్టమ్ అప్‌డేట్‌లను బాహ్య మీడియాలో ఇన్‌స్టాల్ చేయడం సాధ్యపడదు."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"పరికర నిర్వాహకుల అనువర్తనాన్ని బాహ్య మీడియాలో ఇన్‌స్టాల్ చేయలేరు"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"నిర్బంధంగా ఆపివేయాలా?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"మీరు అనువర్తనాన్ని నిర్బంధంగా ఆపివేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</string>
@@ -1607,9 +1655,9 @@
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"డేటాను తొలగించి అనువర్తనాన్ని నిలిపివేయాలా?"</string>
     <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"మీరు ఈ అనువర్తనాన్ని నిలిపివేస్తే, Android మరియు ఇతర అనువర్తనాలు ఇకపై ఉద్దేశించిన రీతిలో పని చేయకపోవచ్చు. మీ డేటా కూడా తొలగించబడుతుంది."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"నోటిఫికేషన్‌లను ఆపివేయాలా?"</string>
-    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"మీరు ఈ అనువర్తనానికి నోటిఫికేషన్‌లను ఆపివేస్తే, మీరు ముఖ్యమైన హెచ్చరికలు మరియు నవీకరణలను కోల్పోవడం సంభవించవచ్చు."</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"మీరు ఈ యాప్‌కు నోటిఫికేషన్‌లను ఆపివేస్తే, మీరు ముఖ్యమైన హెచ్చరికలు మరియు అప్‌డేట్‌లను కోల్పోవడం సంభవించవచ్చు."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"స్టోర్"</string>
-    <string name="app_install_details_title" msgid="6905279702654975207">"అనువర్తన వివరాలు"</string>
+    <string name="app_install_details_title" msgid="6905279702654975207">"యాప్ వివరాలు"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"యాప్ <xliff:g id="APP_STORE">%1$s</xliff:g> నుండి ఇన్‌స్టాల్ చేయబడింది"</string>
     <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g>లో మరింత సమాచారం"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"యాప్ చర్యలు"</string>
@@ -1636,9 +1684,9 @@
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ప్రాసెస్‌లు మరియు <xliff:g id="NUMSERVICES">%2$d</xliff:g> సేవ"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> ప్రాసెస్‌లు మరియు <xliff:g id="NUMSERVICES">%2$d</xliff:g> సేవలు"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"పరికర మెమరీ"</string>
-    <string name="running_processes_header_footer" msgid="723908176275428442">"అనువర్తన RAM వినియోగం"</string>
+    <string name="running_processes_header_footer" msgid="723908176275428442">"యాప్ RAM వినియోగం"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"సిస్టమ్"</string>
-    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"అనువర్తనాలు"</string>
+    <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"యాప్‌లు"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"ఖాళీ"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"ఉపయోగించబడినది"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"కాష్ చేయబడినది"</string>
@@ -1659,6 +1707,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>
@@ -1674,7 +1726,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\"ని చొప్పించడానికి రెండుసార్లు Space కీని నొక్కండి"</string>
     <string name="show_password" msgid="4837897357002495384">"పాస్‌వర్డ్‌లను చూపించు"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"మీరు టైప్ చేస్తున్నప్పుడు అక్షరాలను క్లుప్తంగా చూపిస్తుంది"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ఈ అక్షరక్రమ తనిఖీ మీరు టైప్ చేసే మొత్తం వచనాన్ని అలాగే పాస్‌వర్డ్‌లు మరియు క్రెడిట్ కార్డు నంబర్‌ల వంటి వ్యక్తిగత డేటాను సేకరించగలదు. ఇది యాప్ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>లో అందించబడుతుంది. ఈ అక్షరక్రమ తనిఖీని ఉపయోగించాలా?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"ఈ స్పెల్ చెకర్ మీరు టైప్ చేసే మొత్తం వచనాన్ని అలాగే పాస్‌వర్డ్‌లు మరియు క్రెడిట్ కార్డు నంబర్‌ల వంటి వ్యక్తిగత డేటాను సేకరించగలదు. ఇది యాప్ <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>లో అందించబడుతుంది. ఈ స్పెల్ చెకర్‌ను ఉపయోగించాలా?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"సెట్టింగ్‌లు"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"భాష"</string>
     <string name="keyboard_and_input_methods_category" msgid="6035224122054465137">"కీబోర్డ్ &amp; ఇన్‌పుట్‌లు"</string>
@@ -1706,10 +1758,10 @@
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"తక్కువ ఎంపికలు"</string>
     <string name="user_dict_settings_add_dialog_confirm" msgid="6225823625332416144">"సరే"</string>
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"పదం:"</string>
-    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"సత్వరమార్గం:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"షార్ట్‌కట్:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"భాష:"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"పదాన్ని టైప్ చేయండి"</string>
-    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ఐచ్ఛిక సత్వరమార్గం"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ఐచ్ఛిక షార్ట్‌కట్"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"పదాన్ని సవరించు"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"సవరించు"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"తొలగించు"</string>
@@ -1737,8 +1789,8 @@
     <string name="gadget_picker_title" msgid="98374951396755811">"గాడ్జెట్‌ను ఎంచుకోండి"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"విడ్జెట్‌ను ఎంచుకోండి"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"విడ్జెట్‌ను సృష్టించి ప్రాప్యతను అనుమతించాలా?"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"మీరు విడ్జెట్‌ను సృష్టించిన తర్వాత, ఇది ప్రదర్శించే మొత్తం డేటాను <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> ప్రాప్యత చేయవచ్చు."</string>
-    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"విడ్జెట్‌లను సృష్టించి, వాటి డేటాను ప్రాప్యత చేయడానికి <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>ని ఎల్లప్పుడూ అనుమతించండి"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"మీరు విడ్జెట్‌ను సృష్టించిన తర్వాత, ఇది ప్రదర్శించే మొత్తం డేటాను <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> యాక్సెస్ చేయవచ్చు."</string>
+    <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"విడ్జెట్‌లను సృష్టించి, వాటి డేటాను యాక్సెస్ చేయడానికి <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g>ని ఎల్లప్పుడూ అనుమతించండి"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g>రో <xliff:g id="HOURS">%2$d</xliff:g>గం <xliff:g id="MINUTES">%3$d</xliff:g>ని <xliff:g id="SECONDS">%4$d</xliff:g>సె"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g>గం <xliff:g id="MINUTES">%2$d</xliff:g>ని <xliff:g id="SECONDS">%3$d</xliff:g>సె"</string>
     <string name="battery_history_minutes" msgid="1467775596084148610">"<xliff:g id="MINUTES">%1$d</xliff:g>ని <xliff:g id="SECONDS">%2$d</xliff:g>సె"</string>
@@ -1752,11 +1804,12 @@
     <string name="app_name_label" msgid="5440362857006046193">"యాప్"</string>
     <string name="last_time_used_label" msgid="8459441968795479307">"చివరిగా ఉపయోగించినది"</string>
     <string name="usage_time_label" msgid="295954901452833058">"వినియోగ సమయం"</string>
-    <string name="accessibility_settings" msgid="3975902491934816215">"ప్రాప్యత సామర్థ్యం"</string>
-    <string name="accessibility_settings_title" msgid="2130492524656204459">"ప్రాప్యత సామర్థ్య సెట్టింగ్‌లు"</string>
+    <string name="accessibility_settings" msgid="3975902491934816215">"యాక్సెస్ సామర్థ్యం"</string>
+    <string name="accessibility_settings_title" msgid="2130492524656204459">"యాక్సెస్ సామర్థ్య సెట్టింగ్‌లు"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"స్క్రీన్ రీడర్‌లు, ప్రదర్శన, పరస్పర చర్య నియంత్రణలు"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"దృశ్యత సెట్టింగ్‌లు"</string>
-    <string name="vision_settings_description" msgid="5679491180156408260">"మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ ప్రాప్యత లక్షణాలను సెట్టింగ్‌ల్లో తర్వాత మార్చవచ్చు."</string>
+    <string name="vision_settings_description" msgid="5679491180156408260">"మీరు మీ అవసరాలకు అనుగుణంగా ఈ పరికరాన్ని అనుకూలీకరించవచ్చు. ఈ యాక్సెస్ పీచర్లను సెట్టింగ్‌ల్లో తర్వాత మార్చవచ్చు."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"ఫాంట్ పరిమాణాన్ని పెంచండి"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"స్క్రీన్ రీడర్‌లు"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"ఆడియో &amp; స్క్రీన్‌పై ఉన్న వచనం"</string>
     <string name="display_category_title" msgid="685461049938269166">"డిస్‌ప్లే"</string>
@@ -1775,12 +1828,12 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"జూమ్ చేయడానికి 3 సార్లు నొక్కండి"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"జూమ్ చేయడం కోసం బటన్‌ని నొక్కండి"</string>
     <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"జూమ్ చేయాలంటే"</b>", స్క్రీన్‌పై 3 సార్లు వెంటవెంటనే నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్‌ని సర్దుబాటు చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లను స్క్రీన్‌పై ఉంచి ఆ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయాలంటే"</b>", స్క్రీన్‌పై 3 సార్లు వెంటవెంటనే నొక్కి, మూడవసారి మీ వేలిని అలాగే పైకెత్తకుండా ఉంచండి.\n"<ul><li>"స్క్రీన్‌ని కదిలించడానికి దానిని ఎటువైపు కావాలంటే అటువైపు లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయాలంటే వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్ లేదా నావిగేషన్ పట్టీలో మీరు దగ్గరకు జూమ్ చేయలేరు."</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"మాగ్నిఫికేషన్ ఆన్ చేయబడినప్పుడు, స్క్రీన్ దిగువన ఉన్న ప్రాప్యత బటన్‌ని ఉపయోగించి త్వరగా మాగ్నిఫై చేయండి.\n\n"<b>"జూమ్ చేయాలంటే"</b>", ప్రాప్యత బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌లో ఎక్కడైనా నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్‌ని సర్దుబాటు చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లను స్క్రీన్‌పై ఉంచి ఆ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయాలంటే"</b>", ప్రాప్యత బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌పై ఎక్కడైనా తాకి, ఉంచండి.\n"<ul><li>"స్క్రీన్‌ని కదిలించడానికి దానిని ఎటువైపు కావాలంటే అటువైపు లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయాలంటే వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్ లేదా నావిగేషన్ పట్టీలో మీరు దగ్గరకు జూమ్ చేయలేరు."</string>
-    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"ప్రాప్యత బటన్ <xliff:g id="SERVICE">%1$s</xliff:g>కు సెట్ చేయబడింది. మాగ్నిఫికేషన్‌ని ఉపయోగించాలంటే, ప్రాప్యత బటన్‌ని తాకి, ఉంచి, ఆపై మాగ్నిఫికేషన్‌ని ఎంచుకోండి."</string>
-    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ప్రాప్యత సత్వరమార్గం"</string>
-    <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"సత్వరమార్గం సేవ"</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="1996584694050087161">"మాగ్నిఫికేషన్ ఆన్ చేయబడినప్పుడు, స్క్రీన్ దిగువన ఉన్న యాక్సెస్ సామర్థ్య బటన్‌ని ఉపయోగించి త్వరగా మాగ్నిఫై చేయండి.\n\n"<b>"జూమ్ చేయాలంటే"</b>", యాక్సెస్ సామర్థ్య బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌లో ఎక్కడైనా నొక్కండి.\n"<ul><li>"స్క్రోల్ చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లతో లాగండి"</li>\n<li>"జూమ్‌ని సర్దుబాటు చేయాలంటే 2 లేదా అంతకంటే ఎక్కువ వేళ్లను స్క్రీన్‌పై ఉంచి ఆ వేళ్లను దగ్గరకు లేదా దూరానికి లాగండి"</li></ul>\n\n<b>"తాత్కాలికంగా జూమ్ చేయాలంటే"</b>", యాక్సెస్ సామర్థ్య బటన్‌ని నొక్కిన తర్వాత స్క్రీన్‌పై ఎక్కడైనా తాకి, ఉంచండి.\n"<ul><li>"స్క్రీన్‌ని కదిలించడానికి దానిని ఎటువైపు కావాలంటే అటువైపు లాగండి"</li>\n<li>"దూరంగా జూమ్ చేయాలంటే వేలిని పైకి ఎత్తండి"</li></ul>\n\n"కీబోర్డ్ లేదా నావిగేషన్ పట్టీలో మీరు దగ్గరకు జూమ్ చేయలేరు."</string>
+    <string name="accessibility_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"యాక్సెస్ సామర్థ్య బటన్ <xliff:g id="SERVICE">%1$s</xliff:g>కు సెట్ చేయబడింది. మాగ్నిఫికేషన్‌ని ఉపయోగించాలంటే, యాక్సెస్ సామర్ధ్య బటన్‌ని తాకి, ఉంచి, ఆపై మాగ్నిఫికేషన్‌ని ఎంచుకోండి."</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"యాక్సెస్ సామర్థ్య షార్ట్‌కట్"</string>
+    <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"షార్ట్‌కట్ సేవ"</string>
     <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"లాక్ స్క్రీన్ నుండి అనుమతించండి"</string>
-    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"సత్వరమార్గం ప్రారంభించబడినప్పుడు, మీరు వాల్యూమ్ బటన్‌లు రెండింటినీ 3 సెకన్లు నొక్కి ఉంచడం ద్వారా ప్రాప్యత లక్షణాన్ని ప్రారంభించవచ్చు."</string>
+    <string name="accessibility_shortcut_description" msgid="6488524140219209763">"షార్ట్‌కట్ ప్రారంభించబడినప్పుడు, మీరు వాల్యూమ్ బటన్‌లు రెండింటినీ 3 సెకన్లు నొక్కి ఉంచడం ద్వారా యాక్సెస్‌ ఫీచర్‌ను ప్రారంభించవచ్చు."</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"అధిక కాంట్రాస్ట్ వచనం"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"స్క్రీన్ వర్ధనాన్ని స్వయంచాలకంగా నవీకరించండి"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"అనువర్తన పరివర్తనాల్లో స్క్రీన్ వర్ధనాన్ని నవీకరించండి"</string>
@@ -1855,10 +1908,10 @@
     <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ఇవి చేయాల్సి ఉంటుంది:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"అనుమతి అభ్యర్థనకు ఒక యాప్ అడ్డు తగులుతున్నందున సెట్టింగ్‌లు మీ ప్రతిస్పందనను ధృవీకరించలేకపోయాయి."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"మీరు <xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్ చేస్తే, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
-    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"మీరు ప్రాప్యత సేవను ఆన్ చేసినందున, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ నమూనాను నిర్ధారించడం అవసరం."</string>
-    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ పిన్‌ను నిర్ధారించడం అవసరం."</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ పాస్‌వర్డ్‌ను నిర్ధారించడం అవసరం."</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"మీరు యాక్సెస్ సేవను ఆన్ చేసినందున, డేటా గుప్తీకరణను మెరుగుపరచడానికి మీ పరికరం మీ స్క్రీన్ లాక్‌ను ఉపయోగించదు."</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ నమూనాను నిర్ధారించడం అవసరం."</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ పిన్‌ను నిర్ధారించడం అవసరం."</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా ఎన్‌క్రిప్షన్ ప్రభావితమవుతుంది, కనుక మీరు మీ పాస్‌వర్డ్‌ను నిర్ధారించడం అవసరం."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"మీ చర్యలను గమనిస్తుంది"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"మీరు అనువర్తనంతో పరస్పర చర్య చేస్తున్నప్పుడు నోటిఫికేషన్‌లను స్వీకరిస్తుంది."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>ను ఆపివేయాలా?"</string>
@@ -1873,6 +1926,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>
@@ -1882,7 +1939,7 @@
     <string name="print_feature_state_off" msgid="7294876968403966040">"ఆఫ్‌లో ఉంది"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"సేవను జోడించు"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ప్రింటర్‌ను జోడించు"</string>
-    <string name="print_menu_item_search" msgid="7025589328240514553">"శోధించు"</string>
+    <string name="print_menu_item_search" msgid="7025589328240514553">"వెతుకు"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"ప్రింటర్‌ల కోసం శోధిస్తోంది"</string>
     <string name="print_service_disabled" msgid="7739452396114245222">"సేవ నిలిపివేయబడింది"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"ముద్రణ జాబ్‌లు"</string>
@@ -1892,7 +1949,7 @@
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ముద్రించబడుతోంది"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ను రద్దు చేస్తోంది"</string>
-    <string name="print_failed_state_title_template" msgid="1436099128973357969">"ప్రింటర్ లోపం <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="print_failed_state_title_template" msgid="1436099128973357969">"ప్రింటర్ ఎర్రర్ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_blocked_state_title_template" msgid="9065391617425962424">"ప్రింటర్ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> బ్లాక్ చేయబడింది"</string>
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"శోధన పెట్టె చూపబడింది"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"శోధన పెట్టె దాచబడింది"</string>
@@ -1912,7 +1969,7 @@
     <string name="device_screen_consumption" msgid="4607589286438986687">"స్క్రీన్ ఉపయోగం"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"మొబైల్ నెట్‌వర్క్ స్కానింగ్"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> క్రితం"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"పూర్తిగా ఛార్జ్ చేసిన (<xliff:g id="TIME">^1</xliff:g> క్రితం) తర్వాత అనువర్తన వినియోగం"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"పూర్తిగా ఛార్జ్ చేసిన (<xliff:g id="TIME">^1</xliff:g> క్రితం) తర్వాత యాప్ వినియోగం"</string>
     <string name="power_usage_list_summary_device" msgid="7036566616386864302">"పూర్తిగా ఛార్జ్ చేసిన (<xliff:g id="TIME">^1</xliff:g> క్రితం) తర్వాత పరికర వినియోగం"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి స్క్రీన్ ఆన్‌లో ఉన్న మొత్తం సమయం"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి పరికర వినియోగం"</string>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> మీ పరికరాన్ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> మీ పరికరాన్ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"యాప్‌ని ఆపివేయి"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"నేపథ్య వినియోగాన్ని ఆఫ్ చేసి, అనువర్తనాన్ని ఆపివేయాలా?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> మీ ఫోన్‌ను సక్రియంగా ఉంచుతుంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించాలంటే, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేసి, దానిని నేపథ్యంలో అమలు కాకుండా నిరోధించవచ్చు."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> మీ టాబ్లెట్‌ను సక్రియంగా ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించాలంటే, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేసి, దానిని నేపథ్యంలో అమలు కాకుండా నిరోధించవచ్చు."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> మీ పరికరాన్ని సక్రియంగా ఉంచుతుంది, కనుక బ్యాటరీని మీ పరికరం సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించాలంటే, మీరు <xliff:g id="APP_1">%1$s</xliff:g>ని ఆపివేసి, దానిని నేపథ్యంలో అమలు కాకుండా నిరోధించవచ్చు."</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="7774807745601479888">"మీరు అనువర్తనాన్ని ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ అనువర్తనానికి మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"మీరు అనువర్తనాన్ని ఉపయోగించని సమయంలో కూడా <xliff:g id="APP">%1$s</xliff:g> మీ స్థానాన్ని అభ్యర్థిస్తోంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించడం కోసం, ఈ అనువర్తనానికి మీరు స్థానాన్ని ఆఫ్ చేయవచ్చు."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"మీరు అనువర్తనాన్ని ఉపయోగించని సమయంలో కూడా <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>
@@ -1950,10 +2030,10 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ఫోన్ నిష్క్రియం"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"నానావిధమైనవి"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"అధిక గణన"</string>
-    <string name="power_apps" msgid="2043554781293951327">"అనువర్తనాలు"</string>
+    <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>
@@ -1976,7 +2056,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"లెక్కించిన శక్తి వినియోగం"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"సంగ్రహించిన శక్తి వినియోగం"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"ఫోర్స్ స్టాప్"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"అనువర్తన సమాచారం"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"యాప్ సమాచారం"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"అనువర్తన సెట్టింగ్‌లు"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"స్క్రీన్ సెట్టింగ్‌లు"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Wi‑Fi సెట్టింగ్‌లు"</string>
@@ -1985,7 +2065,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"టాబ్లెట్ నిష్క్రియంగా ఉన్నప్పుడు వినియోగించబడిన బ్యాటరీ"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ఫోన్ నిష్క్రియంగా ఉన్నప్పుడు వినియోగించబడిన బ్యాటరీ"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"సెల్ రేడియో ద్వారా వినియోగించబడిన బ్యాటరీ"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"సెల్ కవరేజ్ లేని ప్రాంతాల్లో విద్యుత్ శక్తిని ఆదా చేయడానికి ఎయిర్‌ప్లైన్ మోడ్‌కు మార్చండి"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"సెల్ కవరేజ్ లేని ప్రాంతాల్లో విద్యుత్ శక్తిని ఆదా చేయడానికి ఎయిర్‌ప్లేన్ మోడ్‌కు మార్చండి"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"ఫ్లాష్‌లైట్ ద్వారా వినియోగించబడే బ్యాటరీ"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"కెమెరా వినియోగించిన బ్యాటరీ"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"డిస్‌ప్లే మరియు బ్యాక్‌లైట్ ద్వారా వినియోగించబడిన బ్యాటరీ"</string>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"చివరిసారి పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి వినియోగ వివరాలు"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"చివరిసారిగా పూర్తిగా ఛార్జ్ చేసిన సమయం"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"మిగిలి ఉన్న బ్యాటరీ సమయం కేవలం అంచనా సమాచారమే, వినియోగాన్ని బట్టి మారవచ్చు"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"బ్యాటరీ వినియోగ డేటా ఇంచుమించుగా ఉంటుంది మరియు వినియోగం ఆధారంగా మారుతుంటుంది"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"క్రియాశీల ఉపయోగంలో ఉన్నప్పుడు"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"నేపథ్యంలో ఉన్నప్పుడు"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"బ్యాటరీ వినియోగం"</string>
@@ -2143,7 +2224,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"ఆధారాల నిల్వను ఎరేజ్ చేయడం సాధ్యపడలేదు."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"ఆధారాల నిల్వ ప్రారంభించబడింది."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"మీరు ఆధారాల నిల్వను ఉపయోగించడానికి ముందు లాక్ స్క్రీన్ పిన్‌ లేదా పాస్‌వర్డ్‌ను సెట్ చేయాల్సి ఉంటుంది."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"వినియోగ ప్రాప్యత గల అనువర్తనాలు"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"వినియోగ యాక్సెస్ గల యాప్‌లు"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"అత్యవసర టోన్"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"అత్యవసర కాల్ వచ్చినప్పుడు చేయాల్సిన విధిని సెట్ చేయండి"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"బ్యాకప్"</string>
@@ -2166,7 +2247,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"ఈ పరికర నిర్వాహకుల అనువర్తనాన్ని నిష్క్రియం చేయి"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"అనువర్తనాన్ని అన్‌ఇన్‌స్టాల్ చేయి"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"నిష్క్రియం చేసి, అన్ఇన్‌స్టాల్ చేయి"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"పరికర నిర్వాహకుల అనువర్తనాలు"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"పరికర నిర్వాహకుల యాప్‌లు"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"పరికర నిర్వాహకుల అనువర్తనాలు అందుబాటులో లేవు"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"వ్యక్తిగతం"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"కార్యాలయం"</string>
@@ -2194,7 +2275,7 @@
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"నెట్‌వర్క్‌ను జోడించు"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"జాబితాను రిఫ్రెష్ చేయి"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"దాటవేయి"</string>
-    <string name="wifi_setup_next" msgid="3388694784447820477">"తదుపరి"</string>
+    <string name="wifi_setup_next" msgid="3388694784447820477">"తర్వాత"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"వెనుకకు"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"నెట్‌వర్క్ వివరాలు"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"కనెక్ట్ చేయి"</string>
@@ -2208,15 +2289,15 @@
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"నెట్‌వర్క్ కాన్ఫిగరేషన్‌ను టైప్ చేయండి"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"కొత్త నెట్‌వర్క్‌కు కనెక్ట్ చేయండి"</string>
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"కనెక్ట్ చేస్తోంది..."</string>
-    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"తదుపరి దశకు వెళ్లండి"</string>
+    <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"తర్వాత దశకు వెళ్లండి"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAPకి మద్దతు లేదు."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"మీరు సెటప్ సమయంలో EAP Wi‑Fi కనెక్షన్‌ను కాన్ఫిగర్ చేయలేరు. సెటప్ చేసిన తర్వాత, మీరు దీన్ని సెట్టింగ్‌లు &gt; వైర్‌లెస్ &amp; నెట్‌వర్క్‌ల్లో కాన్ఫిగర్ చేయవచ్చు."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"కనెక్ట్ చేయడానికి కొన్ని నిమిషాలు పట్టవచ్చు…"</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"సెటప్‌ను కొనసాగించడానికి "<b>"తదుపరి"</b>" నొక్కండి.\n\nవేరే Wi‑Fi నెట్‌వర్క్‌కు కనెక్ట్ చేయడానికి "<b>"వెనుకకు"</b>" నొక్కండి."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"సెటప్‌ను కొనసాగించడానికి "<b>"తర్వాత"</b>" నొక్కండి.\n\nవేరే Wi‑Fi నెట్‌వర్క్‌కు కనెక్ట్ చేయడానికి "<b>"వెనుకకు"</b>" నొక్కండి."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"సమకాలీకరణ ప్రారంభించబడింది"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"సమకాలీకరణ నిలిపివేయబడింది"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ఇప్పుడు సమకాలీకరిస్తోంది"</string>
-    <string name="accessibility_sync_error" msgid="8703299118794272041">"సమకాలీకరణ లోపం."</string>
+    <string name="accessibility_sync_error" msgid="8703299118794272041">"సమకాలీకరణ ఎర్రర్."</string>
     <string name="sync_failed" msgid="1696499856374109647">"సమకాలీకరణ విఫలమైంది"</string>
     <string name="sync_active" msgid="8476943765960863040">"సమకాలీకరణ సక్రియంగా ఉంది"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"సమకాలీకరణ"</string>
@@ -2229,11 +2310,11 @@
     <string name="background_data" msgid="5779592891375473817">"నేపథ్య డేటా"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"అనువర్తనాలు ఏ సమయంలోనైనా డేటాను సమకాలీకరించవచ్చు, పంపవచ్చు మరియు స్వీకరించవచ్చు"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"నేపథ్య డేటాను నిలిపివేయాలా?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"నేపథ్య డేటాను నిలిపివేయడం వలన బ్యాటరీ జీవితకాలం పెరుగుతుంది మరియు డేటా వినియోగం తగ్గుతుంది. కొన్ని అనువర్తనాలు అప్పటికీ నేపథ్య డేటా కనెక్షన్‌ను ఉపయోగించవచ్చు."</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"నేపథ్య డేటాను నిలిపివేయడం వలన బ్యాటరీ జీవితకాలం పెరుగుతుంది మరియు డేటా వినియోగం తగ్గుతుంది. కొన్ని యాప్‌లు అప్పటికీ నేపథ్య డేటా కనెక్షన్‌ను ఉపయోగించవచ్చు."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"అనువర్తన డేటాను స్వయంచాలకంగా సమకాలీకరించు"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"సమకాలీకరణ ఆన్‌లో ఉంది"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"సమకాలీకరణ ఆఫ్‌లో ఉంది"</string>
-    <string name="sync_error" msgid="5060969083117872149">"సమకాలీకరణ లోపం"</string>
+    <string name="sync_error" msgid="5060969083117872149">"సమకాలీకరణ ఎర్రర్"</string>
     <string name="last_synced" msgid="4242919465367022234">"చివరిగా సమకాలీకరించినది <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"ఇప్పుడు సమకాలీకరిస్తోంది…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"బ్యాకప్ సెట్టింగ్‌లు"</string>
@@ -2278,14 +2359,14 @@
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>లో <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"అన్నీ ఎంచుకోండి"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"డేటా వినియోగం"</string>
-    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"అనువర్తన డేటా వినియోగం"</string>
+    <string name="data_usage_app_summary_title" msgid="4147258989837459172">"యాప్ డేటా వినియోగం"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"క్యారియర్ డేటా అకౌంటింగ్ మీ పరికరాన్ని బట్టి మారుతుంది."</string>
-    <string name="data_usage_app" msgid="4970478397515423303">"అనువర్తన వినియోగం"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"అనువర్తన సమాచారం"</string>
+    <string name="data_usage_app" msgid="4970478397515423303">"యాప్‌ వినియోగం"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"యాప్ సమాచారం"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"మొబైల్ డేటా"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"డేటా పరిమితిని సెట్ చేయి"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"డేటా వినియోగ సైకిల్"</string>
-    <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"అనువర్తన వినియోగం"</string>
+    <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"యాప్‌ వినియోగం"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"డేటా రోమింగ్"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"నేపథ్య డేటాను పరిమితం చేయి"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"నేపథ్య డేటాను అనుమతించు"</string>
@@ -2336,7 +2417,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"వెబ్‌లో మీ ఖాతాలకు ఏవైనా మార్పులు చేస్తే అవి స్వయంచాలకంగా మీ టాబ్లెట్‌కి కాపీ చేయబడతాయి.\n\nకొన్ని ఖాతాలు మీరు టాబ్లెట్‌లో ఏవైనా మార్పులు చేస్తే కూడా వాటిని స్వయంచాలకంగా వెబ్‌కి కాపీ చేస్తాయి. Google ఖాతా ఈ విధంగానే పనిచేస్తుంది."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"వెబ్‌లో మీ ఖాతాలకు మీరు ఏవైనా మార్పులు చేస్తే అవి స్వయంచాలకంగా మీ ఫోన్‌కి కాపీ చేయబడతాయి.\n\nకొన్ని ఖాతాలు మీరు ఫోన్‌లో ఏవైనా మార్పులు చేస్తే కూడా స్వయంచాలకంగా వాటిని వెబ్‌కి కాపీ చేస్తాయి. Google ఖాతా ఈ విధంగానే పనిచేస్తుంది."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"స్వీయ-సమకాలీకరణ డేటాను ఆపివేయాలా?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ఇది డేటా మరియు బ్యాటరీ వినియోగాన్ని ఆదా చేస్తుంది, కానీ మీరు ఇటీవలి సమాచారాన్ని సేకరించడానికి మాన్యువల్‌గా ప్రతి ఖాతాను సమకాలీకరించాల్సి ఉంటుంది. అలాగే మీరు నవీకరణలు జరిగినప్పుడు నోటిఫికేషన్‌లను స్వీకరించరు."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"ఇది డేటా మరియు బ్యాటరీ వినియోగాన్ని ఆదా చేస్తుంది, కానీ మీరు ఇటీవలి సమాచారాన్ని సేకరించడానికి మాన్యువల్‌గా ప్రతి ఖాతాను సమకాలీకరించాల్సి ఉంటుంది. అలాగే మీరు అప్‌డేట్‌లు జరిగినప్పుడు నోటిఫికేషన్‌లను స్వీకరించరు."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"వినియోగ సైకిల్ రీసెట్ తేదీ"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"ప్రతి నెలలో ఈ తేదీన:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"సెట్ చేయి"</string>
@@ -2356,7 +2437,7 @@
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> స్వీకరించబడింది, <xliff:g id="SENT">%2$s</xliff:g> పంపబడింది"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: సుమారు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది."</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: మీ టాబ్లెట్ గణించినట్లుగా దాదాపు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది. మీ క్యారియర్ డేటా వినియోగం భిన్నంగా లెక్కించబడవచ్చు."</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: సుమారు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది, మీ ఫోన్ ద్వారా లెక్కించబడింది. మీ క్యారియర్ డేటా వినియోగం భిన్నంగా లెక్కించబడవచ్చు."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g> సుమారు <xliff:g id="TOTAL">%1$s</xliff:g> ఉపయోగించబడింది, మీ ఫోన్ ద్వారా లెక్కించబడింది. మీ క్యారియర్ డేటా వినియోగం భిన్నంగా లెక్కించబడవచ్చు."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"నెట్‌వర్క్ పరిమితులు"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"నేపథ్య డేటా పరిమితం చేయబడినప్పుడు గణించబడే నెట్‌వర్క్‌లు మొబైల్ నెట్‌వర్క్‌ల వలె పరిగణించబడతాయి. అనువర్తనాలు ఎక్కువ పరిమాణ డౌన్‌లోడ్‌ల కోసం ఈ నెట్‌వర్క్‌లను ఉపయోగించడానికి ముందు మిమ్మల్ని హెచ్చరించవచ్చు."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"మొబైల్ నెట్‌వర్క్‌లు"</string>
@@ -2368,13 +2449,13 @@
     <string name="vpn_name" msgid="4689699885361002297">"పేరు"</string>
     <string name="vpn_type" msgid="5435733139514388070">"రకం"</string>
     <string name="vpn_server" msgid="2123096727287421913">"సర్వర్ చిరునామా"</string>
-    <string name="vpn_mppe" msgid="6639001940500288972">"PPP గుప్తీకరణ (MPPE)"</string>
+    <string name="vpn_mppe" msgid="6639001940500288972">"PPP ఎన్‌క్రిప్షన్ (MPPE)"</string>
     <string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP రహస్యం"</string>
     <string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec ఐడెంటిఫైయర్"</string>
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec పూర్వ-భాగస్వామ్య కీ"</string>
-    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec వినియోగదారు ప్రమాణపత్రం"</string>
-    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA ప్రమాణపత్రం"</string>
-    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec సర్వర్ ప్రమాణపత్రం"</string>
+    <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec వినియోగదారు సర్టిఫికెట్"</string>
+    <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA సర్టిఫికెట్"</string>
+    <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec సర్వర్ సర్టిఫికెట్"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"అధునాతన ఎంపికలను చూపు"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS శోధన డొమైన్‌లు"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS సర్వర్‌లు (ఉదా. 8.8.8.8)"</string>
@@ -2400,7 +2481,7 @@
     <string name="vpn_connect_to" msgid="5965299358485793260">"<xliff:g id="PROFILE">%s</xliff:g>కి కనెక్ట్ చేయండి"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"ఈ VPNను డిస్‌కనెక్ట్ చేయాలా?"</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"డిస్‌కనెక్ట్ చేయి"</string>
-    <string name="vpn_version" msgid="1939804054179766249">"సంస్కరణ <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="vpn_version" msgid="1939804054179766249">"వెర్షన్ <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_forget_long" msgid="2232239391189465752">"VPNని విస్మరించు"</string>
     <string name="vpn_replace_vpn_title" msgid="2963898301277610248">"ఇప్పటికే ఉన్న VPNని భర్తీ చేయాలా?"</string>
     <string name="vpn_set_vpn_title" msgid="4009987321156037267">"ఎల్లప్పుడూ ఆన్‌లో ఉండే VPNని సెట్ చేయాలా?"</string>
@@ -2428,7 +2509,7 @@
     <string name="vpn_no_network" msgid="3050233675132726155">"నెట్‌వర్క్ కనెక్షన్ లేదు. దయచేసి తర్వాత మళ్లీ ప్రయత్నించండి."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"VPN నుండి డిస్‌కనెక్ట్ చేయబడింది"</string>
     <string name="vpn_disconnected_summary" msgid="3082851661207900606">"దేనికీ కనెక్ట్ కాలేదు"</string>
-    <string name="vpn_missing_cert" msgid="5357192202207234745">"ఒక ప్రమాణపత్రం లేదు. ప్రొఫైల్‌ని సవరించడానికి ప్రయత్నించండి."</string>
+    <string name="vpn_missing_cert" msgid="5357192202207234745">"ఒక సర్టిఫికెట్ లేదు. ప్రొఫైల్‌ని సవరించడానికి ప్రయత్నించండి."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"సిస్టమ్"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"వినియోగదారు"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"నిలిపివేయి"</string>
@@ -2440,8 +2521,8 @@
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"వినియోగదారు CA ప్రమాణపత్రాన్ని శాశ్వతంగా తీసివేయాలా?"</string>
     <string name="credential_contains" msgid="3984922924723974084">"ఈ నమోదులో ఇవి ఉంటాయి:"</string>
     <string name="one_userkey" msgid="6034020579534914349">"ఒక వినియోగదారు కీ"</string>
-    <string name="one_usercrt" msgid="2150319011101639509">"ఒక వినియోగదారు ప్రమాణపత్రం"</string>
-    <string name="one_cacrt" msgid="6844397037970164809">"ఒక CA ప్రమాణపత్రం"</string>
+    <string name="one_usercrt" msgid="2150319011101639509">"ఒక వినియోగదారు సర్టిఫికెట్"</string>
+    <string name="one_cacrt" msgid="6844397037970164809">"ఒక CA సర్టిఫికెట్"</string>
     <string name="n_cacrts" msgid="5979300323482053820">"%d CA ప్రమాణపత్రాలు"</string>
     <string name="user_credential_title" msgid="1954061209643070652">"ఆధార వివరాలు"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"తీసివేయబడిన ఆధారం: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
@@ -2452,7 +2533,7 @@
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"మీ కొత్త పూర్తి బ్యాకప్ పాస్‌వర్డ్‌ను ఇక్కడ మళ్లీ టైప్ చేయండి"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"బ్యాకప్ పాస్‌వర్డ్‌ను సెట్ చేయి"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"రద్దు చేయి"</string>
-    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"అదనపు సిస్టమ్ నవీకరణలు"</string>
+    <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"అదనపు సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"నిలిపివేయబడింది"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"అనుమోదక అంశము"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"అమలు చేయడం"</string>
@@ -2463,12 +2544,12 @@
       <item quantity="one">ప్రమాణపత్రాన్ని విశ్వసించండి లేదా తీసివేయండి</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> మీ పరికరంలో ప్రమాణపత్ర అధికారాలను ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, అనువర్తనాలు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా మీ పరికర నెట్‌వర్క్ కార్యాచరణను పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ ప్రమాణపత్రాల గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> మీ పరికరంలో ప్రమాణపత్ర అధికారాన్ని ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, అనువర్తనాలు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా మీ పరికర నెట్‌వర్క్ కార్యాచరణను పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ ప్రమాణపత్రం గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> మీ పరికరంలో సర్టిఫికెట్ అధికారాలను ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, యాప్‌లు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా మీ పరికర నెట్‌వర్క్ కార్యకలాపాన్ని పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ సర్టిఫికెట్ల గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> మీ పరికరంలో సర్టిఫికెట్ అధికారాన్ని ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, యాప్‌లు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా మీ పరికర నెట్‌వర్క్ కార్యకలాపాన్ని పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ సర్టిఫికెట్ గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> మీ కార్యాలయ ప్రొఫైల్ కోసం ప్రమాణపత్ర అధికారాలను ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, అనువర్తనాలు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా కార్యాలయ నెట్‌వర్క్ కార్యాచరణను పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ ప్రమాణపత్రాల గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> మీ కార్యాలయ ప్రొఫైల్ కోసం ప్రమాణపత్ర అధికారాన్ని ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, అనువర్తనాలు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా కార్యాలయ నెట్‌వర్క్ కార్యాచరణను పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ ప్రమాణపత్రం గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> మీ కార్యాలయ ప్రొఫైల్ కోసం సర్టిఫికెట్ అధికారాలను ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, యాప్‌లు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా కార్యాలయ నెట్‌వర్క్ కార్యకలాపాన్ని పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ సర్టిఫికెట్ల గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> మీ కార్యాలయ ప్రొఫైల్ కోసం సర్టిఫికెట్ అధికారాన్ని ఇన్‌స్టాల్ చేసింది, దీని వల్ల వారు ఇమెయిల్‌లు, యాప్‌లు మరియు సురక్షితమైన వెబ్‌సైట్‌లతో సహా కార్యాలయ నెట్‌వర్క్ కార్యకలాపాన్ని పర్యవేక్షించడానికి అనుమతించబడవచ్చు.\n\nఈ సర్టిఫికెట్ గురించి మరింత సమాచారం కోసం, మీ నిర్వాహకులను సంప్రదించండి.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"మూడవ పక్షం ఇమెయిల్‌లు, అనువర్తనాలు మరియు సురక్షిత వెబ్‌సైట్‌లతో సహా మీ నెట్‌వర్క్ కార్యాచరణను పర్యవేక్షించగలిగే సామర్థ్యాన్ని కలిగి ఉంటారు.\n\nమీ పరికరంలో ఇన్‌స్టాల్ చేయబడిన విశ్వసనీయ ఆధారాల వలన ఇది సాధ్యపడుతుంది."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
@@ -2495,7 +2576,7 @@
     <string name="user_add_user_item_title" msgid="8212199632466198969">"వినియోగదారు"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"పరిమితం చేయబడిన ప్రొఫైల్"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"కొత్త వినియోగదారుని జోడించాలా?"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"మీరు అదనపు వినియోగదారులను సృష్టించడం ద్వారా ఈ పరికరాన్ని ఇతర వ్యక్తులు కూడా ఉపయోగించుకునే సదుపాయం కల్పించవచ్చు. ప్రతి వినియోగదారుకు వారికంటూ ప్రత్యేక స్థలం ఉంటుంది, వారు ఆ స్థలాన్ని అనువర్తనాలు, వాల్‌పేపర్ మొదలైనవాటితో అనుకూలీకరించవచ్చు. వినియోగదారులు ప్రతి ఒక్కరిపై ప్రభావం చూపే Wi‑Fi వంటి పరికర సెట్టింగ్‌లను కూడా సర్దుబాటు చేయవచ్చు.\n\nమీరు కొత్త వినియోగదారును జోడించినప్పుడు, ఆ వ్యక్తి వారికంటూ స్వంత స్థలం సెట్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగిలిన అందరు వినియోగదారుల కోసం అనువర్తనాలను నవీకరించవచ్చు."</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"మీరు అదనపు వినియోగదారులను సృష్టించడం ద్వారా ఈ పరికరాన్ని ఇతర వ్యక్తులు కూడా ఉపయోగించుకునే సదుపాయం కల్పించవచ్చు. ప్రతి వినియోగదారుకు వారికంటూ ప్రత్యేక స్థలం ఉంటుంది, వారు ఆ స్థలాన్ని యాప్‌లు, వాల్‌పేపర్ మొదలైనవాటితో అనుకూలీకరించవచ్చు. వినియోగదారులు ప్రతి ఒక్కరిపై ప్రభావం చూపే Wi‑Fi వంటి పరికర సెట్టింగ్‌లను కూడా సర్దుబాటు చేయవచ్చు.\n\nమీరు కొత్త వినియోగదారును జోడించినప్పుడు, ఆ వ్యక్తి వారికంటూ స్వంత స్థలం సెట్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగిలిన అందరు వినియోగదారుల కోసం యాప్‌లను అప్‌డేట్ చేయవచ్చు."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"మీరు కొత్త వినియోగదారుని జోడించినప్పుడు, ఆ వ్యక్తి తన స్థలాన్ని సెటప్ చేసుకోవాలి.\n\nఏ వినియోగదారు అయినా మిగతా అందరు వినియోగదారుల కోసం అనువర్తనాలను నవీకరించగలరు."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ఇప్పుడు వినియోగదారుని సెటప్ చేయాలా?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"పరికరాన్ని తీసుకోవడానికి వ్యక్తి అందుబాటులో ఉన్నారని నిర్ధారించుకొని, ఆపై వారికి స్థలాన్ని సెటప్ చేయండి"</string>
@@ -2523,7 +2604,7 @@
     <string name="user_delete_user_description" msgid="3158592592118767056">"వినియోగదారుని తొలగించండి"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"తొలగించు"</string>
     <string name="user_guest" msgid="8475274842845401871">"అతిథి"</string>
-    <string name="user_exit_guest_title" msgid="5613997155527410675">"అతిథిని తీసివేయి"</string>
+    <string name="user_exit_guest_title" msgid="5613997155527410675">"అతిథిని తీసివేయండి"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"అతిథిని తీసివేయాలా?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ఈ సెషన్‌లోని అన్ని అనువర్తనాలు మరియు డేటా తొలగించబడతాయి."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"తీసివేయి"</string>
@@ -2564,7 +2645,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>
@@ -2581,7 +2662,7 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"అత్యవసర ప్రసారాలు"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"నెట్‌వర్క్ ఆపరేటర్‌లు"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"ప్రాప్యత స్థానం పేర్లు"</string>
+    <string name="access_point_names" msgid="1381602020438634481">"యాక్సెస్ స్థానం పేర్లు"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"మెరుగుపరచబడిన 4G LTE మోడ్"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"వాయిస్ మరియు కమ్యూనికేషన్‌లను (సిఫార్సు చేయబడినవి) మెరుగుపరచడానికి LTE డేటాను ఉపయోగించండి"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"ప్రాధాన్య నెట్‌వర్క్ రకం"</string>
@@ -2604,7 +2685,7 @@
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"స్థానం"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"మీ స్థాన సమాచారాన్ని ఉపయోగించడానికి అనువర్తనాలను అనుమతించండి"</string>
     <string name="wizard_back" msgid="5567007959434765743">"వెనుకకు"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"తదుపరి"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"తర్వాత"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"ముగించు"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"ఫోటో తీయండి"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"గ్యాలరీ నుండి ఫోటోను ఎంచుకోండి"</string>
@@ -2640,7 +2721,7 @@
     <string name="sim_other_call_settings" msgid="8247802316114482477">"ఇతర కాల్ సెట్టింగ్‌లు"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"ఫ్రాధాన్య నెట్‌వర్క్ ఆఫ్‌లోడ్"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"నెట్‌వర్క్ పేరు ప్రసారాన్ని నిలిపివేయండి"</string>
-    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"మీ నెట్‌వర్క్ సమాచారానికి ప్రాప్యత పొందే మూడవ పార్టీల నుండి రక్షించబడే నెట్‌వర్క్ పేరు ప్రసారాన్ని నిలిపివేయండి."</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"మీ నెట్‌వర్క్ సమాచారానికి యాక్సెస్ పొందే మూడవ పార్టీల నుండి రక్షించబడే నెట్‌వర్క్ పేరు ప్రసారాన్ని నిలిపివేయండి."</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"నెట్‌వర్క్ పేరు ప్రసారం నిలిపివేయడం వలన దాచబడిన నెట్‌వర్క్‌లకు స్వయంచాలక కనెక్షన్ నిరోధించబడుతుంది."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM కార్డ్‌లు మార్చబడ్డాయి."</string>
@@ -2654,16 +2735,19 @@
       <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="app_and_notification_dashboard_title" msgid="7838365599185397539">"అనువర్తనాలు &amp; నోటిఫికేషన్‌లు"</string>
-    <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"అనుమతులు, డిఫాల్ట్ అనువర్తనాలు"</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>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"డిఫాల్ట్ అనువర్తనాలు"</string>
-    <string name="system_dashboard_summary" msgid="5797743225249766685">"భాషలు, సమయం, బ్యాకప్, నవీకరణలు"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"డిఫాల్ట్ యాప్‌లు"</string>
+    <string name="system_dashboard_summary" msgid="5797743225249766685">"భాషలు, సమయం, బ్యాకప్, అప్‌డేట్‌లు"</string>
     <string name="search_results_title" msgid="1796252422574886932">"సెట్టింగ్‌లు"</string>
-    <string name="search_menu" msgid="6283419262313758339">"సెట్టింగ్‌లను శోధించు"</string>
+    <string name="search_menu" msgid="6283419262313758339">"సెట్టింగ్‌లను వెతుకు"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"శోధన సెట్టింగ్‌లు"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, నెట్‌వర్క్ కనెక్షన్"</string>
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"వచన సందేశం, వచనం పంపడం, సందేశాలు, సందేశం పంపడం"</string>
@@ -2679,9 +2763,9 @@
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"ప్రదర్శన, ప్రసారం"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"స్థలం, డిస్క్, హార్డ్ డ్రైవ్, పరికర వినియోగం"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"శక్తి వినియోగం, ఛార్జ్"</string>
-    <string name="keywords_spell_checker" msgid="1399641226370605729">"అక్షరక్రమం, నిఘంటువు, అక్షరక్రమ తనిఖీ, స్వీయ-దిద్దుబాటు"</string>
+    <string name="keywords_spell_checker" msgid="1399641226370605729">"అక్షరక్రమం, నిఘంటువు, స్పెల్ చెక్, స్వీయ-దిద్దుబాటు"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"గుర్తింపు, ఇన్‌పుట్, ప్రసంగం, మాట్లాడటం, భాష, హ్యాండ్స్-ఫ్రీ, హ్యాండ్ ఫ్రీ, గుర్తింపు, అభ్యంతరకరం, పదం, ఆడియో, చరిత్ర, బ్లూటూత్ హెడ్‌సెట్"</string>
-    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"రేటు, భాష, డిఫాల్ట్, చదివి వినిపించు, చదివి వినిపించడం, tts, ప్రాప్యత, స్క్రీన్ రీడర్, అంధులు"</string>
+    <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"రేటు, భాష, డిఫాల్ట్, చదివి వినిపించు, చదివి వినిపించడం, tts, యాక్సెస్, స్క్రీన్ రీడర్, అంధులు"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"గడియారం, మిలిటరీ"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"రీసెట్ చేయి, పునరుద్ధరించు, ఫ్యాక్టరీ"</string>
     <string name="keywords_factory_data_reset" msgid="5894970373671252165">"తుడిచివేయి, తొలగించు, పునరుద్ధరించు, క్లియర్ చేయి, తీసివేయి"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"అన్‌లాక్ చేయడానికి స్లైడ్ చేయండి, పాస్‌వర్డ్, ఆకృతి, పిన్"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"కార్యాలయ సవాలు, కార్యాలయం, ప్రొఫైల్"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"కార్యాలయ ప్రొఫైల్, నిర్వహించబడిన ప్రొఫైల్, ఏకీకరించు, ఏకీకరణ, కార్యాలయం, ప్రొఫైల్"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"సంజ్ఞ"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"సంజ్ఞలు"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"చెల్లించడం, నొక్కడం, చెల్లింపులు"</string>
     <string name="keywords_backup" msgid="470070289135403022">"బ్యాకప్, బ్యాకప్"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"సంజ్ఞ"</string>
     <string name="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>
@@ -2752,7 +2837,7 @@
       <item quantity="one">1 స్వయంచాలక నియమం ఆన్ చేయబడింది</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"అంతరాయం కలిగించవద్దు ప్రాధాన్యతలు"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"కేవలం ప్రాధాన్యమైనవి అనుమతించ."</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ప్రాధాన్యతగలవే అనుమతించబడతాయి"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"స్వయంచాలక నిబంధనలు"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"అంతరాయం కలిగించవద్దు నియమాలు సెట్ చేయి"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"నిర్దిష్ట సమయాలలో ధ్వనులు, వైబ్రేషన్‌లను పరిమితంగా ఉంచుతుంది"</string>
@@ -2791,7 +2876,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>
@@ -2806,9 +2892,13 @@
     <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>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"నోటిఫికేషన్ యాక్సెస్"</string>
+    <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"కార్యాలయ ప్రొఫైల్‌ నోటిఫికేషన్‌లకు యాక్సెస్ బ్లాక్ చేయబడింది"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"అనువర్తనాలు నోటిఫికేషన్‌లను చదవలేవు"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="other">%d యాప్‌లు నోటిఫికేషన్‌లను చదవగలవు</item>
@@ -2817,7 +2907,7 @@
     <string name="no_notification_listeners" msgid="3487091564454192821">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలేవీ నోటిఫికేషన్ ప్రాప్యతను అభ్యర్థించలేదు."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> కోసం నోటిఫికేషన్ ప్రాప్యతను అనుమతించాలా?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> పరిచయ పేర్లు మరియు మీరు స్వీకరించే సందేశాల వచనం వంటి వ్యక్తిగత సమాచారంతో సహా అన్ని నోటిఫికేషన్‌లను చదవగలదు. అలాగే, ఇది నోటిఫికేషన్‌లను తీసివేయడం లేదా అవి కలిగి ఉండే చర్య బటన్‌లను సక్రియం చేయడం కూడా చేయగలదు. \n\nఇది అనువర్తనానికి అంతరాయం కలిగించవద్దు ఎంపికను ఆన్ చేయగల లేదా ఆఫ్ చేయగల సామర్థ్యాన్ని కూడా ఇస్తుంది మరియు సంబంధిత సెట్టింగ్‌లను కూడా మారుస్తుంది."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"మీరు <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> కోసం నోటిఫికేషన్ ప్రాప్యతను ఆఫ్ చేస్తే, అంతరాయం కలిగించవద్దు ఎంపిక ప్రాప్యత కూడా ఆఫ్ చేయబడవచ్చు."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"మీరు <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> కోసం నోటిఫికేషన్ యాక్సెస్‌ను ఆఫ్ చేస్తే, అంతరాయం కలిగించవద్దు ఎంపిక యాక్సెస్ కూడా ఆఫ్ చేయబడవచ్చు."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"ఆఫ్ చేయండి"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"రద్దు చేయి"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR సహాయక సేవలు"</string>
@@ -2833,10 +2923,8 @@
     <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="manage_zen_access_title" msgid="2611116122628520522">"అంతరాయం కలిగించవద్దు యాక్సెస్"</string>
+    <string name="zen_access_empty_text" msgid="8772967285742259540">"ఇన్‌స్టాల్ చేసిన యాప్‌లేవీ అంతరాయం కలిగించవద్దు యాక్సెస్ అభ్యర్థించలేదు"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
     <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ఈ డివైజ్‌లో ఈ యాప్ యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
@@ -2844,7 +2932,7 @@
     <string name="notification_channels_other" msgid="5645317113885788226">"ఇతరం"</string>
     <string name="no_channels" msgid="3077375508177744586">"ఈ యాప్ ఏ నోటిఫికేషన్‌లను పోస్ట్ చేయలేదు"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"అనువర్తనంలో అదనపు సెట్టింగ్‌లు"</string>
-    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"అన్ని అనువర్తనాలలో ఆన్ చేయబడింది"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"అన్ని యాప్‌లలో ఆన్ చేయబడింది"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> అనువర్తనాలలో ఆఫ్ చేయబడింది</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనంలో ఆఫ్ చేయబడింది</item>
@@ -2862,7 +2950,7 @@
     <string name="notification_badge_title" msgid="6370122441168519809">"నోటిఫికేషన్ డాట్‌ను అనుమతించండి"</string>
     <string name="notification_channel_badge_title" msgid="2240827899882847087">"నోటిఫికేషన్ డాట్‌ చూపించు"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"అంతరాయం వద్దుని భర్తీ చేయి"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"అంతరాయం కలిగించవద్దు లక్షణాన్ని ప్రాధాన్యత మాత్రమేకి సెట్ చేసినప్పుడు, అంతరాయం కలిగించడం కొనసాగించడానికి ఈ నోటిఫికేషన్‌లను అనుమతిస్తుంది"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"అంతరాయం కలిగించవద్దు ఫీచర్‌ను ప్రాధాన్యత మాత్రమేకి సెట్ చేసినప్పుడు, అంతరాయం కలిగించడం కొనసాగించడానికి ఈ నోటిఫికేషన్‌లను అనుమతిస్తుంది"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"లాక్ స్క్రీన్‌పై"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"బ్లాక్ చేయబడింది"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"ప్రాధాన్యత"</string>
@@ -2905,7 +2993,7 @@
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ఎప్పుడూ వద్దు"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"ప్రతి రోజు"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"అలారం ముగింపు సమయాన్ని భర్తీ చేయవచ్చు"</string>
-    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"ముగింపు సమయం లేదా తదుపరి అలారానికి ఆపివేయి, ఏది ముందుగా వస్తే అప్పుడు"</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"ముగింపు సమయం లేదా తర్వాత అలారానికి ఆపివేయి, ఏది ముందుగా వస్తే అప్పుడు"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> నుండి <xliff:g id="END">%2$s</xliff:g> వరకు"</string>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"నక్షత్రం గల పరిచయాల నుండి మాత్రమే"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ఏవీ వద్దు"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"అలారాలు"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"అలారాలు ఎల్లప్పుడూ ప్రాధాన్యంగా పరిగణించబడి, శబ్దం చేస్తాయి"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"రిమైండర్‌లు"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ఈవెంట్‌లు"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"అందరు కాలర్‌లు"</string>
@@ -2930,7 +3019,7 @@
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"వారపురాత్రులు"</string>
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ప్రారంభ సమయం"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ముగింపు సమయం"</string>
-    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"తదుపరి రోజు <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> తర్వాత రోజు"</string>
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"నిరవధికంగా అలారాలు మాత్రమే ఎంపికకు మార్చుతుంది"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
       <item quantity="other"><xliff:g id="DURATION">%1$d</xliff:g> నిమిషాల పాటు అనగా (<xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g> వరకు) అలారాలు మాత్రమే ఎంపికకు మారుతుంది</item>
@@ -2965,11 +3054,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>
@@ -2977,17 +3061,16 @@
     <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ఈ పరికరాన్ని ప్రారంభించిన వెంటనే మీ పాస్‌వర్డ్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పాస్‌వర్డ్‌ని అడగాలా?"</string>
     <!-- unknown quoting pattern: original -1, translation 1 -->
     <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_pattern_for_fingerprint" msgid="932184823193006087">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ నమూనాని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \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>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ఆకృతి అవసరమా?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"పాస్‌వర్డ్ అవసరమా?"</string>
     <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"మీరు ఈ డివైజ్‌ను ప్రారంభించడానికి మీ పిన్‌ను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి యాక్సెస్ సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ నమూనాను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి ప్రాప్యత సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
-    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ పాస్‌వర్డ్‌ను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి ప్రాప్యత సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ నమూనాను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి యాక్సెస్ సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
+    <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ పాస్‌వర్డ్‌ను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి యాక్సెస్ సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
     <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"గమనిక: రీబూట్ చేసాక, మీరు మీ ఫోన్‌ను అన్‌లాక్ చేసే వరకు ఈ యాప్ ప్రారంభం కాదు"</string>
     <string name="imei_information_title" msgid="8499085421609752290">"IMEI సమాచారం"</string>
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI సంబంధిత సమాచారం"</string>
@@ -3001,12 +3084,12 @@
     <string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g>లో <xliff:g id="SIZE">%1$s</xliff:g> ఉపయోగించబడింది"</string>
     <string name="storage_type_internal" msgid="6042049833565674948">"అంతర్గత నిల్వ"</string>
     <string name="storage_type_external" msgid="7738894330670001898">"బాహ్య నిల్వ"</string>
-    <string name="app_data_usage" msgid="7942375313697452803">"అనువర్తన డేటా వినియోగం"</string>
+    <string name="app_data_usage" msgid="7942375313697452803">"యాప్‌ డేటా వినియోగం"</string>
     <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="DATE">%2$s</xliff:g> నుండి <xliff:g id="SIZE">%1$s</xliff:g> ఉపయోగించబడింది"</string>
     <string name="storage_used" msgid="7128074132917008743">"వినియోగించిన నిల్వ"</string>
     <string name="change" msgid="6657848623929839991">"మార్చు"</string>
     <string name="change_storage" msgid="600475265207060436">"నిల్వను మార్చండి"</string>
-    <string name="notifications_label" msgid="8543457911148619898">"అనువర్తన నోటిఫికేషన్‌లు"</string>
+    <string name="notifications_label" msgid="8543457911148619898">"యాప్ నోటిఫికేషన్‌లు"</string>
     <string name="notifications_enabled" msgid="6983396130566021385">"ఆన్‌లో ఉన్నాయి"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"అన్నీ ఆఫ్ చేయబడ్డాయి"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> వర్గాలలో <xliff:g id="COUNT_0">%1$d</xliff:g> ఆఫ్ చేయబడ్డాయి"</string>
@@ -3031,13 +3114,13 @@
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"అనుమతులు మంజూరు కాలేదు"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"అనుమతులను అభ్యర్థించలేదు"</string>
-    <string name="filter_all_apps" msgid="1988403195820688644">"అన్ని అనువర్తనాలు"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"అన్ని యాప్‌లు"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"ఇన్‌స్టాల్ చేయబడిన అనువర్తనాలు"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"తక్షణ అనువర్తనాలు"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"వ్యక్తిగతం"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"కార్యాలయం"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"అనువర్తనాలు: అన్నీ"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"అనువర్తనాలు: ఆఫ్ చేయబడినవి"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"యాప్‌లు: ఆఫ్ చేయబడినవి"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"వర్గాలు: అత్యవసర ప్రాధాన్యత"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"వర్గాలు: తక్కువ ప్రాధాన్యత"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"వర్గాలు: ఆఫ్ చేయబడినవి"</string>
@@ -3045,7 +3128,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"అధునాతనం"</string>
     <string name="configure_apps" msgid="6685680790825882528">"అనువర్తనాలను కాన్ఫిగర్ చేయండి"</string>
     <string name="unknown_app" msgid="5275921288718717656">"తెలియని యాప్"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"అనువర్తన అనుమతులు"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"యాప్ అనుమతులు"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"అనువర్తనాలు <xliff:g id="APPS">%1$s</xliff:g>ని ఉపయోగిస్తున్నాయి"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"సక్రియం చేయడానికి నొక్కండి"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"పరికరాన్ని సక్రియం చేయడానికి స్క్రీన్‌పై ఎక్కడైనా రెండుసార్లు నొక్కండి"</string>
@@ -3067,7 +3150,7 @@
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"సహాయకం &amp; వాయిస్ ఇన్‌పుట్"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"సహాయక యాప్"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>ని మీ సహాయకంగా చేయాలా?"</string>
-    <string name="assistant_security_warning" msgid="8498726261327239136">"సహాయకం మీ సిస్టమ్‌లో వినియోగంలో ఉన్న అనువర్తనాల గురించిన సమాచారం, అలాగే మీ స్క్రీన్‌పై కనిపించే లేదా అనువర్తనాల్లో ప్రాప్యత చేసే సమాచారం చదవగలుగుతుంది."</string>
+    <string name="assistant_security_warning" msgid="8498726261327239136">"సహాయకం మీ సిస్టమ్‌లో వినియోగంలో ఉన్న యాప్‌ల గురించిన సమాచారం, అలాగే మీ స్క్రీన్‌పై కనిపించే లేదా యాప్‌లలో యాక్సెస్ చేసే సమాచారం చదవగలుగుతుంది."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"అంగీకరిస్తున్నాను"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"అంగీకరించడం లేదు"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"వాయిస్ ఇన్‌పుట్‌ని ఎంచుకోండి"</string>
@@ -3077,10 +3160,10 @@
     <string name="default_app" msgid="6864503001385843060">"(డిఫాల్ట్)"</string>
     <string name="system_app" msgid="9068313769550747372">"(సిస్టమ్)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(సిస్టమ్ డిఫాల్ట్)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"అనువర్తనాల నిల్వ"</string>
-    <string name="usage_access" msgid="5479504953931038165">"వినియోగ ప్రాప్యత"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"యాప్‌ల నిల్వ"</string>
+    <string name="usage_access" msgid="5479504953931038165">"వినియోగ యాక్సెస్"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"వినియోగ ప్రాప్యతను అనుమతించు"</string>
-    <string name="app_usage_preference" msgid="7065701732733134991">"అనువర్తన వినియోగ ప్రాధాన్యతలు"</string>
+    <string name="app_usage_preference" msgid="7065701732733134991">"యాప్ వినియోగ ప్రాధాన్యతలు"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"వినియోగ యాక్సెస్‌తో ఒక యాప్ మీరు ఉపయోగించే ఇతర యాప్‌ల గురించి మరియు వాటిని ఎంత తరచుగా ఉపయోగిస్తున్నారనే దాని గురించి అలాగే మీ క్యారియర్, భాష సెట్టింగ్‌లు మరియు ఇతర వివరాలను ట్రాక్ చేయగలదు."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"మెమరీ"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"మెమరీ వివరాలు"</string>
@@ -3097,13 +3180,22 @@
     <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>
     <string name="high_power_system" msgid="7362862974428225301">"బ్యాటరీ అనుకూలీకరణ అందుబాటులో లేదు"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"బ్యాటరీ అనుకూలీకరణను వర్తింపజేయదు. మీ బ్యాటరీ మరింత శీఘ్రంగా వినియోగించబడవచ్చు."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి అనువర్తనాన్ని అనుమతించాలా?"</string>
-    <string name="high_power_prompt_body" msgid="1031422980602565049">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి <xliff:g id="APP_NAME">%1$s</xliff:g>ని అనుమతిస్తే బ్యాటరీ జీవితకాలం తగ్గిపోవచ్చు. \n\nమీరు తర్వాత సెట్టింగ్‌లు &gt; అనువర్తనాలు &amp; నోటిఫికేషన్‌లలోకి వెళ్లి దీనిని మార్చవచ్చు."</string>
+    <string name="high_power_prompt_body" msgid="1031422980602565049">"ఎల్లప్పుడూ నేపథ్యంలో అమలు కావడానికి <xliff:g id="APP_NAME">%1$s</xliff:g>ని అనుమతిస్తే బ్యాటరీ జీవితకాలం తగ్గిపోవచ్చు. \n\nమీరు తర్వాత సెట్టింగ్‌లు &gt; యాప్‌లు &amp; నోటిఫికేషన్‌లలోకి వెళ్లి దీనిని మార్చవచ్చు."</string>
     <string name="battery_summary" msgid="8044042095190688654">"చివరిగా పూర్తి ఛార్జింగ్ చేసినప్పటి నుండి <xliff:g id="PERCENTAGE">%1$s</xliff:g> వినియోగించబడింది"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"పవర్ నిర్వహణ"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"చివరిగా పూర్తి ఛార్జింగ్ చేేసినప్పటి నుండి బ్యాటరీని అసలు వినియోగించలేదు"</string>
@@ -3135,18 +3227,18 @@
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ఫోటోలను (PTP) బదిలీ చేయడం"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"పరికరాన్ని MIDI వలె ఉపయోగించడం"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"నేపథ్య తనిఖీ"</string>
-    <string name="background_check_title" msgid="4534254315824525593">"పూర్తి నేపథ్య ప్రాప్యత"</string>
+    <string name="background_check_title" msgid="4534254315824525593">"పూర్తి నేపథ్య యాక్సెస్"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"స్క్రీన్‌లోని వచనాన్ని ఉపయోగించండి"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"స్క్రీన్ కంటెంట్‌లను వచన రూపంలో ప్రాప్యత చేయడానికి సహాయక అనువర్తనాన్ని అనుమతిస్తుంది"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"స్క్రీన్ కంటెంట్‌లను వచన రూపంలో యాక్సెస్ చేయడానికి సహాయక యాప్‌ను అనుమతిస్తుంది"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"స్క్రీన్‌షాట్‌ను ఉపయోగించండి"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"స్క్రీన్ చిత్రాన్ని ప్రాప్యత చేయడానికి సహాయక అనువర్తనాన్ని అనుమతిస్తుంది"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"స్క్రీన్ చిత్రాన్ని యాక్సెస్ చేయడానికి సహాయక యాప్‌ను అనుమతిస్తుంది"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"స్క్రీన్‌ను ఫ్లాష్ చేయడం"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"సహాయక యాప్ స్క్రీన్ లేదా స్క్రీన్‌షాట్‌లోని వచనాన్ని యాక్సెస్ చేసినప్పుడు స్క్రీన్ అంచులను ఫ్లాష్ చేస్తుంది"</string>
     <string name="assist_footer" msgid="1982791172085896864">"సహాయక అనువర్తనాలు మీరు వీక్షిస్తున్న స్క్రీన్‌లోని సమాచారం ఆధారంగా మీకు సహాయపడగలవు. కొన్ని అనువర్తనాలు మీకు సమగ్రమైన సహాయాన్ని అందించడానికి లాంచర్ మరియు వాయిస్ ఇన్‌పుట్ సేవలు రెండింటికీ మద్దతిస్తాయి."</string>
     <string name="average_memory_use" msgid="829566450150198512">"సగటు మెమరీ వినియోగం"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"గరిష్ట మెమరీ వినియోగం"</string>
     <string name="memory_usage" msgid="1781358557214390033">"మెమరీ వినియోగం"</string>
-    <string name="app_list_memory_use" msgid="6987417883876419338">"అనువర్తన వినియోగం"</string>
+    <string name="app_list_memory_use" msgid="6987417883876419338">"యాప్‌ వినియోగం"</string>
     <string name="memory_details" msgid="5943436005716991782">"వివరాలు"</string>
     <string name="memory_use_summary" msgid="5608257211903075754">"గత 3 గంటల్లో <xliff:g id="SIZE">%1$s</xliff:g> సగటు మెమరీ వినియోగించబడింది"</string>
     <string name="no_memory_use_summary" msgid="2016900536806235588">"గత 3 గంటల్లో మెమరీ ఏదీ వినియోగించలేదు"</string>
@@ -3164,10 +3256,10 @@
     <string name="running_frequency" msgid="6622624669948277693">"తరచుదనం"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"గరిష్ట వినియోగం"</string>
     <string name="no_data_usage" msgid="9131454024293628063">"డేటా ఏదీ వినియోగించలేదు"</string>
-    <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> కోసం అంతరాయం కలిగించవద్దు ఎంపికకు ప్రాప్యతను అనుమతించాలా?"</string>
+    <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> కోసం అంతరాయం కలిగించవద్దు ఎంపికకు యాక్సెస్‌ను అనుమతించాలా?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"యాప్ అంతరాయం కలిగించవద్దు ఎంపికను ఆన్/ఆఫ్ చేయగలదు మరియు సంబంధిత సెట్టింగ్‌లకు మార్పులు చేయగలదు."</string>
-    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"నోటిఫికేషన్ ప్రాప్యత ఆన్‌లో ఉన్నందున తప్పనిసరిగా ఇది ఆన్‌లో ఉండాలి"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> అంతరాయం కలిగించవద్దు లక్షణానికి కలిగి ఉన్న ప్రాప్యతను ఉపసంహరించాలా?"</string>
+    <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"నోటిఫికేషన్ యాక్సెస్ ఆన్‌లో ఉన్నందున తప్పనిసరిగా ఇది ఆన్‌లో ఉండాలి"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> అంతరాయం కలిగించవద్దు ఫీచర్‌కు యాక్సెస్‌ను ఉపసంహరించాలా?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ఈ యాప్ ద్వారా రూపొందించిన అన్ని అంతరాయం కలిగించవద్దు నిబంధనలు తీసివేయబడతాయి."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"అనుకూలీకరించవద్దు"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"అనుకూలీకరించు"</string>
@@ -3177,9 +3269,9 @@
     <string name="app_list_preference_none" msgid="108006867520327904">"ఏదీ వద్దు"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"ఈ అనువర్తనంలో వినియోగ ప్రాప్యతను ఆఫ్ చేసినా కూడా మీ కార్యాలయ ప్రొఫైల్‌లోని అనువర్తన డేటా వినియోగాన్ని ట్రాక్ చేయకుండా మీ నిర్వాహకులు నివారించబడరు"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_1">%2$d</xliff:g>లో <xliff:g id="COUNT_0">%1$d</xliff:g> అక్షరాలు ఉపయోగించబడ్డాయి"</string>
-    <string name="draw_overlay" msgid="6564116025404257047">"ఇతర అనువర్తనాల ఎగువన ప్రదర్శన"</string>
+    <string name="draw_overlay" msgid="6564116025404257047">"ఇతర యాప్‌ల ఎగువన ప్రదర్శన"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"ఇతర అనువర్తనాల ఎగువన ప్రదర్శన"</string>
-    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"అనువర్తనాలు"</string>
+    <string name="system_alert_window_apps_title" msgid="7005760279028569491">"యాప్‌లు"</string>
     <string name="system_alert_window_access_title" msgid="6297115362542361241">"ఇతర అనువర్తనాల ఎగువన ప్రదర్శన"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"ఇతర అనువర్తనాల ఎగువన కనిపించడానికి అనుమతించు"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"యాప్ ఎగువన కనిపించడానికి అనుమతి"</string>
@@ -3189,9 +3281,9 @@
     <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="keywords_install_other_apps" msgid="761078076051006558">"తెలియని అనువర్తనాలను ఇన్‌స్టాల్ చేయి"</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>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_1">%2$d</xliff:g>లో <xliff:g id="COUNT_0">%1$d</xliff:g> అనువర్తనాలు సిస్టమ్ సెట్టింగ్‌ల సవరణకు అనుమతించబడ్డాయి"</string>
@@ -3232,7 +3324,7 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> అనువర్తనాలలో ఆఫ్ చేయబడింది</item>
       <item quantity="one">1 అనువర్తనంలో ఆఫ్ చేయబడింది</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"అన్ని అనువర్తనాలలో ఆన్ చేయబడ్డాయి"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"అన్ని యాప్‌లలో ఆన్ చేయబడ్డాయి"</string>
     <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ఉపయోగించబడింది - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ఖాళీగా ఉంది"</string>
@@ -3265,7 +3357,7 @@
     <string name="condition_expand_hide" msgid="948507739223760667">"దాస్తుంది"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"హాట్‌స్పాట్ ఆన్‌లో ఉంది"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"పోర్టబుల్ Wi-Fi హాట్‌స్పాట్ <xliff:g id="ID_1">%1$s</xliff:g> సక్రియంగా ఉంది, ఈ పరికర Wi-Fi ఆఫ్ చేయబడింది."</string>
-    <string name="condition_airplane_title" msgid="287356299107070503">"ఎయిర్‌ప్లైన్ మోడ్ ఆన్‌లో ఉంది"</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"ఎయిర్‌ప్లేన్ మోడ్ ఆన్‌లో ఉంది"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, బ్లూటూత్ మరియు మొబైల్ నెట్‌వర్క్ ఆఫ్ చేయబడ్డాయి. మీరు ఫోన్ కాల్‌లు చేయలేరు లేదా ఇంటర్నెట్‌కు కనెక్ట్ చేయలేరు."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"అంతరాయం వద్దు ఆన్‌లో ఉంది (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"బ్యాటరీ సేవర్ ఆన్‌లో ఉంది"</string>
@@ -3280,12 +3372,21 @@
     <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="suggestion_remove" msgid="904627293892092439">"తీసివేయి"</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>
     <string name="color_temperature_toast" msgid="4974218172133854827">"రంగు మార్పును వర్తింపజేయడానికి, స్క్రీన్‌ను ఆఫ్ చేయండి"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"టెలిఫోనీ మానిటర్ మార్పును వర్తింపజేయాలంటే, పరికరాన్ని రీబూట్ చేయండి"</string>
-    <string name="ota_disable_automatic_update" msgid="2319639631655915050">"స్వయంచాలక సిస్టమ్ నవీకరణలు"</string>
+    <string name="ota_disable_automatic_update" msgid="2319639631655915050">"స్వయంచాలక సిస్టమ్ అప్‌డేట్‌లు"</string>
     <string name="usage" msgid="2977875522080448986">"వినియోగం"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"మొబైల్ డేటా వినియోగం"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi డేటా వినియోగం"</string>
@@ -3298,8 +3399,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 +3419,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>
@@ -3339,7 +3439,7 @@
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"బ్యాటరీ స్థాయి %1$s ఉన్నప్పుడు స్వయంచాలకంగా ఆన్ చేస్తుంది"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"బ్యాటరీ అనుకూలీకరణను ఉపయోగించడం లేదు"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"పరికరం లాక్ చేయబడితే, నోటిఫికేషన్‌ల్లో ప్రత్యుత్తరాలు లేదా ఇతర వచనాన్ని టైప్ చేయకుండా నిరోధించు"</string>
-    <string name="default_spell_checker" msgid="8506899870026026660">"డిఫాల్ట్ అక్షరక్రమ తనిఖీ"</string>
+    <string name="default_spell_checker" msgid="8506899870026026660">"డిఫాల్ట్ స్పెల్ చెకర్"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"అక్షరక్రమ తనిఖీని ఎంచుకోండి"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"ఎంచుకోబడలేదు"</string>
     <string name="notification_log_no_title" msgid="5678029849672024215">"(ఏదీ లేదు)"</string>
@@ -3349,7 +3449,7 @@
     <string name="notification_log_details_group" msgid="2430467015200368698">"సమూహం"</string>
     <string name="notification_log_details_group_summary" msgid="7945543958255585829">"(సారాంశం)"</string>
     <string name="notification_log_details_visibility" msgid="2552873780715930971">"దృశ్యమానత"</string>
-    <string name="notification_log_details_public_version" msgid="4247242364605495240">"పబ్లిక్‌ సంస్కరణ"</string>
+    <string name="notification_log_details_public_version" msgid="4247242364605495240">"పబ్లిక్‌ వెర్షన్"</string>
     <string name="notification_log_details_priority" msgid="8371354971235991398">"ప్రాధాన్యత"</string>
     <string name="notification_log_details_importance" msgid="2153168790791683139">"ప్రాముఖ్యత"</string>
     <string name="notification_log_details_explanation" msgid="1914295130775393551">"వివరణ"</string>
@@ -3371,7 +3471,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ఏదీ లేదు"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"ర్యాంకింగ్ ఆబ్జెక్ట్ లేదు."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"ర్యాంకింగ్ ఆబ్జెక్ట్‌లో ఈ కీ లేదు."</string>
-    <string name="special_access" msgid="3458780842491881155">"ప్రత్యేక అనువర్తన ప్రాప్యత"</string>
+    <string name="special_access" msgid="3458780842491881155">"ప్రత్యేక యాప్ యాక్సెస్"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> యాప్‌లు అనియంత్రిత డేటాని ఉపయోగించగలవు</item>
       <item quantity="one">1 యాప్ అనియంత్రిత డేటాని ఉపయోగించగలదు</item>
@@ -3383,12 +3483,11 @@
     <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>
-    <string name="premium_sms_access" msgid="4660047004791638305">"ప్రీమియం SMS ప్రాప్యత"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"ప్రీమియం SMS యాక్సెస్"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"ఇతర పరికరాలకు కనిపించదు"</string>
     <string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>కి కనెక్ట్ చేయబడింది"</string>
     <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"బహుళ పరికరాలకు కనెక్ట్ చేయబడింది"</string>
@@ -3455,25 +3554,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"సహాయక సంజ్ఞ"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"సున్నితత్వం"</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="gesture_setting_on" msgid="3455094265233870280">"ఆన్"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ఆఫ్"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"బూట్‌లోడర్ ఇప్పటికే అన్‌లాక్ చేయబడింది"</string>
@@ -3492,15 +3598,18 @@
     <string name="auto_sync_account_title" msgid="898796354710116383">"డేటాని స్వయంచాలకంగా సమకాలీకరించు"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"వ్యక్తిగత డేటాని స్వయంచాలకంగా సమకాలీకరించు"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"కార్యాలయ డేటాని స్వయంచాలకంగా సమకాలీకరించు"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"డేటాని స్వయంచాలకంగా రీఫ్రెష్ చేసేలా అనువర్తనాలు అనుమతించబడతాయి"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"డేటాని స్వయంచాలకంగా రీఫ్రెష్ చేసేలా యాప్‌లు అనుమతించబడతాయి"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"ఖాతా సమకాలీకరణ"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g>లో <xliff:g id="ID_1">%1$d</xliff:g> అంశాలకు సమకాలీకరణ ఆన్‌లో ఉంది"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"అన్ని అంశాలకు సమకాలీకరణ ఆన్‌లో ఉంది"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"అన్ని అంశాలకు సమకాలీకరణ ఆఫ్‌లో ఉంది"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"నిర్వహించబడిన పరికర సమాచారం"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"మీ సంస్థ నిర్వహిస్తున్న మార్పులు &amp; సెట్టింగ్‌లు"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> నిర్వహిస్తున్న మార్పులు &amp; సెట్టింగ్‌లు"</string>
     <string name="enterprise_privacy_header" msgid="7402406406883832509">"మీ కార్యాలయ డేటాకు ప్రాప్యతను అందించడం కోసం, మీ సంస్థ మీ పరికరంలో సెట్టింగ్‌లను మార్చవచ్చు మరియు సాఫ్ట్‌వేర్‌ని ఇన్‌స్టాల్ చేయవచ్చు.\n\nమరిన్ని వివరాలు కావాలంటే, మీ సంస్థ యొక్క నిర్వాహకులను సంప్రదించండి."</string>
     <string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"మీ సంస్థ చూడగల సమాచార రకాలు"</string>
     <string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"మీ సంస్థ యొక్క నిర్వాహకులు చేసిన మార్పులు"</string>
-    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"ఈ పరికరానికి మీ ప్రాప్యత"</string>
+    <string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"ఈ పరికరానికి మీ యాక్సెస్"</string>
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"మీ కార్యాలయ ఖాతాతో అనుబంధించబడిన డేటా, ఇమెయిల్ మరియు క్యాలెండర్ వంటివి"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"మీ పరికరంలో ఉన్న అనువర్తనాల జాబితా"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"ప్రతి అనువర్తనంలో గడిపిన సమయం మరియు ఉపయోగించిన డేటా"</string>
@@ -3517,7 +3626,7 @@
     <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"స్థాన అనుమతులు"</string>
     <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"మైక్రోఫోన్ అనుమతులు"</string>
     <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"కెమెరా అనుమతులు"</string>
-    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"డిఫాల్ట్ అనువర్తనాలు"</string>
+    <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"డిఫాల్ట్ యాప్‌లు"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="2765037387436064893">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> యాప్‌లు</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> యాప్</item>
@@ -3565,7 +3674,7 @@
     <string name="storage_photos_videos" msgid="319854636702241898">"ఫోటోలు &amp; వీడియోలు"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"సంగీతం &amp; ఆడియో"</string>
     <string name="storage_games" msgid="7703159201697117621">"గేమ్‌లు"</string>
-    <string name="storage_other_apps" msgid="5524321740031718083">"ఇతర అనువర్తనాలు"</string>
+    <string name="storage_other_apps" msgid="5524321740031718083">"ఇతర యాప్‌లు"</string>
     <string name="storage_files" msgid="8581083146777364063">"ఫైల్‌లు"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>లో ఉపయోగించబడింది"</string>
@@ -3574,6 +3683,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,6 +3696,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"ఆన్‌లో ఉంది"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"తక్షణ యాప్"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"నిల్వ నిర్వాహికిని ఆఫ్ చేయాలా?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"చలన చిత్రం &amp; టీవీ అనువర్తనాలు"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"ఉపయోగించబడిన నిల్వ"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"చలన చిత్రం &amp; టీవీ యాప్‌లు"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"క్యారియర్ కేటాయింపు సమాచారం"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"క్యారియర్ కేటాయింపు సక్రియం చేయండి"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"కొత్తవి మరియు అద్భుతమైనవి ఏమిటి?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"అగ్ర 5 ఫీచర్‌‌లను పరిశీలించండి"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS నమోదు స్థితి"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"నమోదు చేయబడింది"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"నమోదు కాలేదు"</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 3794809d7eaf9f8a820fb92fc9bcea69147c7a6d..2e88fe99d1ea3822e3cc663422f28f523962cd80 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 ffebe94a358a62c036e1959a0b7ac510ada398b9..b6763d4afdfc7be616eaf30d96f5be704e632866 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>
@@ -39,8 +40,9 @@
     <string name="radio_info_data_connection_enable" msgid="8656750679353982712">"เปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE ที่จัดสรรแล้ว"</string>
-    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"จัดสรรแฮงเอาท์วิดีโอแล้ว"</string>
+    <string name="vt_provisioned_switch_string" msgid="7876998291744854759">"จัดสรร Hangouts วิดีโอแล้ว"</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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"ข้ามไปก่อน"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"ข้ามการตั้งค่าลายนิ้วมือไหม"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"คุณได้เลือกที่จะใช้ลายนิ้วมือเป็นวิธีการหนึ่งในการปลดล็อกโทรศัพท์ หากคุณข้ามในตอนนี้ คุณจะต้องตั้งค่าฟีเจอร์นี้ในภายหลัง การตั้งค่าจะใช้เวลาราว 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 +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="1688030823464420974">"หากคุณป้อนรูปแบบไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"หากคุณป้อน PIN ไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"หากคุณป้อนรหัสผ่านไม่ถูกต้องในความพยายามครั้งถัดไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</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="5047439819181833824">"ใช้ความพยายามหลายครั้งเกินไป ระบบจะลบข้อมูลในอุปกรณ์เครื่องนี้"</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>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"เปิด Wi‑Fi อัตโนมัติ"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi จะเปิดอีกครั้งเมื่ออยู่ใกล้เครือข่ายคุณภาพสูงที่บันทึกไว้ เช่น เครือข่ายที่บ้านของคุณ"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ไม่พร้อมใช้งานเพราะการสแกนหา Wi‑Fi ปิดอยู่"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"ในการใช้งาน ให้เลือกผู้ให้บริการจัดอันดับเครือข่าย"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีเพียงพอ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ใช้เครือข่ายที่มีการเชื่อมต่ออินเทอร์เน็ตสัญญาณแรงเท่านั้น"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"เชื่อมต่อเครือข่ายแบบเปิด"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"เชื่อมต่อเครือข่ายสาธารณะคุณภาพสูงโดยอัตโนมัติ"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"เลือกผู้ให้บริการจัดอันดับเครือข่ายเพื่อใช้งาน"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"เลือกผู้ให้บริการจัดอันดับเครือข่ายที่ใช้งานร่วมกันได้เพื่อใช้งาน"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"ติดตั้งใบรับรอง"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"หากต้องการปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการของระบบจะยังคงสามารถสแกนหาเครือข่าย 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="wifi_scan_notify_text" msgid="5593805423071186757">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง แอปและบริการของระบบจะยังคงสามารถสแกนหาเครือข่าย 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"เปิดการสแกน 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="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ไม่ต้องแสดงข้อความนี้อีก"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ขณะอยู่ในโหมดสลีป"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"เปิดเสมอ/ใช้แบตเตอรี่เพิ่มขึ้น"</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="6978257596231155345">"แสดงเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ การใช้งานแบตเตอรี่จะเพิ่มขึ้น"</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>
@@ -1068,7 +1115,7 @@
     <string name="firmware_version" msgid="4801135784886859972">"เวอร์ชันของ Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"ระดับแพตช์ความปลอดภัยของ Android"</string>
     <string name="model_info" msgid="1952009518045740889">"โมเดล"</string>
-    <string name="hardware_info" msgid="2605080746512527805">"สื่อและฮาร์ดแวร์"</string>
+    <string name="hardware_info" msgid="2605080746512527805">"โมเดลและฮาร์ดแวร์"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"เวอร์ชันฮาร์ดแวร์"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"รหัสอุปกรณ์"</string>
     <string name="baseband_version" msgid="1848990160763524801">"เวอร์ชันเบสแบนด์"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"มีผู้ใช้รายอื่นอยู่บนอุปกรณ์เครื่องนี้\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"เพลง"</li>\n<li>"รูปภาพ"</li>\n<li>"ข้อมูลผู้ใช้อื่นๆ"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"ผู้ให้บริการใน eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"การดำเนินการนี้จะไม่ยกเลิกแพ็กเกจมือถือของคุณ"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"ที่จัดเก็บข้อมูล USB"</b></string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ คุณต้องลบ"<b>"การ์ด SD"</b></string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"ลบที่เก็บข้อมูล USB"</string>
     <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>
@@ -1324,26 +1377,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 +1418,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 +1463,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 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"โปรแกรมอ่านหน้าจอ การแสดงผล ส่วนควบคุมการโต้ตอบ"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"การตั้งค่าการมองเห็น"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"คุณสามารถปรับแต่งอุปกรณ์นี้ให้ตรงกับความต้องการของคุณ และเปลี่ยนฟีเจอร์การเข้าถึงเหล่านี้ได้ภายหลังในการตั้งค่า"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"เพิ่มขนาดอักษร"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"โปรแกรมอ่านหน้าจอ"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"เสียงและข้อความบนหน้าจอ"</string>
     <string name="display_category_title" msgid="685461049938269166">"การแสดงผล"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"โทรศัพท์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้โทรศัพท์ตื่นอยู่ตลอด\n\nคุณสามารถหยุดแอปเพื่อลองแก้ปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"แท็บเล็ตไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้แท็บเล็ตตื่นอยู่ตลอด\n\nคุณสามารถหยุดแอปเพื่อลองแก้ปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"อุปกรณ์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้อุปกรณ์ตื่นอยู่ตลอด\n\nคุณสามารถหยุดแอปเพื่อลองแก้ปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"โทรศัพท์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP_0">%1$s</xliff:g> ปลุกให้โทรศัพท์ตื่นอยู่ตลอด\n\nคุณสามารถหยุด <xliff:g id="APP_1">%1$s</xliff:g> เพื่อลองแก้ปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"แท็บเล็ตไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP_0">%1$s</xliff:g> ปลุกให้แท็บเล็ตตื่นอยู่ตลอด\n\nคุณสามารถหยุด <xliff:g id="APP_1">%1$s</xliff:g> เพื่อลองแก้ปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"อุปกรณ์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP_0">%1$s</xliff:g> ปลุกให้อุปกรณ์ตื่นอยู่ตลอด\n\nคุณสามารถหยุด <xliff:g id="APP_1">%1$s</xliff:g> เพื่อลองแก้ปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"หยุดแอป"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"ปิดการใช้งานในพื้นหลังและหยุดแอปไหม"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"โทรศัพท์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP_0">%1$s</xliff:g> ปลุกให้โทรศัพท์ตื่นอยู่ตลอด\n\nคุณสามารถหยุดและป้องกันไม่ให้ <xliff:g id="APP_1">%1$s</xliff:g> ทำงานในพื้นหลังเพื่อลองแก้ปัญหานี้"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"แท็บเล็ตไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP_0">%1$s</xliff:g> ปลุกให้แท็บเล็ตตื่นอยู่ตลอด\n\nคุณสามารถหยุดและป้องกันไม่ให้ <xliff:g id="APP_1">%1$s</xliff:g> ทำงานในพื้นหลังเพื่อลองแก้ปัญหานี้"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"อุปกรณ์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP_0">%1$s</xliff:g> ปลุกให้อุปกรณ์ตื่นอยู่ตลอด\n\nคุณสามารถหยุดและป้องกันไม่ให้ <xliff:g id="APP_1">%1$s</xliff:g> ทำงานในพื้นหลังเพื่อลองแก้ปัญหานี้"</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="7774807745601479888">"โทรศัพท์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ขอตำแหน่งของคุณอยู่ตลอดตอนที่คุณไม่ได้ใช้แอป\n\nคุณสามารถปิดตำแหน่งสำหรับแอปนี้เพื่อแก้ปัญหานี้"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"แท็บเล็ตไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ขอตำแหน่งของคุณอยู่ตลอดตอนที่คุณไม่ได้ใช้แอป\n\nคุณสามารถปิดตำแหน่งสำหรับแอปนี้เพื่อแก้ปัญหานี้"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"อุปกรณ์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"รายละเอียดนับตั้งแต่ชาร์จจนเต็มครั้งล่าสุด"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"ชาร์จจนเต็มครั้งล่าสุด"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"เวลาแบตเตอรี่ที่เหลือเป็นเพียงประมาณการและอาจเปลี่ยนไปตามการใช้งาน"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"ข้อมูลการใช้งานแบตเตอรี่เป็นเพียงการประมาณการและอาจเปลี่ยนไปตามการใช้งาน"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"ขณะใช้งานอยู่"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"ขณะอยู่ในพื้นหลัง"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"การใช้งานแบตเตอรี่"</string>
@@ -2339,7 +2420,7 @@
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"การกระทำดังกล่าวจะเป็นการประหยัดปริมาณการใช้อินเทอร์เน็ตและแบตเตอรี่ แต่คุณจะต้องซิงค์แต่ละบัญชีด้วยตนเองเพื่อรวบรวมข้อมูลล่าสุด และคุณจะไม่ได้รับการแจ้งเตือนเมื่อมีการอัปเดต"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"วันที่รีเซ็ตรอบการใช้"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"วันที่ของแต่ละเดือน:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"ตั้งค่าแล้ว"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"ตั้งค่า"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ตั้งค่าเตือนการใช้ข้อมูล"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ตั้งค่าขีดจำกัดการใช้ข้อมูล"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"การจำกัดการใช้ข้อมูล"</string>
@@ -2358,7 +2439,7 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่แท็บเล็ตวัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่โทรศัพท์วัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"ข้อจำกัดของเครือข่าย"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"ระบบจะดำเนินการกับเครือข่ายที่มีการวัดปริมาณอินเทอร์เน็ตเหมือนกับเครือข่ายมือถือเมื่อมีการจำกัดอินเทอร์เน็ตในพื้นหลัง แอปอาจแจ้งเตือนคุณก่อนใช้เครือข่ายเหล่านี้ดาวน์โหลดไฟล์ขนาดใหญ่"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"ระบบจะดำเนินการกับเครือข่ายที่มีการวัดปริมาณอินเทอร์เน็ตเหมือนกับเครือข่ายมือถือเมื่อมีการจำกัดอินเทอร์เน็ตในการทำงานเบื้องหลัง แอปอาจแจ้งเตือนคุณก่อนใช้เครือข่ายเหล่านี้เพื่อดาวน์โหลดไฟล์ขนาดใหญ่"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"เครือข่ายมือถือ"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"เครือข่าย Wi-Fi ที่วัดข้อมูล"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"เปิด Wi‑Fi เพื่อเลือกเครือข่ายที่มีการวัดปริมาณข้อมูล"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"เลื่อนเพื่อปลดล็อก, รหัสผ่าน, รูปแบบ, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ความท้าทายในการทำงาน, งาน, โปรไฟล์"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"โปรไฟล์งาน, โปรไฟล์ที่มีการจัดการ, รวม, การรวม, งาน, โปรไฟล์"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ท่าทางสัมผัส"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"ท่าทางสัมผัส"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ชำระเงิน แตะ การชำระเงิน"</string>
     <string name="keywords_backup" msgid="470070289135403022">"ข้อมูลสำรอง, สำรองข้อมูล"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ท่าทางสัมผัส"</string>
     <string name="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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"จากรายชื่อติดต่อที่ติดดาวเท่านั้น"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ไม่มี"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"การปลุก"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"เสียงปลุกจะเป็นการแจ้งเตือนที่สำคัญและส่งเสียงเสมอ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"การช่วยเตือน"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"กิจกรรม"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ผู้โทรทั้งหมด"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"ท่าทางสัมผัสการช่วยเหลือ"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"ความละเอียดอ่อน"</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="gesture_setting_on" msgid="3455094265233870280">"เปิด"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"ปิด"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"ปลดล็อก Bootloader แล้ว"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"ซิงค์ข้อมูลงานอัตโนมัติ"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"ให้แอปรีเฟรชข้อมูลอัตโนมัติ"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"การซิงค์บัญชี"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"การซิงค์เปิดอยู่สำหรับ <xliff:g id="ID_1">%1$d</xliff:g> จาก <xliff:g id="ID_2">%2$d</xliff:g> รายการ"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"การซิงค์เปิดอยู่สำหรับรายการทั้งหมด"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"การซิงค์ปิดอยู่สำหรับรายการทั้งหมด"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"จัดการข้อมูลอุปกรณ์"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"องค์กรของคุณเป็นผู้จัดการการเปลี่ยนแปลงและการตั้งค่า"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"การเปลี่ยนแปลงและการตั้งค่าได้รับการจัดการโดย <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3567,11 +3677,12 @@
     <string name="storage_files" msgid="8581083146777364063">"ไฟล์"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"ที่ใช้ไปจากทั้งหมด <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_percent_full" msgid="6095012055875077036">"ใช้อยู่"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"ที่ใช้ไป"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"ล้างแอป"</string>
     <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,6 +3695,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"เปิด"</string>
     <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="storage_movies_tv" msgid="5498394447562086890">"แอปภาพยนตร์และทีวี"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"ข้อมูลการจัดสรรผู้ให้บริการ"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ทริกเกอร์การจัดสรรผู้ให้บริการ"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"มีอะไรใหม่และน่าสนใจบ้าง"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"ดูฟีเจอร์เด่น 5 อันดับแรก"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"สถานะการลงทะเบียน IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"ลงทะเบียนแล้ว"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"ไม่ได้ลงทะเบียน"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 0b9b2f006f598d74079944968982dfb8758dc7a1..23b0c1adabe4ebe6a6dd6fbf6b55afb562de5428 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 98918e211dbe725137e10b09175686db03c518cc..3eb5e2a03c51bb4fea379ac540eaf43e1b7ad4e2 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) -->
@@ -281,8 +293,8 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"Payagan ang paggamit ng data sa mobile network"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Payagan data usage pag roaming"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming ng data"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Kumonekta sa mga serbisyo ng data kapag naka-roaming"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Kumonekta sa mga serbisyo ng data kapag naka-roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Nawala ang koneksyon ng data dahil iniwan mo ang iyong home network na naka-off ang roaming ng data."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"I-on ito"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Maaari kang magkaroon ng malaking bayarin."</string>
@@ -294,7 +306,7 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Petsa &amp; oras"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"I-set ang petsa at oras"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Itakda ang petsa, oras, time zone, &amp; mga format"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Awto na petsa at oras"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Awtomatikong petsa at oras"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Gamitin ang oras na ibinigay ng network"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Gamitin ang oras na ibinigay ng network"</string>
     <string name="zone_auto" msgid="334783869352026648">"Awtomatikong time zone"</string>
@@ -312,7 +324,7 @@
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Uriin ayon sa time zone"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Petsa"</string>
     <string name="time_picker_title" msgid="483460752287255019">"Oras"</string>
-    <string name="lock_after_timeout" msgid="4590337686681194648">"Awtomatikong nagla-lock"</string>
+    <string name="lock_after_timeout" msgid="4590337686681194648">"Awtomatikong i-lock"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pagkatapos ng sleep"</string>
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Pagkatapos mismo ng pag-sleep, maliban na lang kung pinanatiling naka-unlock ng <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> pagkatapos ng pag-sleep, maliban na lang kung pinanatiling naka-unlock ng <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
@@ -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>
@@ -347,47 +359,46 @@
     <string name="fingerprint_add_title" msgid="1926752654454033904">"Magdagdag ng fingerprint"</string>
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"screen lock"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
-      <item quantity="one">Pag-set up ng <xliff:g id="COUNT_1">%1$d</xliff:g> fingerprint</item>
-      <item quantity="other">Pag-set up ng <xliff:g id="COUNT_1">%1$d</xliff:g> na fingerprint</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprint ang naka-set up</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> na fingerprint ang naka-set up</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <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_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_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 ito pagkatapos mong makaramdam ng pag-vibrate"</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">"Iangat nang iangat 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 na 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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Gawin ito sa ibang pagkakataon"</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 +460,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 +532,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="1688030823464420974">"Kung maling pattern ang mailalagay mo sa susunod na pagsubok, made-delete ang data ng device na ito"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Kung maling PIN ang mailalagay mo sa susunod na pagsubok, made-delete ang data ng device na ito"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Kung maling password ang mailalagay mo sa susunod na pagsubok, made-delete ang data ng 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="5047439819181833824">"Masyadong maraming maling pagsubok. Made-delete ang data ng 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>
@@ -625,7 +646,15 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Advanced"</string>
     <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="ble_scan_notify_text" msgid="1295915006005700650">"Upang pahusayin ang katumpakan ng lokasyon, maaari pa ring mag-detect 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-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>
@@ -673,7 +702,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"I-off"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hindi available dahil naka-off ang NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Kapag naka-on ang feature na ito, maaari mong i-beam ang content ng app sa iba pang device na may NFC sa pamamagitan ng paglalapit sa mga device. Halimbawa, maaari kang mag-beam ng mga web page, video sa YouTube, contact at higit pa.\n\nPaglapitin lang ang mga device (karaniwang magkatalikuran) at pagkatapos ay i-tap ang iyong screen. Tutukuyin ng app kung ano ang ibi-beam."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Kapag naka-on ang feature na ito, maaari mong i-beam ang content ng app sa iba pang device na may NFC sa pamamagitan ng paglalapit sa mga device. Halimbawa, maaari kang mag-beam ng mga web page, video sa YouTube, contact, at higit pa.\n\nPaglapitin lang ang mga device (karaniwang magkatalikuran) at pagkatapos ay i-tap ang iyong screen. Tutukuyin ng app kung ano ang ibi-beam."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"I-on ang Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -691,13 +720,16 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Awtomatikong i-on ang Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Mag-o-on muli ang Wi‑Fi kapag malapit sa mga naka-save na network na may mataas na kalidad, gaya ng iyong home network"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Hindi available dahil naka-off ang pag-scan para sa Wi‑Fi"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Upang magamit, pumili ng provider ng rating ng network"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Iwasan ang mahihinang koneksyon"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Huwag gumamit ng Wi-Fi network maliban kung mayroon itong mahusay na koneksyon sa Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Gamit lang ng network na may maayos na koneksyon sa Internet"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Kumonekta sa mga bukas na network"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Awtomatikong kumonekta sa mga pampublikong network na may mataas na kalidad"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Upang magamit, pumili ng provider ng rating ng network"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Upang magamit, pumili ng tugmang provider ng rating ng network"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Mag-install ng mga certificate"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Upang pahusayin ang katumpakan ng lokasyon, maaari pa ring tumukoy ng mga Wi-Fi network 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="wifi_scan_notify_text" msgid="5593805423071186757">"Upang pahusayin ang katumpakan ng lokasyon, maaari pa ring mag-scan ang mga app at serbisyo ng system para sa mga Wi-Fi network. Maaari mo itong baguhin sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pag-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Upang pahusayin ang katumpakan ng lokasyon, i-on ang pag-scan ng Wi-Fi sa <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>mga setting ng pag-scan<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Huwag ipakitang muli"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Panatilihing naka-on ang Wi-Fi habang naka-sleep"</string>
@@ -727,7 +759,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Kalimutan ang network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Baguhin ang network"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Isulat sa tag ng NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para makita ang available network, i-on ang Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para sa mga available na network, i-on ang Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Naghahanap ng mga Wi-Fi network..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Wala kang pahintulot na baguhin ang Wi‑Fi network."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Higit pa"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Palaging naka-on / Mas magastos sa baterya"</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="6978257596231155345">"Ipakita ang oras, mga icon ng notification, at iba pang impormasyon. Mas magastos sa baterya."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"May iba pang mga user sa device na ito.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Mga carrier sa eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Hindi nito kakanselahin ang iyong plano ng serbisyo sa mobile."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Upang i-clear ang musika, mga larawan at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Upang i-clear ang musika, mga larawan at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Burahin ang storage na USB"</string>
     <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>
@@ -1324,26 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1452,7 +1497,7 @@
     <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"Baguhin ang naka-unlock na PIN"</string>
     <string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Gumawa ng pattern sa pag-unlock"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Pindutin ang Menu para sa tulong."</string>
-    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"I-angat ang daliri kapag tapos na"</string>
+    <string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Iangat ang daliri kapag tapos na"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Pagdugtungin ang hindi bababa sa <xliff:g id="NUMBER">%d</xliff:g> (na) tuldok. Subukang muli."</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Na-record na ang pattern"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Muling iguhit ang pattern upang kumpirmahin"</string>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1697,10 +1749,10 @@
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Para palit, pindot Control-Spacebar"</string>
     <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Default"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Mga layout ng keyboard"</string>
-    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal na diksyunaryo"</string>
+    <string name="user_dict_settings_title" msgid="3427169369758733521">"Personal na diksyonaryo"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Magdagdag"</string>
-    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Idagdag sa diksyunaryo"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4702613990174126482">"Idagdag sa diksyonaryo"</string>
     <string name="user_dict_settings_add_screen_title" msgid="742580720124344291">"Parirala"</string>
     <string name="user_dict_settings_add_dialog_more_options" msgid="8848798370746019825">"Higit pang mga pagpipilian"</string>
     <string name="user_dict_settings_add_dialog_less_options" msgid="2441785268726036101">"Mas kaunting pagpipilian"</string>
@@ -1713,7 +1765,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"I-edit ang salita"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"I-edit"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"I-delete"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Wala kang anumang mga salita sa diksyunaryo ng user. Upang magdagdag ng salita, i-tap ang button na Magdagdag (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Wala kang anumang mga salita sa diksyonaryo ng user. Upang magdagdag ng salita, i-tap ang button na Magdagdag (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Para sa lahat ng wika"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Higit pang mga wika..."</string>
     <string name="testing" msgid="6584352735303604146">"Pagsubok"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Mga screen reader, display, kontrol sa pakikipag-ugnayan"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Mga Setting ng Paningin"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Maaari mong i-customize ang device na ito upang maging angkop sa iyong mga pangangailangan. Maaaring baguhin ang mga feature sa accessibility na ito sa ibang pagkakataon sa Mga Setting."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Lakihan ang font"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Mga screen reader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio at text sa screen"</string>
     <string name="display_category_title" msgid="685461049938269166">"Display"</string>
@@ -1867,13 +1920,17 @@
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Walang serbisyong napili"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Walang ibinigay na paglalarawan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mga Setting"</string>
-    <string name="print_settings" msgid="4742428530112487843">"Pagpi-print"</string>
+    <string name="print_settings" msgid="4742428530112487843">"Pag-print"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Naka-off"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
       <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>
-    <string name="print_settings_title" msgid="3685449667822217816">"Mga serbisyo ng pag-print"</string>
+    <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 sa 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>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Mga Setting"</string>
@@ -1939,6 +1996,29 @@
     <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 aktibo 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="4006631636646776488">"Hindi magawa ng iyong teleponong pamahalaan nang normal ang baterya dahil pinapanatiling bukas ng <xliff:g id="APP">%1$s</xliff:g> ang telepono mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang app.\n\nKung patuloy na mangyayari ito, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Hindi magawa ng iyong tablet na pamahalaan nang normal ang baterya dahil pinapanatiling bukas ng <xliff:g id="APP">%1$s</xliff:g> ang tablet mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang app.\n\nKung patuloy na mangyayari ito, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Hindi magawa ng iyong device na pamahalaan nang normal ang baterya dahil pinapanatiling bukas ng <xliff:g id="APP">%1$s</xliff:g> ang device mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang app.\n\nKung patuloy na mangyayari ito, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Hindi magawa ng iyong teleponong pamahalaan nang normal ang baterya dahil palaging wine-wake ng <xliff:g id="APP_0">%1$s</xliff:g> ang telepono mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang <xliff:g id="APP_1">%1$s</xliff:g>.\n\nKung patuloy na mangyayari ito, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Hindi magawa ng iyong tablet na pamahalaan nang normal ang baterya dahil palaging wine-wake ng <xliff:g id="APP_0">%1$s</xliff:g> ang tablet mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang <xliff:g id="APP_1">%1$s</xliff:g>.\n\nKung patuloy na mangyayari ito, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Hindi magawa ng iyong device na pamahalaan nang normal ang baterya dahil palaging wine-wake ng <xliff:g id="APP_0">%1$s</xliff:g> ang device mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang <xliff:g id="APP_1">%1$s</xliff:g>.\n\nKung patuloy na mangyayari ito, 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="6936542136153283692">"I-off ang paggamit sa background at ihinto ang app?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Hindi magawa ng iyong teleponong pamahalaan nang normal ang baterya dahil palaging wine-wake ng <xliff:g id="APP_0">%1$s</xliff:g> ang telepono mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang <xliff:g id="APP_1">%1$s</xliff:g> at pigilan ito sa pagtakbo sa background."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Hindi magawa ng iyong tablet na pamahalaan nang normal ang baterya dahil palaging wine-wake ng <xliff:g id="APP_0">%1$s</xliff:g> ang tablet mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang <xliff:g id="APP_1">%1$s</xliff:g> at pigilan ito sa pagtakbo sa background."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Hindi magawa ng iyong device na pamahalaan nang normal ang baterya dahil palaging wine-wake ng <xliff:g id="APP_0">%1$s</xliff:g> ang device mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang <xliff:g id="APP_1">%1$s</xliff:g> at pigilan ito sa pagtakbo 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="7774807745601479888">"Hindi magawa ng iyong teleponong pamahalaan nang normal ang baterya dahil palaging hinihiling ng <xliff:g id="APP">%1$s</xliff:g> ang lokasyon mo 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="118745801732181618">"Hindi magawa ng iyong tablet na pamahalaan nang normal ang baterya dahil palaging hinihiling ng <xliff:g id="APP">%1$s</xliff:g> ang lokasyon mo 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="6783678153382298295">"Hindi magawa ng iyong device na pamahalaan nang normal ang baterya dahil palaging hinihiling ng <xliff:g id="APP">%1$s</xliff:g> ang lokasyon mo 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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown mula noong huling napuno ang baterya"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Noong huling napuno ang baterya"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Hindi tumpak ang natitirang tagal ng baterya at maaari itong magbago ayon sa paggamit"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Pagtatantya lang ang data ng paggamit ng baterya at maaaring magbago batay sa paggamit"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Habang aktibong ginagamit"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Habang nasa background"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Paggamit ng baterya"</string>
@@ -2320,7 +2401,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobile"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Wala"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Data ng Mobile"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobile data"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"data ng 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"data ng 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Foreground:"</string>
@@ -2333,11 +2414,11 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ang tampok na ito ay maaaring maging sanhi ng pagtigil ng app na nakadepende sa data ng background kapag mga mobile network lang ang available.\n\nMaaari kang makahanap ng higit pang naaangkop na mga kontrol sa paggamit ng data sa mga setting na available sa loob ng app."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"Malilimitahan mo lang ang data ng background kung nagtakda ka ng limitasyon sa mobile data."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"I-on ang pag-auto sync ng data?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web ay awtomatikong makokopya sa iyong tablet.\n\nMaaari ding awtomatikong kopyahin ng ilang account sa web ang anumang mga pagbabagong gagawin mo sa tablet. Gumagana sa ganitong paraan ang isang Google Account."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web ay awtomatikong makokopya sa iyong telepono.\n\nMaaari ding awtomatikong kopyahin ng ilang account sa web ang anumang mga pagbabagong gagawin mo sa telepono. Gumagana sa ganitong paraan ang isang Google Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web ay awtomatikong makokopya sa tablet mo.\n\nMaaari ding awtomatikong kopyahin ng ilang account sa web ang anumang mga pagbabagong gagawin mo sa tablet. Ganito gumagana ang Google Account."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ang anumang mga pagbabagong gagawin mo sa iyong mga account sa web ay awtomatikong makokopya sa telepono mo.\n\nMaaari ding awtomatikong kopyahin ng ilang account sa web ang anumang mga pagbabagong gagawin mo sa telepono. Ganito gumagana ang Google Account."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"I-off ang pag-auto sync ng data?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Mababawasan nito ang paggamit ng data at baterya, ngunit kakailanganin mong manual na i-sync ang bawat account upang kumolekta ng kamakailang impormasyon. At hindi ka makakatanggap ng mga notification kapag naganap ang mga pag-update."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Petsa ng pag-reset ng cycle sa paggamit"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Mababawasan nito ang paggamit ng data at baterya, pero kakailanganin mong manual na i-sync ang bawat account para kumolekta ng kamakailang impormasyon. Hindi ka rin makakatanggap ng notifications kapag may updates."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Petsa ng pag-reset ng yugto ng paggamit"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Petsa ng bawat buwan:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Itakda"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Itakda ang babala sa paggamit ng data"</string>
@@ -2358,7 +2439,7 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gamit, sinukat ng tablet mo. Maaaring iba kwenta sa gamit ng data ng carrier."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gamit, sinukat ng tel mo. Maaaring iba kwenta sa paggamit ng data ng carrier."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Paghihigpit sa network"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Ang mga nakametrong network ay itinuturing na parang mga mobile network kapag pinaghihigpitan ang data ng background. Maaaring magbigay ng babala ang mga app bago gamitin ang mga network na ito para sa malalaking download."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Ang mga nakametrong network ay itinuturing na parang mga mobile network kapag pinaghihigpitan ang data sa background. Maaaring magbigay ng babala ang mga app bago gamitin ang mga network na ito para sa malalaking download."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mga mobile network"</string>
     <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mga nakametrong Wi‑Fi network"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Upang pumili ng mga nakametrong network, i-on ang Wi-FI."</string>
@@ -2498,7 +2579,7 @@
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Maaari mong ibahagi ang device na ito sa iba pang mga tao sa pamamagitan ng paggawa ng mga karagdagang user. Ang bawat user ay may sariling espasyo, na mako-customize niya gamit ang mga app, wallpaper at iba pa. Maaari ding isaayos ng mga user ang mga setting ng device tulad ng Wi‑Fi na makakaapekto sa lahat.\n\nKapag nagdagdag ka ng bagong user, kailangang i-set up ng taong iyon ang kanyang espasyo.\n\nAng sinumang user ay maaaring mag-update ng mga app para sa lahat ng iba pang user."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Kapag nagdagdag ka ng bagong user, kailangang i-set up ng taong iyon ang kanyang espasyo.\n\nAng sinumang user ay maaaring mag-update ng mga app para sa lahat ng iba pang user."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"I-set up ang user ngayon?"</string>
-    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Tiyaking available ang tao na kunin ang device at i-set up ang kanyang espasyo"</string>
+    <string name="user_setup_dialog_message" msgid="1004068621380867148">"Tiyaking available ang tao na kunin ang device at i-set up ang kanyang space"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Mag-set up ng profile ngayon?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"I-set up ngayon"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Huwag ngayon"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2679,7 +2763,7 @@
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"i-project, i-cast"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"espasyo, disk, hard drive, paggamit ng device"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"paggamit ng baterya, pag-charge"</string>
-    <string name="keywords_spell_checker" msgid="1399641226370605729">"pagbabaybay, diksyunaryo, spellcheck, auto-correct"</string>
+    <string name="keywords_spell_checker" msgid="1399641226370605729">"pagbabaybay, diksyonaryo, spellcheck, auto-correct"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"pangkilala, input, pananalita, bigkasin, wika, hands-free, hand free, pagkilala, nakakapanakit, salita, audio, history, bluetooth headset"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"rate, wika, default, sambitin, pagsasalita, tts, pagiging naa-access, screen reader, blind"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"orasan, military"</string>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"i-slide upang i-unlock, password, pattern, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"hamon sa trabaho, trabaho, profile"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"profile sa trabaho, pinamamahalaang profile, pagsamahin, pagsasama, trabaho, profile"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"galaw"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"mga 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_assist_gesture_launch" msgid="813968759791342591">"galaw"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Mula sa mga contact na may star lang"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Wala"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Mga Alarm"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Palaging may priyoridad at tumutunog ang mga alarm"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Mga Paalala"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Mga Kaganapan"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Lahat ng tumatawag"</string>
@@ -2956,7 +3045,7 @@
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Ilagay ang PIN ng admin"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Naka-on"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Naka-off"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Pagpi-pin ng screen"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Pag-pin ng screen"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Kapag na-on setting na ito, makakapag-pin ka ng screen para patuloy na makita kasalukuyang screen hanggang sa i-unpin mo ito.\n\nPara magamit pagpi-pin sa screen:\n\n1. Tiyaking naka-on pagpi-pin sa screen.\n\n2. Buksan screen na ipi-pin.\n\n3. I-tap Pangkalahatang-ideya.\n\n4. Mag-swipe pataas at i-tap icon ng pin."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Humingi ng pattern sa pag-unlock bago mag-unpin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Humingi ng PIN bago mag-unpin"</string>
@@ -2965,19 +3054,14 @@
     <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>
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong pattern 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 pattern upang simulan ang device mo?"</string>
     <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_pattern_for_fingerprint" msgid="932184823193006087">"Bukod sa paggamit sa 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 sa magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong itong maprotektahan ang data sa mga nawawala o nanakaw na device. Humingi ng pattern upang simulan ang iyong device?"</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>
@@ -3095,6 +3179,15 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Mga alerto sa paggamit"</string>
     <string name="show_all_apps" msgid="1512506948197818534">"Ipakita ang 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>
@@ -3187,8 +3280,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>
@@ -3225,7 +3318,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Mar 6:02PM"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Mar 6:03PM"</string>
     <string name="disconnected" msgid="4836600637485526329">"Hindi nakakonekta"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ng data ang ginamit"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ng data ang nagamit"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one">Naka-off para sa <xliff:g id="COUNT">%d</xliff:g> app</item>
       <item quantity="other">Naka-off para sa <xliff:g id="COUNT">%d</xliff:g> na app</item>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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">"Hawakan para i-check ang phone"</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"I-on"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"I-off"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Naka-unlock na ang bootloader"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Awtomatikong i-sync ang data sa trabaho"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Hayaan ang mga app na awtomatikong mag-refresh ng data"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Pag-sync ng account"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Naka-on ang pag-sync para sa <xliff:g id="ID_1">%1$d</xliff:g> sa <xliff:g id="ID_2">%2$d</xliff:g> (na) item"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Naka-on ang pag-sync para sa lahat ng item"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Naka-off ang pag-sync para sa lahat ng item"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Impormasyon ng pinamamahalaang device"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Mga pagbabago at setting na pinamamahalaan ng iyong organisasyon"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Mga pagbabago at setting na pinamamahalaan ng <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Ano ang bago at kapana-panabik?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Tingnan ang nangungunang 5 feature"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Status ng pagpaparehistro ng IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Nakarehistro"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Hindi nakarehistro"</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 482d43a6de17ef2da5f3dafca1f498095b899578..b84b724e699e0fa9e695617d92f13c0124590567 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 8be04140528c1b21025bcbcd1ca7cece15245ab9..7ad5aa3dccc563048e479ee273a23caed010c00a 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şleme isteği"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Eşleme 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ülüyor"</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,39 @@
     <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ı kaldırıp dokundurmaya devam edin"</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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Daha sonra yap"</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 +460,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 +532,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="1688030823464420974">"Bir sonraki denemenizde yanlış desen girerseniz bu cihazın verileri silinecek"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Bir sonraki denemenizde yanlış PIN girerseniz bu cihazın verileri silinecek"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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="5047439819181833824">"Ç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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Kablosuz ağı otomatik olarak aç"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Ev ağınız gibi yüksek kaliteli kayıtlı ağların yakınında olduğunuzda kablosuz özelliği tekrar açılır"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Kablosuz ağ taraması kapalı olduğu için kullanılamıyor"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Bu özelliği kullanmak için ağ derecelendirme sağlayıcısı seçin"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Kötü bağlantılardan kaçın"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"İnternet bağlantısı iyi olmadıkça Kablosuz ağı kullanma"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Yalnızca iyi İnternet bağlantısı olan ağları kullanın"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Açık ağlara bağlan"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Yüksek kaliteli genel ağlara otomatik olarak bağlan"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Herkese açık yüksek kaliteli ağlara otomatik olarak bağlan"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Bu özelliği kullanmak için ağ derecelendirme sağlayıcısı seçin"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Bu özelliği kullanmak için uygun bir ağ derecelendirme sağlayıcısı seçin"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifika yükle"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Konum doğruluğunu iyileştirmek için sistem uygulamaları ve hizmetleri, kablosuz ağları 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Konum doğruluğunu iyileştirmek için <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarama ayarlarında<xliff:g id="LINK_END_1">LINK_END</xliff:g> kablosuz taramayı açın."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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 internet paylaşılmı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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Her zaman açık / Pil kullanımı artar"</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="6978257596231155345">"Saati, bildirim simgelerini ve diğer bilgileri göster. Pil kullanımı artar."</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu cihazda başka kullanıcılar da var.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM\'deki operatörler"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bu işlem mobil hizmet planınızı iptal etmeyecektir."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB belleği sil"</string>
     <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>
@@ -1324,26 +1377,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ş"</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ş"</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\'i kullanın. Yakınlardaki cihazlarla içerik paylaşmak için uygulamalar da 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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekran okuyucular, ekran, etkileşim kontrolleri"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Görüş Ayarları"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bu cihazı gereksinimlerinize uygun şekilde özelleştirebilirsiniz. Bu erişilebilirlik özellikleri daha sonra Ayarlar\'dan değiştirilebilir."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Yazı tipini büyütün"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekran okuyucular"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Ses ve ekran metni"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekran"</string>
@@ -1873,6 +1926,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>
@@ -1939,6 +1996,29 @@
     <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="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> uygulaması telefonunuzu sürekli uyanık tuttuğu için telefonunuz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için uygulamayı durdurabilirsiniz.\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="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> uygulaması tabletinizi sürekli uyanık tuttuğu için tabletiniz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için uygulamayı durdurabilirsiniz.\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="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> uygulaması cihazınızı sürekli uyanık tuttuğu için cihazınız pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için uygulamayı durdurabilirsiniz.\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_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g> uygulaması telefonunuzu sürekli uyandırdığı için telefonunuz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için <xliff:g id="APP_1">%1$s</xliff:g> uygulamasını durdurabilirsiniz.\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_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g> uygulaması tabletinizi sürekli uyandırdığı için tabletiniz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için <xliff:g id="APP_1">%1$s</xliff:g> uygulamasını durdurabilirsiniz.\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_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g> uygulaması cihazınızı sürekli uyanık tuttuğu için cihazınız pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için <xliff:g id="APP_1">%1$s</xliff:g> uygulamasını durdurabilirsiniz.\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="6936542136153283692">"Arka plan kullanımı kapatılsın ve uygulama durdurulsun mu?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> uygulaması telefonunuzu sürekli uyandırdığı için telefonunuz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için <xliff:g id="APP_1">%1$s</xliff:g> uygulamasını durdurabilir ve arka planda çalışmasını engelleyebilirsiniz."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"<xliff:g id="APP_0">%1$s</xliff:g> uygulaması tabletinizi sürekli uyandırdığı için tabletiniz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için <xliff:g id="APP_1">%1$s</xliff:g> uygulamasını durdurabilir ve arka planda çalışmasını engelleyebilirsiniz."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"<xliff:g id="APP_0">%1$s</xliff:g> uygulaması cihazınızı sürekli uyandırdığı için cihazınız pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için <xliff:g id="APP_1">%1$s</xliff:g> uygulamasını durdurabilir ve arka planda çalışmasını engelleyebilirsiniz."</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="7774807745601479888">"<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="118745801732181618">"<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="6783678153382298295">"<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>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Son tam şarj sonrası kullanım dökümü"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Son tam şarj"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Kalan pil süresi yaklaşık bir değerdir ve kullanıma dayalı olarak değişebilir"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Pil kullanımı verileri yaklaşık değerlerdir ve kullanıma dayalı olarak değişebilir"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Etkin kullanımdayken"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Arka plandayken"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Pil kullanımı"</string>
@@ -2151,7 +2232,7 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Kişisel veriler"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Verilerimi yedekle"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Uygulama verilerini, Kablosuz şifrelerini ve diğer ayarları Google sunucularına yedekle"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Yedek hesap"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Yedekleme hesabı"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Uygulama verilerini dahil et"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Otomatik geri yükle"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Bir uygulama yeniden yüklendiğinde, yedeklenen ayarlarını ve verilerini geri yükle"</string>
@@ -2349,7 +2430,7 @@
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Arka plan mobil veri kullanımını kısıtlarsanız kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Arka plan mobil veri kullanımını kısıtlarsanız kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz.\n\nBu ayar, bu tabletteki tüm kullanıcıları etkiler."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Arka plan mobil veri kullanımını kısıtlarsanız kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz.\n\nBu ayar, bu telefondaki tüm kullanıcıları etkiler."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"uyarı"</font></string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"uyarısı"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"sınır"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Kaldırılan uygulamalar"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Kaldırılmış kullanıcılar ve uygulamalar"</string>
@@ -2416,7 +2497,7 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"Profili düzenle"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Profili sil"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Her zaman açık VPN"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"VPN eklenmedi"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Henüz VPN eklenmedi"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"VPN\'ye her zaman bağlı kal"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Bu uygulama tarafından desteklenmiyor"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Her zaman açık ayarı etkin"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"kilidini açmak için kaydırma, şifre, desen, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"iş güvenlik sorusu, iş, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"iş profili, yönetilen profil, birleştir, birleştirme, iş, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"hareket"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"hareketler"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ödeme, dokunma, ödemeler"</string>
     <string name="keywords_backup" msgid="470070289135403022">"yedek, yedekleme"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"hareket"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,6 @@
     <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pencere içinde pencere"</string>
     <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Pencere içinde pencere ö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) pencere içinde pencere 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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Yalnızca yıldızlı kişilerden"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hiçbiri"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmlar"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Alarmlar her zaman öncelikli ve sesli"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Hatırlatıcılar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Etkinlikler"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tüm arayanlar"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3127,7 +3220,7 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu cihazı MIDI olarak kullanın"</string>
     <string name="usb_use" msgid="3256040963685055320">"USB bağlantısının kullanım amacı:"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Bu cihazı şarj etme"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Bu cihazı şarj et"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Güç sağlama"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Dosya aktarma"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Fotoğraf aktarma (PTP)"</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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> öneri 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>
@@ -3296,8 +3398,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>
@@ -3305,7 +3406,7 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Operatörünüzün veri kullanımı hesaplaması, cihazdaki hesaplamadan farklı olabilir"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Veri uyarısı oluşturun"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Veri uyarısı oluştur"</string>
     <string name="data_warning" msgid="209133958008062117">"Veri uyarısı"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Veri sınırı ayarla"</string>
     <string name="data_limit" msgid="1885406964934590552">"Veri sınırı"</string>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,25 +3553,32 @@
     <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">"Bakmak için telefonu kaldır"</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 elinize alın."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için tabletinizi elinize alın."</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ı elinize alın."</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Açık"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Kapalı"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Önyükleyici kilidi zaten açık"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"İş verilerini otomatik olarak senkronize et"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Uygulamaların verileri otomatik olarak yenilemesine izin ver"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Hesap senkronizasyonu"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Senkronizasyon <xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$d</xliff:g> öğe için açık"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Senkronizasyon tüm öğeler için açık"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Senkronizasyon tüm öğeler için kapalı"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Yönetilen cihaz bilgisi"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Kuruluşunuz tarafından yönetilen değişiklikler ve ayarlar"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tarafından yönetilen değişiklikler ve ayarlar"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Yeni ve heyecan verici neler var?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"En önemli 5 özelliği inceleyin"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS kaydı durumu"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Kaydettirildi"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Kaydettirilmedi"</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 4d706ff077a8036323cff2c4990133263747da31..571bf28942b6bb2ae30c4efd58fd2d9ad6d1b5f7 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -52,7 +52,7 @@
     <item msgid="8929270399652145290">"Одразу"</item>
     <item msgid="6736512735606834431">"5 секунд"</item>
     <item msgid="8044619388267891375">"15 секунд"</item>
-    <item msgid="1822002388249545488">"30 сек."</item>
+    <item msgid="1822002388249545488">"30 секунд"</item>
     <item msgid="8538071621211916519">"1 хвилина"</item>
     <item msgid="5663439580228932882">"2 хвилини"</item>
     <item msgid="49888496216106852">"5 хвилин"</item>
@@ -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>
@@ -486,6 +476,6 @@
   <string-array name="automatic_storage_management_days">
     <item msgid="687318592238852312">"Старіші за 30 днів"</item>
     <item msgid="2900554746706302178">"Старіші за 60 днів"</item>
-    <item msgid="5692284879054004388">"Старіші за 90 днів"</item>
+    <item msgid="5692284879054004388">"Додані понад 90 днів тому"</item>
   </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bd86ca9669bc6f5f8847f0fc1f453c4c81185abf..adb318d39195107341a339996f0303eab24e6ce9 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Пізніше"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Пропустити налаштування відбитка?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Ви вибрали відбиток пальця як один зі способів розблокування телефона. Якщо пропустити цей крок зараз, потрібно буде налаштувати відбиток пізніше. Це займає близько хвилини."</string>
     <string name="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 +466,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 +538,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="1688030823464420974">"Якщо наступного разу ви введете неправильний ключ, дані на цьому пристрої буде видалено"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Якщо наступного разу ви введете неправильний PIN-код, дані на цьому пристрої буде видалено"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"Якщо наступного разу ви введете неправильний пароль, дані на цьому пристрої буде видалено"</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="5047439819181833824">"Забагато невдалих спроб. Дані на цьому пристрої буде видалено."</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 +669,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>
@@ -713,11 +742,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Автоматично вмикати Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi вмикатиметься поблизу збережених високоякісних мереж, як-от вашої домашньої мережі"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недоступно, оскільки сканування Wi‑Fi вимкнено"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Щоб увімкнути цю функцію, виберіть постачальника оцінки якості мережі"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Уникати слабких з’єднань"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Не використовувати мережу Wi-Fi, якщо немає стійкого з’єднання з Інтернетом"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Використовувати мережі зі стабільним з’єднанням з Інтернетом"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Під’єднуватися до відкритих мереж"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Автоматично під’єднуватися до високоякісних загальнодоступних мереж"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Щоб увімкнути цю функцію, виберіть постачальника оцінки якості мережі"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Щоб увімкнути цю функцію, виберіть сумісного постачальника оцінки якості мережі"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Установити сертифікати"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Щоб точніше визначати місцеположення, додатки та сервіси системи все одно шукатимуть мережі 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Щоб точніше визначати місцезнаходження, увімкніть сканування Wi-Fi у <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>налаштуваннях сканування<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -801,6 +833,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>
@@ -834,7 +867,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>
@@ -871,9 +903,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>
@@ -920,6 +960,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>
@@ -977,6 +1018,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 +1046,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 +1085,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="7337555569694794132">"Завжди ввімкнено / Підвищене використання заряду"</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="6978257596231155345">"Показувати час, значки сповіщень тощо. Підвищене використання заряду акумулятора."</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 +1346,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>
@@ -1324,12 +1372,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"На цьому пристрої є інші користувачі.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Музика"</li>\n<li>"Фото"</li>\n<li>"Інші дані користувача"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Оператори eSIM-карт"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Ваш тарифний план не буде скасовано."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"носій USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Очистити носій USB"</string>
     <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>
@@ -1352,26 +1405,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>
@@ -1404,7 +1446,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 +1491,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>
@@ -1519,6 +1564,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>
@@ -1562,7 +1610,7 @@
     <string name="ask_compatibility" msgid="7225195569089607846">"Запитувати під час запуску"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Масштабувати програму"</string>
     <string name="unknown" msgid="1592123443519355854">"Невідомо"</string>
-    <string name="sort_order_alpha" msgid="1410278099123670628">"Сортувати за іменем"</string>
+    <string name="sort_order_alpha" msgid="1410278099123670628">"Сортувати за назвою"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Сортувати за розміром"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Показати запущені служби"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Показати кешовані процеси"</string>
@@ -1689,6 +1737,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>
@@ -1787,6 +1839,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Програма зчитування з екрана, дисплей і елементи керування взаємодією"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Спеціальні можливості"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ви можете налаштувати цей пристрій для своїх потреб. Ці спеціальні можливості можна пізніше змінити в налаштуваннях."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Збільшити розмір шрифту"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Програми зчитування з екрана"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудіо та текст на екрані"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
@@ -1915,6 +1968,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 +2040,29 @@
     <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="4006631636646776488">"Телефон не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Планшет не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Пристрій не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Телефон не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP_0">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка <xliff:g id="APP_1">%1$s</xliff:g>.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Планшет не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP_0">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка <xliff:g id="APP_1">%1$s</xliff:g>.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Пристрій не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP_0">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка <xliff:g id="APP_1">%1$s</xliff:g>.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"Припинити роботу додатка"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"Припинити роботу додатка та заборонити фоновий режим?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Телефон не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP_0">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка <xliff:g id="APP_1">%1$s</xliff:g> і заборонити йому працювати у фоновому режимі."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Планшет не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP_0">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка <xliff:g id="APP_1">%1$s</xliff:g> і заборонити йому працювати у фоновому режимі."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Пристрій не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP_0">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка <xliff:g id="APP_1">%1$s</xliff:g> і заборонити йому працювати у фоновому режимі."</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="7774807745601479888">"Телефон не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> запитує ваші геодані, коли ви не користуєтеся ним.\n\nЩоб вирішити цю проблему, вимкніть доступ до геоданих для цього додатка."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Планшет не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> запитує ваші геодані, коли ви не користуєтеся ним.\n\nЩоб вирішити цю проблему, вимкніть доступ до геоданих для цього додатка."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Пристрій не може нормально керувати зарядом акумулятора, оскільки додаток <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 +2077,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>
@@ -2047,12 +2129,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Використання після повного заряджання"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Останнє повне заряджання"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Час роботи акумулятора приблизний і може змінитися залежно від використання пристрою"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Дані про використання акумулятора приблизні та можуть змінюватися залежно від використання"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Поки активно використовується"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"У фоновому режимі"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Використання заряду"</string>
@@ -2323,7 +2406,7 @@
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Використ. даних додатком"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Ваш оператор може по-іншому облікувати дані."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Використання додатка"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ІНФОРМАЦІЯ ПРО ДОДАТОК"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ПРО ДОДАТОК"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Мобільний трафік"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Установити ліміт даних"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Цикл використання даних"</string>
@@ -2614,7 +2697,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>
@@ -2706,9 +2789,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>
@@ -2758,9 +2844,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"розблокувати проведенням пальця, пароль, ключ, PIN-код"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"робоче завдання, робочий, профіль"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"робочий профіль, керований профіль, об’єднати, об’єднання, робота, профіль"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"жест"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"жести"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"оплатити, торкнутися, платежі"</string>
     <string name="keywords_backup" msgid="470070289135403022">"резервна копія, резервне копіювання"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жест"</string>
     <string name="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>
@@ -2845,7 +2932,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 +2948,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 +2981,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>
@@ -2978,6 +3068,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Лише від позначених контактів"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Ні від кого"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будильник"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Будильник завжди важливий і подає звуковий сигнал"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Нагадування"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Події"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Усі абоненти"</string>
@@ -3029,11 +3120,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 +3127,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>
@@ -3167,6 +3253,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>
@@ -3261,8 +3360,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>
@@ -3354,6 +3453,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>
@@ -3361,7 +3473,7 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Щоб застосувати зміни у функції Telephony Monitor, перезапустіть пристрій"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматичне оновлення системи"</string>
     <string name="usage" msgid="2977875522080448986">"Використання"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Використання мобільного трафіку"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Мобільний трафік"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Використання трафіку Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Використання трафіку Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3372,8 +3484,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>
@@ -3397,7 +3508,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>
@@ -3463,8 +3574,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>
@@ -3541,25 +3651,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"Допоміжний жест"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Чутливість"</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="gesture_setting_on" msgid="3455094265233870280">"Увімкнено"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Вимкнено"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Завантажувач уже розблоковано"</string>
@@ -3580,6 +3697,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Автоматично синхронізувати робочі дані"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Дозволити додаткам автоматично оновлювати дані"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Синхронізація облікового запису"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Синхронізацію ввімкнено для стількох елементів: <xliff:g id="ID_1">%1$d</xliff:g> з <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Синхронізацію ввімкнено для всіх елементів"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Синхронізацію вимкнено для всіх елементів"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Інформація про керований пристрій"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Зміни та налаштування, якими керує адміністратор вашої організації"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Зміни та налаштування, якими керує адміністратор організації <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3674,9 +3794,10 @@
     <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>
+    <string name="autofill_app" msgid="7338387238377914374">"Автозаповнення"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматично, заповнювати, автозаповнення"</string>
     <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Переконайтеся, що додаток надійний&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Функція Автозаповнення Google&gt;%1$s&lt;/xliff:g&gt; використовує інформацію на екрані, щоб визначати поля для автозаповнення."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема пристрою"</string>
@@ -3686,6 +3807,12 @@
     <string name="storage_manager_indicator_on" msgid="8625551710194584733">"Увімкнено"</string>
     <string name="install_type_instant" msgid="3174425974536078647">"Додаток із миттєвим запуском"</string>
     <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Вимкнути диспетчер пам’яті?"</string>
-    <string name="storage_movies_tv" msgid="5498394447562086890">"Додатки для перегляду фільмів"</string>
-    <string name="app_info_storage_title" msgid="5554719444625611987">"Використано місця"</string>
+    <string name="storage_movies_tv" msgid="5498394447562086890">"Фільми й серіали"</string>
+    <string name="carrier_provisioning" msgid="4398683675591893169">"Інформація про ініціалізацію оператора"</string>
+    <string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активатор ініціалізації оператора"</string>
+    <string name="new_device_suggestion_title" msgid="698847081680980774">"Що нового та цікавого?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Перегляньте 5 найкращих функцій"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Статус реєстрації IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Зареєстровано"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Не зареєстровано"</string>
 </resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index 5d159c738ae3fcdd1506764582d045b290153cf5..e4b86374f7137222827f9ef684669baab4d966c0 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>
@@ -484,8 +474,8 @@
     <item msgid="6131821495505931173">"سرخ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
-    <item msgid="687318592238852312">"30 دن سے زیادہ پرانا"</item>
-    <item msgid="2900554746706302178">"60 دن سے زیادہ پرانا"</item>
-    <item msgid="5692284879054004388">"90 دن سے زیادہ پرانا"</item>
+    <item msgid="687318592238852312">"30 دن سے زیادہ پرانی"</item>
+    <item msgid="2900554746706302178">"60 دن سے زیادہ پرانی"</item>
+    <item msgid="5692284879054004388">"90 دن سے زیادہ پرانی"</item>
   </string-array>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 6d133e653e012fb7dbee63282e55a77ee9d6c074..621e185a31fa4acbf3d2a1e45e7ad3c3406ec4ce 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,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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"اسے بعد میں کریں"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"فنگر پرنٹ سیٹ اپ نظر انداز کریں؟"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"آپ نے اپنا فون غیر مقفل کرنے کیلئے ایک طریقہ اپنے فنگرپرنٹ کا استعمال منتخب کیا ہے۔ اگر آپ اب نظر انداز کرتے ہیں تو آپ کو اسے بعد میں سیٹ اپ کرنا ہوگا۔ سیٹ اپ میں کم و بیش ایک منٹ کا وقت لگتا ہے۔"</string>
     <string name="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="1688030823464420974">"اگر آپ نے اگلی کوشش میں غلط پیٹرن درج کیا، تو اس آلے کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"‏اگر آپ نے اگلی کوشش میں غلط PIN درج کیا، تو اس آلے کا ڈیٹا حذف کر دیا جائے گا"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"اگر آپ نے اگلی کوشش میں غلط پاس ورڈ درج کیا، تو اس آلے کا ڈیٹا حذف کر دیا جائے گا"</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="5047439819181833824">"بہت زیادہ غلط کوششیں۔ اس آلے کا ڈیٹا حذف کر دیا جائے گا۔"</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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"‏خود کار طور پر Wi‑Fi آن کریں"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"‏آپ کے ہوم نیٹ ورک کی طرح، اعلی معیاری محفوظ نیٹ ورکس کے قریب ہونے پر Wi‑Fi واپس آن ہو جائے گا۔"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‏Wi‑Fi اسکیننگ آف ہونے کی وجہ سے Wi-Fi ویک اپ دستیاب نہیں ہے"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"استعمال کرنے کے لیے، ایک نیٹ ورک درجہ بندی کا فراہم کنندہ منتخب کریں"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"خراب کنکشن سے اجتناب کریں"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"‏Wi‑Fi نیٹ ورک کا تب تک استعمال نہ کریں جب تک ایک اچھا انٹرنیٹ کنکشن موجود نہ ہو"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"صرف اچھے انٹرنیٹ کنکشن والے نیٹ ورکس کا استعمال کریں"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"اوپن نیٹ ورکس سے منسلک ہوں"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"اعلی معیار کے عوامی نیٹ ورکس سے خودکار طور پر منسلک ہوں"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"استعمال کرنے کے لیے، ایک نیٹ ورک درجہ بندی کا فراہم کنندہ منتخب کریں"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"استعمال کرنے کے لیے، ایک مطابقت پذیر نیٹ ورک درجہ بندی کا فراہم کنندہ منتخب کریں"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"سرٹیفکیٹس انسٹال کریں"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"‏مقام کی درستگی کو بہتر بنانے کیلئے، سسٹم ایپس اور سروسز ابھی بھی 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"‏مقام کی درستگی کو بہتر بنانے کیلئے، <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>اسکیننگ ترتیبات<xliff:g id="LINK_END_1">LINK_END</xliff:g> میں Wi-Fi اسکیننگ آن کریں۔"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"ہمیشہ آن/اضافی بیٹری کا استعمال"</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="6978257596231155345">"وقت، اطلاعاتی آئیکنز اور دیگر معلومات دکھائیں۔ اضافی بیٹری کا استعمال۔"</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 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"اس آلہ پر دوسرے صارفین موجود ہیں۔\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"موسیقی"</li>\n<li>"تصاویر"</li>\n<li>"صارف کا دیگر ڈیٹا"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008">"‏"<li>"eSIM پر موجود کیریئرس"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا، "<b>"USB اسٹوریج"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا صاف کرنے کیلئے، "<b>"SD کارڈ"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"‏USB اسٹوریج کو حذف کریں"</string>
     <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>
@@ -1313,37 +1366,26 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"براہ کرم انتظار کریں…"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"کال کی ترتیبات"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"‏صوتی میل، کال فاورڈنگ، کال ویٹنگ، کالر ID کو ترتیب دیں"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏USB ٹیتھرنگ"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏USB ٹیدرنگ"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"پورٹیبل ہاٹ اسپاٹ"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ ٹیتھرنگ"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ٹیتھرنگ"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"ہاٹ اسپاٹ اور ٹیتھرنگ"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ہاٹ اسپاٹ آن، ٹیتھرنگ"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ ٹیدرنگ"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ٹیدرنگ"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"ہاٹ اسپاٹ اور ٹیدرنگ"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ہاٹ اسپاٹ آن، ٹیدرنگ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ہاٹ اسپاٹ آن ہے"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ٹیتھرنگ"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ٹیدرنگ"</string>
     <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="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="usb_tethering_button_text" msgid="585829947108007917">"‏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_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 +1418,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>
@@ -1403,7 +1445,7 @@
     <string name="legal_information" msgid="5769301644270604095">"قانونی معلومات"</string>
     <string name="contributors_title" msgid="5917703088825286504">"معاونین"</string>
     <string name="manual" msgid="3025943393642974445">"مینوئل"</string>
-    <string name="regulatory_labels" msgid="1293050314122427492">"انضباطی لیبلز"</string>
+    <string name="regulatory_labels" msgid="1293050314122427492">"ریگولیٹری لیبلز"</string>
     <string name="safety_and_regulatory_info" msgid="5103161279848427185">"حفاظتی اور انضباطی مینوئل"</string>
     <string name="copyright_title" msgid="865906688917260647">"کاپی رائٹ"</string>
     <string name="license_title" msgid="1990487604356037871">"لائسنس"</string>
@@ -1421,8 +1463,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 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"اسکرین قارئین، ڈسپلے، تعامل کے کنٹرولز"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"بصارتی ترتیبات"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"آپ اس آلہ کو اپنی ضروریات کے مطابق حسب ضرورت بنا سکتے ہیں۔ یہ ایکسیسبیلٹی خصوصیات بعد میں ترتیبات میں تبدیل ہو سکتی ہیں۔"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"فونٹ سائز بڑھائیں"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"قارئین اسکرین"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"آڈیو اور اسکرین پر موجود ٹیکسٹ"</string>
     <string name="display_category_title" msgid="685461049938269166">"ڈسپلے"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"آپ کا فون نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP">%1$s</xliff:g> آپ کے فون کو بیدار رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ ایپ کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"آپ کا ٹیبلیٹ نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP">%1$s</xliff:g> آپ کے ٹیبلیٹ کو بیدار رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ ایپ کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"آپ کا آلہ نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP">%1$s</xliff:g> آپ کے آلے کو بیدار رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ ایپ کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"آپ کا فون نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP_0">%1$s</xliff:g> آپ کے فون کو بیدار کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ <xliff:g id="APP_1">%1$s</xliff:g> کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"آپ کا ٹیبلیٹ نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP_0">%1$s</xliff:g> آپ کے ٹیبلیٹ کو بیدار کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ <xliff:g id="APP_1">%1$s</xliff:g> کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"آپ کا آلہ نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP_0">%1$s</xliff:g> آپ کے آلے کو بیدار کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ <xliff:g id="APP_1">%1$s</xliff:g> کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"ایپ بند کریں"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"پس منظر کا استعمال آف کریں، ایپ روکیں؟"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"آپ کا فون نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP_0">%1$s</xliff:g> آپ کے فون کو بیدار کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ <xliff:g id="APP_1">%1$s</xliff:g> کو روک کر اسے پس منظر میں چلنے سے روک سکتے ہیں۔"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"آپ کا ٹیبلیٹ نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP_0">%1$s</xliff:g> آپ کے ٹیبلیٹ کو بیدار کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ <xliff:g id="APP_1">%1$s</xliff:g> کو روک کر اسے پس منظر میں چلنے سے روک سکتے ہیں۔"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"آپ کا آلہ نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP_0">%1$s</xliff:g> آپ کے آلے کو بیدار کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ <xliff:g id="APP_1">%1$s</xliff:g> کو روک کر اسے پس منظر میں چلنے سے روک سکتے ہیں۔"</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="7774807745601479888">"آپ کا فون نارمل طریقے سے بیٹری کا نظم نہیں کرسکتا کیوںکہ جب آپ ایپ استعمال نہیں کر رہے ہوتے ہیں تو <xliff:g id="APP">%1$s</xliff:g> آپ کے مقام کی درخواست کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ اس ایپ کیلئے مقام کو آف کر سکتے ہیں۔"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"آپ کا ٹیبلیٹ نارمل طریقے سے بیٹری کا نظم نہیں کرسکتا کیوںکہ جب آپ ایپ استعمال نہیں کر رہے ہوتے ہیں تو <xliff:g id="APP">%1$s</xliff:g> آپ کے مقام کی درخواست کرتی رہتی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ اس ایپ کیلئے مقام کو آف کر سکتے ہیں۔"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"آپ کا آلہ نارمل طریقے سے بیٹری کا نظم نہیں کرسکتا کیوںکہ جب آپ ایپ استعمال نہیں کر رہے ہوتے ہیں تو <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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"پچھلے مکمل چارج کے بعد سے تجزیہ"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"پچھلا مکمل چارج"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"باقی بیٹری کا وقت تخمینی ہے اور استعمال کی بنیاد پر تبدیل ہو سکتا ہے"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"بیٹری کے استعمال کا ڈیٹا تخمینی ہے اور استعمال کی بنیاد پر تبدیل ہو سکتا ہے"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"فعال استعمال کے دوران"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"پس منظر کے دوران"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"بیٹری کا استعمال"</string>
@@ -2564,7 +2645,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>
@@ -2652,9 +2733,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>
@@ -2704,9 +2788,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"‏غیر مقفل کرنے کیلئے سلائیڈ کریں، پاس ورڈ، پیٹرن، PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"کام کا چیلنج، کام، پروفائل"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"دفتری پروفائل، منظم پروفائل، یکجا کریں، یکجا کرنا، کام، پروفائل"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"اشارہ"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"اشارے"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"ادائیگی کریں، تھپتھپائیں، ادائیگیاں"</string>
     <string name="keywords_backup" msgid="470070289135403022">"بیک اپ، بیک اپ لیں"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"اشارہ"</string>
     <string name="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>
@@ -2789,7 +2874,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>
@@ -2804,6 +2890,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>
@@ -2831,8 +2921,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>
@@ -2916,6 +3004,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"صرف ستارہ کے نشان والے رابطوں سے"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"کوئی نہیں"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"الارمز"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"الارمز ہمیشہ ترجیحی ہوتے ہیں اور آواز کرتے ہیں"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"یاد دہانیاں"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"ایونٹس"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"تمام کال کرنے والے"</string>
@@ -2963,11 +3052,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>
@@ -2975,7 +3059,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>
@@ -3093,6 +3177,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>
@@ -3125,7 +3218,7 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"‏اس آلہ کو بطور MIDI استعمال کریں"</string>
     <string name="usb_use" msgid="3256040963685055320">"‏USB کو اس لئے استعمال کریں"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"اس آلہ کو چارج کرنا"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"اس آلہ کو چارج کر رہی ہے"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"پاور سپلائی کرنا"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"فائلیں منتقل کرنا"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"‏تصاویر منتقل کرنا (PTP)"</string>
@@ -3185,8 +3278,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>
@@ -3276,6 +3369,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>
@@ -3294,8 +3396,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>
@@ -3304,7 +3405,7 @@
     <string name="operator_warning" msgid="1862988028996859195">"کیریئر ڈیٹا کا حساب آپ کے آلہ کے حساب سے مختلف ہو سکتا ہے"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"ڈیٹا وارننگ سیٹ کریں"</string>
-    <string name="data_warning" msgid="209133958008062117">"ڈیٹا انتباہ"</string>
+    <string name="data_warning" msgid="209133958008062117">"ڈیٹا وارننگ"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"ڈیٹا کی حد سیٹ کریں"</string>
     <string name="data_limit" msgid="1885406964934590552">"ڈیٹا کی حد"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> کے درمیان <xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
@@ -3315,7 +3416,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>
@@ -3379,8 +3480,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>
@@ -3451,25 +3551,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"معاونت کا اشارہ"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"حسّاسیت"</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="gesture_setting_on" msgid="3455094265233870280">"آن"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"آف"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"بوٹ لوڈر پہلے سے غیر مقفل ہے"</string>
@@ -3490,6 +3597,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"خود کار طور پر دفتری ڈیٹا سنک کریں"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"ایپس کو خود کار طور پر ڈیٹا ریفریش کرنے دیں"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"اکاؤنٹ کی مطابقت پذیری"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_2">%2$d</xliff:g> کے <xliff:g id="ID_1">%1$d</xliff:g> آئٹمز کیلئے مطابق پذیری آن ہے"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"تمام آئٹمز کیلئے مطابقت پذیری آن ہے"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"تمام آئٹمز کیلئے مطابقت پذیری آف ہے"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"نظم کردہ آلے کی معلومات"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"آپ کی تنظیم کے ذریعے نظم کردہ ترتیبات اور تبدیلیاں"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> کے ذریعے نظم کردہ ترتیبات اور تبدیلیاں"</string>
@@ -3570,6 +3680,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>
@@ -3583,5 +3694,11 @@
     <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="698847081680980774">"نیا اور دلچسپ کیا ہے؟"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"سرفہرست 5 خصوصیات دیکھیں"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"‏IMS رجسٹریشن کی صورتحال"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"رجسٹر شدہ"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"رجسٹر نہیں ہے"</string>
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index e43e78bd3bef7fae72c7c29c337ca92b9b96c1c5..31c1102041b7db22d67ba3651898165caf21568f 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 0df934ca8d480ed11b7d42a06ed8125dba2df6b8..5dd080525fddfb597fee6b768be7601043df6094 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) -->
@@ -248,7 +260,7 @@
     <string name="dlg_remove_locales_message" msgid="1361354927342876114">"Matn boshqa tilda ko‘rsatiladi."</string>
     <string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Barcha tillarni o‘chirib tashlash mumkin emas"</string>
     <string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"Kamida bitta tilni qoldiring"</string>
-    <string name="locale_not_translated" msgid="516862628177166755">"Ba’zi ilovalarda mavjud bo‘lmasligi mumkin"</string>
+    <string name="locale_not_translated" msgid="516862628177166755">"Ayrim ilovalarda mavjud bo‘lmasligi mumkin"</string>
     <string name="action_drag_label_move_up" msgid="9052210023727612540">"Tepaga siljitish"</string>
     <string name="action_drag_label_move_down" msgid="7448713844582912157">"Pastga siljitish"</string>
     <string name="action_drag_label_move_top" msgid="557081389352288310">"Tepaga o‘tkazish"</string>
@@ -329,7 +341,7 @@
     <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>
+    <string name="security_settings_title" msgid="4918904614964215087">"Xavfsizlik va joylashuv"</string>
     <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 +366,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Keyinroq bajarish"</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="1688030823464420974">"Agar grafik kalitni xato kiritsangiz, bu qurilmadagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Agar PIN kodni xato kiritsangiz, bu qurilmadagi ma’lumotlar o‘chirib tashlanadi"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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="5047439819181833824">"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>
@@ -624,8 +645,16 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Sozlamalar…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Qo‘shimcha"</string>
     <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_empty_list_bluetooth_off" msgid="6351930724051893423">"Yaqin-atrofdagi Bluetooth qurilmalarga ulanish uchun Bluetooth aloqasini yoqing."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Joylashuv axborotining aniqligini oshirish maqsadida tizimga oid ilova va xizmatlar yaqin-atrofdagi Bluetooh qurilmalarni qidiraveradi. Buni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarmoqlarni qidirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali bekor qilishingiz 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>
@@ -671,7 +700,7 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC orqali axborot almashish"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"O‘chiq"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC o‘chiqligi tufayli bajarilmadi"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Faol emas, chunki NFC yoqilmagan"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Bu funksiya qurilmalarni bir-biriga tekkizib, axborot almashish imkonini beradi. Deyarli hamma narsani, jumladan, kontaktlar, veb-sahifa va videolarni uzatish mumkin.\n\nQurilmalarni bir-biriga (odatda, orqama-orqa qilib) yaqinlashtiring va keyin ekran ustiga bosing. Nimani yuborish mumkinligini ilova aniqlaydi."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
@@ -686,19 +715,22 @@
     <string name="wifi_error" msgid="3207971103917128179">"Xatolik"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Siz joylashgan mamlakatda 5 GGs chastota qo‘llab-quvvatlanmaydi"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Uchish rejimida"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Tarmoq bildirishnomasini oching"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Ochiq tarmoqlar haqida bildirishnoma"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Yuqori sifatli ochiq tarmoqlar haqida xabar qilinsin"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi tarmoqni avtomatik yoqish"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Saqlab olingan tarmoqlar (m-n, uy) ichidan signali yaxshisi chiqsa, Wi-Fi qayta yoqilsin"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi tarmoqlarni qidirish o‘chiqligi uchun ishlamaydi"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Foydalanish uchun tarmoqlar reytingi muallifini tanlang"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Sifatsiz ulanishdan chetlashish"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Internet aloqasi yomon bo‘lsa, Wi-Fi tarmog‘iga ulanilmasin"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Faqat kuchli signalga ega tarmoqlardan foydalanilsin"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Ochiq tarmoqlarga ulanish"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Yuqori sifatli ochiq tarmoqlarga avtomatik ulanish"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Foydalanish uchun tarmoqlar reytingi muallifini tanlang"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Foydalanish uchun mos tarmoqlar reytingi muallifini tanlang"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikatlarni o‘rnatish"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Wi-Fi tarmoqlari o‘chirilgan bo‘lsa-da, joylashuv aniqligini oshirish maqsadida tizimga oid ilova va xizmatlar Wi-Fi tarmoqlarini 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Joylashuv aniqligini oshirish uchun <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sozlamalar<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali Wi-Fi tarmoqlarni qidirishni yoqing."</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Joylashuv axborotining aniqligini oshirish maqsadida tizimga oid ilova va xizmatlar Wi-Fi tarmoqlarni qidiraveradi. Buni <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>tarmoqlarni qidirish sozlamalari<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali bekor qilishingiz mumkin."</string>
+    <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Joylashuv axborotining aniqligini oshirish uchun <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>sozlamalar<xliff:g id="LINK_END_1">LINK_END</xliff:g> orqali Wi-Fi tarmoqlarni qidirish xususiyatini yoqing."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Boshqa ko‘rsatilmasin"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Uyqu rejimida Wi-Fi"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Uyqu rejimida Wi-Fi yoniq tursin"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -845,11 +877,19 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Taklif bekor qilinsinmi?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> bilan ulanishga sizga yuborilgan taklifni bekor qilmoqchimisiz?"</string>
     <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_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_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>
@@ -896,6 +936,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>
@@ -953,6 +994,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">"Ekranning avtomatik burilishi"</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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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">"Ekranning avtomatik yonishi"</string>
+    <string name="ambient_display_screen_title" msgid="4252755516328775766">"Ekranning avtomatik yonishi"</string>
+    <string name="ambient_display_screen_summary_always_on" msgid="7337555569694794132">"Doim yoniq (batareya tezroq sarflanadi)"</string>
+    <string name="ambient_display_screen_summary_notifications" msgid="1449570742600868654">"Yangi bildirishnomalar"</string>
+    <string name="ambient_display_category_triggers" msgid="4359289754456268573">"Ekran qachon yonadi"</string>
+    <string name="doze_title" msgid="2375510714460456687">"Yangi bildirishnomalar"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirishnoma kelsa, ekran yonadi"</string>
+    <string name="doze_always_on_title" msgid="1046222370442629646">"Har doim yoniq"</string>
+    <string name="doze_always_on_summary" msgid="6978257596231155345">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni ko‘rsatish (batareya tezroq sarflanadi)"</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>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Bu qurilmada boshqa foydalanuvchilar ham bor.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musiqa"</li>\n<li>"Rasmlar"</li>\n<li>"Foydalanuvchining boshqa ma\'lumotlari"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM uchun aloqa operatorlari"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Bu mobil xizmatining tarif rejasini bekor qilmaydi."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o\'chirish uchun "<b>"USB xotirani"</b>" ham tozalash kerak."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o‘chirish uchun "<b>"SD kartani"</b>" ham tozalash kerak."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB xotirani tozalash"</string>
     <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>
@@ -1324,26 +1377,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">"Telefondagi internetni USB orqali tarqatish"</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">"Telefondagi internetni Bluetooth orqali tarqatish"</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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1491,6 +1536,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 ilovalar (<xliff:g id="COUNT">%1$d</xliff:g>)"</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>
@@ -1659,6 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrandan o‘qish vositalari, displey, o‘zaro aloqa boshqaruv elementlari"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Maxsus imkoniyatlar"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Qurilmangizdan qulay foydalanish uchun maxsus imkoniyatlardan foydalaning. Bu parametrlarni keyinroq sozlamalar orqali o‘zgartirish mumkin."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Shrift o‘lchamini kattalashtirish"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Ekrandan o‘qish vositalari"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audio va ekrandagi matn"</string>
     <string name="display_category_title" msgid="685461049938269166">"Ekran"</string>
@@ -1873,6 +1926,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>
@@ -1945,6 +2002,29 @@
     <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">"Ortiqcha quvvat sarflayotgan ilovalar"</string>
+    <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Qurilma uyqu rejimiga kirmaydi"</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 yopilsinmi?"</string>
+    <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"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="2369957934555162428">"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="6195430620406365292">"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_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Telefoningiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP_0">%1$s</xliff:g> ilovasi telefoningizni uyg‘otmoqda.\n\nBu muammoni tuzatish uchun <xliff:g id="APP_1">%1$s</xliff:g> ilovasini to‘xtatib ko‘ring.\n\nAgar bu yana takrorlansa, batareya quvvati unumdorligini oshirish uchun ilovani o‘chirib tashlashingiz lozim bo‘ladi."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Planshetingiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP_0">%1$s</xliff:g> ilovasi planshetingizni uyg‘otmoqda.\n\nBu muammoni tuzatish uchun <xliff:g id="APP_1">%1$s</xliff:g> ilovasini to‘xtatib ko‘ring.\n\nAgar bu yana takrorlansa, batareya quvvati unumdorligini oshirish uchun ilovani o‘chirib tashlashingiz lozim bo‘ladi."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Qurilmangiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP_0">%1$s</xliff:g> ilovasi qurilmangizni uyg‘otmoqda.\n\nBu muammoni tuzatish uchun <xliff:g id="APP_1">%1$s</xliff:g> ilovasini to‘xtatib ko‘ring.\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="6936542136153283692">"Fonda ishlashi taqiqlanib, ilova to‘xtatilsinmi?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Telefoningiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP_0">%1$s</xliff:g> ilovasi telefoningizni uyg‘otmoqda.\n\nBu muammoni <xliff:g id="APP_1">%1$s</xliff:g> ilovasini to‘xtatib, fonda ishlashining oldini olish orqali tuzatishingiz mumkin."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Planshetingiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP_0">%1$s</xliff:g> ilovasi planshetingizni uyg‘otmoqda.\n\nBu muammoni <xliff:g id="APP_1">%1$s</xliff:g> ilovasini to‘xtatib, fonda ishlashining oldini olish orqali tuzatishingiz mumkin."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Qurilmangiz batareyani normal boshqara olmayapti, chunki <xliff:g id="APP_0">%1$s</xliff:g> ilovasi qurilmangizni uyg‘otmoqda.\n\nBu muammoni <xliff:g id="APP_1">%1$s</xliff:g> ilovasini to‘xtatib, fonda ishlashining oldini olish orqali tuzatishingiz mumkin."</string>
+    <string name="dialog_background_check_ok" msgid="412876934682899659">"Faolsizlantirish"</string>
+    <string name="dialog_location_title" msgid="5888917530725874727">"Joylashuv axborotiga kirish taqiqlansinmi?"</string>
+    <string name="dialog_location_message" product="default" msgid="7774807745601479888">"Batareya quvvati juda tez sarflanmoqda, chunki <xliff:g id="APP">%1$s</xliff:g> ishlatilmayotgan vaqtda ham joylashuv axborotini olib turibdi.\n\nBu muammoni tuzatish uchun ushbu ilovaga joylashuv axborotini olishni taqiqlang."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Batareya quvvati juda tez sarflanmoqda, chunki <xliff:g id="APP">%1$s</xliff:g> ishlatilmayotgan vaqtda ham joylashuv axborotini olib turibdi.\n\n1Bu muammoni tuzatish uchun ushbu ilovaga joylashuv axborotini olishni taqiqlang."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Batareya quvvati juda tez sarflanmoqda, chunki <xliff:g id="APP">%1$s</xliff:g> ishlatilmayotgan vaqtda ham joylashuv axborotini olib turibdi.\n\nBu muammoni tuzatish uchun ushbu ilovaga joylashuv axborotini olishni taqiqlang."</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>
@@ -1959,7 +2039,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>
@@ -2011,6 +2091,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>
@@ -2020,7 +2101,7 @@
     <!-- String.format failed for translation -->
     <!-- no translation found for battery_last_full_charge (7151251641099019361) -->
     <skip />
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Batareyaning qolgan vaqti taxminiy va u foydalanish intensivligiga qarab farq qilishi mumkin"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Batareyaning qolgan vaqti taxminiy va u foydalanish intensivligiga qarab farq qilishi mumkin"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Faol rejimda"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Fon rejimida"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batareya sarfi"</string>
@@ -2295,7 +2376,7 @@
     <string name="data_usage_app" msgid="4970478397515423303">"Ilovalar"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"ILOVA HAQIDA"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobil internet"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"Internet uchun cheklov o‘rnatish"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"Trafik cheklovini belgilash"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Trafik sarfi davri"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Ilovalar"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Internet-rouming"</string>
@@ -2352,8 +2433,8 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Trafik sarfini yangilash sanasi"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Har oylik sana:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Saqlash"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Trafik sarfiga ogohlantirish o‘rnatish"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Trafik sarfiga cheklov o‘rnatish"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Trafik sarfiga oid ogohlantirish"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Trafik cheklovini belgilash"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Trafik sarfini cheklash"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Siz o‘rnatgan cheklovga yetib kelgach, planshetingizdagi mobil internet o‘chadi.\n\nBunda, internetdan foydalanish miqdori telefoningiz tomonidan hisoblangani uchun aloqa operatoringizning hisob-kitoblari undan farq qilishi mumkin. Shuning uchun, cheklov qo‘yishda zaxira miqdorini ham e’tiborga oling."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Siz o‘rnatgan cheklovga yetib kelgach, telefoningizdagi mobil internet o‘chadi.\n\nBunda, internetdan foydalanish miqdori telefoningiz tomonidan hisoblangani uchun aloqa operatoringizning hisob-kitoblari undan farq qilishi mumkin. Shuning uchun, cheklov qo‘yishda zaxira miqdorini ham e’tiborga oling."</string>
@@ -2576,7 +2657,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>
@@ -2666,9 +2747,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>
@@ -2718,9 +2802,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"qulfni ochish uchun surish, parol, grafik kalit, PIN kod"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ish vazifasi, ish, profil"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"ishchi profil, boshqariluvchi profil, birlashtirish, birlashuv, ish, profil"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"imo-ishora orqali matn kiritish"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"imo-ishoralar"</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_assist_gesture_launch" msgid="813968759791342591">"imo-ishora"</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>
@@ -2803,7 +2888,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>
@@ -2818,6 +2904,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 ruxsat"</string>
     <string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"Ishchi profil bildirishnomalariga kirish taqiqlangan"</string>
@@ -2845,8 +2935,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 rejimi"</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>
@@ -2930,6 +3018,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Faqat yulduzchali kontaktlardan"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hech kimdan"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Signallar"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Signallar doim muhim va ovozsiz qilib bo‘lmaydi"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Eslatmalar"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Tadbirlar"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Barcha abonentlar"</string>
@@ -2977,11 +3066,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>
@@ -2989,7 +3073,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>
@@ -3087,7 +3171,7 @@
     <string name="default_app" msgid="6864503001385843060">"(birlamchi)"</string>
     <string name="system_app" msgid="9068313769550747372">"(tizim)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(birlamchi)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Ilovalar xotirasi"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Ilovalar egallagan joy"</string>
     <string name="usage_access" msgid="5479504953931038165">"Foydalanish tarixiga kirish"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Foydalanish tarixiga kirishga ruxsat berish"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Ilovadan foydalanish sozlamalari"</string>
@@ -3107,6 +3191,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 noodatiy ishlayapti</item>
+      <item quantity="one"><xliff:g id="APP">%1$s</xliff:g> noodatiy 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>
@@ -3125,15 +3218,15 @@
     <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"Administratoringiz bu qurilma nosozliklarini tuzatish uchun xatoliklar hisobotini so‘ramoqda. Ilova va ma’lumotlardan foydalanilishi mumkin."</string>
     <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"Administratoringiz bu qurilma nosozliklarini tuzatish uchun xatoliklar hisobotini so‘ramoqda. Ilova va ma’lumotlardan foydalanilishi va bu vaqtincha qurilmangizni sekinlashtirishi ham mumkin."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"Ushbu xatoliklar hisoboti administratoringiz tomonidan yuborilmoqda. Batafsil ma’lumot olish uchun administratoringiz bilan bog‘laning."</string>
-    <string name="share_remote_bugreport_action" msgid="532226159318779397">"Baham ko‘rish"</string>
+    <string name="share_remote_bugreport_action" msgid="532226159318779397">"Ulashish"</string>
     <string name="decline_remote_bugreport_action" msgid="518720235407565134">"Rad etish"</string>
     <string name="usb_use_charging_only" msgid="2180443097365214467">"Shu qurilmani quvvatlash"</string>
     <string name="usb_use_charging_only_desc" msgid="3066256793008540627">"Faqat shu qurilmani quvvatlash"</string>
     <string name="usb_use_power_only" msgid="6426550616883919530">"Quvvat uzatish"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"Boshqa ulangan qurilmani quvvatlash. Faqat USB orqali quvvatlash mumkin bo‘lgan qurilmalarda ishlaydi."</string>
-    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Fayl o‘tkazish"</string>
+    <string name="usb_use_file_transfers" msgid="7409600791007250137">"Fayl uzatish"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"Boshqa qurilmaga fayl o‘tkazish"</string>
-    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Suratlarni o‘tkazish (PTP)"</string>
+    <string name="usb_use_photo_transfers" msgid="7794775645350330454">"Rasm uzatish (PTP)"</string>
     <string name="usb_use_photo_transfers_desc" msgid="2963034811151325996">"Agar MTP qo‘llab-quvvatlanmasa, surat yoki fayllarni o‘tkazish (PTP)"</string>
     <string name="usb_use_MIDI" msgid="870922185938298263">"MIDI sifatida foydalanish"</string>
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Bu qurilmadan MIDI sifatida foydalanish"</string>
@@ -3142,7 +3235,7 @@
     <string name="usb_summary_charging_only" msgid="7544327009143659751">"Shu qurilmani quvvatlash"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Quvvat uzatish"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Fayllarni o‘tkazish"</string>
-    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Suratlarni o‘tkazish (PTP)"</string>
+    <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Rasm uzatish (PTP)"</string>
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"MIDI sifatida foydalanish"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Fonda tekshirish"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Butun fonga ruxsat"</string>
@@ -3199,8 +3292,8 @@
     <string name="overlay_settings" msgid="6930854109449524280">"Boshqa ilovalar ustidan ochilish"</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‘zgartirish"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"tizim sozlamalarini o‘zgartirish"</string>
@@ -3290,6 +3383,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>
@@ -3297,19 +3399,18 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telefoniya nazoratiga o‘zgartirish kiritish uchun qurilmani o‘chirib yoqing"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Avtomatik tizim yangilanishlari"</string>
     <string name="usage" msgid="2977875522080448986">"Trafik sarfi"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Mobil internet trafigi sarfi"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Mobil internet-trafik"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi trafik sarfi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet ma’lumotlari sarfi"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> mobil internet trafigi"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> mobil trafik"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"Wi-Fi orqali sarflangan trafik: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"Ethernet orqali sarflangan trafik: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <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" msgid="5169909190811133499">"Hisob-kitob davri"</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>
@@ -3317,10 +3418,10 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Trafik sarfiga ogohlantirish o‘rnatish"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Trafik sarfiga oid ogohlantirish"</string>
     <string name="data_warning" msgid="209133958008062117">"Ogohlantirishlar"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"Trafik cheklovini o‘rnatish"</string>
-    <string name="data_limit" msgid="1885406964934590552">"Trafik cheklovini o‘rnatish"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"Trafik cheklovini belgilash"</string>
+    <string name="data_limit" msgid="1885406964934590552">"Trafik cheklovi"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_2">%2$s</xliff:g> oraliqda <xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
     <string name="configure" msgid="1029654422228677273">"Sozlash"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Foydalanilayotgan boshqa ilovalar"</string>
@@ -3329,7 +3430,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">"Cheklanmagan mobil internet"</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>
@@ -3393,8 +3494,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>
@@ -3465,25 +3565,32 @@
     <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">"Bildirishnomalarni tekshirish uchun ko‘tarish"</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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Yoniq"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"O‘chiq"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"OT yuklagich allaqachon qulfdan chiqarilgan"</string>
@@ -3504,6 +3611,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Ishchi ma’lumotlarni avtomatik sinxronlash"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Ilovalarga ma’lumotlarni avtomatik yangilashiga ruxsat berish"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Hisobni sinxronlash"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Sinxronizatsiya <xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$d</xliff:g> ta narsa uchun yoniq"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Sinxronizatsiya hamma narsa uchun yoniq"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Sinxronizatsiya hamma narsa uchun o‘chiq"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Boshqariluvchi qurilma ma’lumotlari"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"O‘zgartirishlar va sozlamalar tashkilotingiz tomonidan boshqariladi"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"O‘zgartirishlar va sozlamalar <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tomonidan boshqariladi"</string>
@@ -3572,7 +3682,7 @@
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="4309216198909946380">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
-    <string name="storage_photos_videos" msgid="319854636702241898">"Surat va videolar"</string>
+    <string name="storage_photos_videos" msgid="319854636702241898">"Suratlar va videolar"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"Musiqa va audio"</string>
     <string name="storage_games" msgid="7703159201697117621">"O‘yinlar"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"Boshqa ilovalar"</string>
@@ -3584,6 +3694,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>
@@ -3597,5 +3708,11 @@
     <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="698847081680980774">"Nima yangi va qiziqarli narsalar bor?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Eng sara 5 ta xususiyati bilan tanishing"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS registratsiyasi holati"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Registratsiya qilingan"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Registratsiya qilinmagan"</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 3856fc08a90bfd967fb1464ee5f2f8bac0361dd4..641f6ed7d2c13455a518c283d753333a54d774df 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 66a148ff6fb79e2469917605feb16c9bf5c165ad..9b24f2cf11937eedb0782f89f377b37041780ac6 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) -->
@@ -203,7 +215,7 @@
     <string name="radio_info_band_mode_label" msgid="8730871744887454509">"Chọn dải tần số"</string>
     <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"Loại mạng thoại:"</string>
     <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"Loại mạng dữ liệu:"</string>
-    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Đặt loại mạng ưa thích:"</string>
+    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Đặt loại mạng ưu tiên:"</string>
     <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"Tên máy chủ Ping (www.google.com) IPv4:"</string>
     <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"Tên máy chủ Ping (www.google.com) IPv6:"</string>
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"Kiểm tra máy khách HTTP:"</string>
@@ -294,7 +306,7 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ngày &amp; giờ"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Đặt ngày giờ"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Đặt ngày, giờ, múi giờ &amp; định dạng"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Ngày &amp; giờ tự động"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Ngày và giờ tự động"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Sử dụng thời gian do mạng cung cấp"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Sử dụng thời gian do mạng cung cấp"</string>
     <string name="zone_auto" msgid="334783869352026648">"Múi giờ tự động"</string>
@@ -314,24 +326,24 @@
     <string name="time_picker_title" msgid="483460752287255019">"Thời gian"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"Tự động khóa"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sau khi ngủ"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Ngay sau khi ngủ, trừ khi được <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> mở khóa"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sau khi ngủ, trừ khi vẫn mở khóa bởi <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Ngay sau khi chuyển sang chế độ ngủ, trừ khi vẫn được <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> mở khóa"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> sau khi sang chế độ ngủ, trừ khi vẫn được <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g> mở khóa"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Hiển thị thông tin chủ sở hữu trên màn hình khóa"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Thông báo màn hình khóa"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Bật tiện ích con"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Bị quản trị viên vô hiệu hóa"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Không có"</string>
     <string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
-    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Ví dụ: Android của Joe."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Ví dụ: Android của Huy."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Thông tin người dùng"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Hiển thị thông tin tiểu sử trên màn hình khóa"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Thông tin hồ sơ"</string>
     <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 và 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="default" msgid="8721883002237981248">"Đã mã hóa điện thoại"</string>
     <string name="encryption_and_credential_settings_summary" product="tablet" msgid="7200428573872395685">"Thiết bị được mã hóa"</string>
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Tùy chọn màn hình khóa"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
@@ -354,44 +366,43 @@
     <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">"Cảm biến nằm ở mặt sau của điện thoại. Hãy dùng ngón tay trỏ của bạn."</string>
     <string name="security_settings_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 mua hàng."</string>
+    <string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Thực hiện sau"</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>
-    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Thêm khác"</string>
+    <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Thêm vân tay khác"</string>
     <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Tiếp theo"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Ngoài việc mở khóa điện thoại, bạn còn có thể sử dụng vân tay của mình để ủy quyền mua và truy cập ứng dụng. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Tùy chọn khóa màn hình đã bị tắt. Hãy liên hệ với quản trị viên của tổ chức bạn để tìm hiểu thêm. "<annotation id="admin_details">"Thông tin chi tiết khác"</annotation>\n\n"Bạn vẫn có thể sử dụng vân tay của mình để ủy quyền mua hàng và truy cập ứng dụng. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
@@ -449,6 +460,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 +532,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="1688030823464420974">"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 trên thiết bị này sẽ bị xóa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"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 trên thiết bị này sẽ bị xóa"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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 trên 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="5047439819181833824">"Quá nhiều lần thử không chính xác. Dữ liệu trên 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>
@@ -571,8 +592,8 @@
     <string name="manage_device_admin" msgid="537804979483211453">"Ư.dụng cho quản trị viên th.bị"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Không có ứng dụng nào hiện hoạt"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ứng dụng hiện hoạt</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ứng dụng hiện hoạt</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ứng dụng đang hoạt động</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ứng dụng đang hoạt động</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Tác nhân đáng tin cậy"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Để sử dụng, trước tiên hãy đặt khóa màn hình"</string>
@@ -626,6 +647,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>
@@ -671,9 +700,9 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Sẵn sàng truyền tải nội dung ứng dụng qua NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Tắt"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Không khả dụng vì NFC bị tắt"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Không sử dụng được vì NFC bị tắt"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Khi tính năng này được bật, bạn có thể chiếu nội dung ứng dụng tới thiết bị hỗ trợ NFC khác bằng cách giữ các thiết bị gần nhau. Ví dụ: bạn có thể chiếu các trang web, video trên YouTube, danh bạ và nhiều nội dung khác.\n\nBạn chỉ cần đưa các thiết bị lại gần nhau (thường quay lưng vào nhau) rồi nhấn vào màn hình. Ứng dụng sẽ quyết định nội dung nào được chiếu."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Khi tính năng này được bật, bạn có thể truyền nội dung ứng dụng tới một thiết bị hỗ trợ NFC khác bằng cách giữ các thiết bị gần nhau. Ví dụ: bạn có thể truyền các trang web, video trên YouTube, liên hệ và nhiều nội dung khác.\n\nBạn chỉ cần đưa các thiết bị lại gần nhau (thường là chạm lưng vào nhau) rồi nhấn vào màn hình. Ứng dụng sẽ quyết định nội dung nào được truyền."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Bật Wi‑Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Tự động bật Wi-Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi sẽ bật lại khi ở gần các mạng đã lưu chất lượng cao, chẳng hạn như mạng gia đình của bạn"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Không khả dụng vì tính năng quét tìm Wi‑Fi đang tắt"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Để sử dụng, hãy chọn một nhà cung cấp dịch vụ xếp hạng mạng"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Tránh kết nối kém"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Không sử dụng mạng Wi‑Fi trừ khi mạng này có kết nối Internet tốt"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Chỉ sử dụng mạng có kết nối Internet tốt"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Kết nối với mạng mở"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Tự động kết nối với mạng công cộng chất lượng cao"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Để sử dụng, hãy chọn một nhà cung cấp dịch vụ xếp hạng mạng"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Để sử dụng, hãy chọn một nhà cung cấp dịch vụ xếp hạng mạng tương thích"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Cài đặt chứng chỉ"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Để 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 quét để tìm mạng Wi‑Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Để nâng cao độ chính xác về vị trí, hãy bật quét tìm Wi-Fi 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>
@@ -715,7 +747,7 @@
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi-Fi bật lại tự động"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi-Fi không bật lại tự động"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Mạng Wi‑Fi"</string>
-    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Nút Đẩy WPS"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Nút nhấn WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Tùy chọn khác"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Nhập mã pin WPS"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
@@ -727,7 +759,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Bỏ qua mạng"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Sửa đổi mạng"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Ghi vào thẻ NFC"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Để xem các mạng khả dụng, hãy bật Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Để xem các mạng có thể kết nối, hãy bật Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Đang tìm kiếm mạng Wi‑Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Bạn không có quyền thay đổi mạng Wi‑Fi."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Thêm"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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 sáng"</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="7337555569694794132">"Luôn bật / Làm tiêu hao nhiều pin hơn"</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="6978257596231155345">"Hiển thị thời gian, biểu tượng thông báo và các thông tin khác. Làm tiêu hao nhiều pin hơn."</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>
@@ -1067,13 +1114,13 @@
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Phiên bản Android"</string>
     <string name="security_patch" msgid="8438384045870296634">"Mức bản vá bảo mật của Android"</string>
-    <string name="model_info" msgid="1952009518045740889">"Kiểu"</string>
-    <string name="hardware_info" msgid="2605080746512527805">"Kiểu máy &amp; phần cứng"</string>
+    <string name="model_info" msgid="1952009518045740889">"Kiểu máy"</string>
+    <string name="hardware_info" msgid="2605080746512527805">"Kiểu máy và phần cứng"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"Phiên bản phần cứng"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"ID thiết bị"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Phiên bản dải tần cơ sở"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Phiên bản Kernel"</string>
-    <string name="build_number" msgid="3075795840572241758">"Số phiên bản"</string>
+    <string name="build_number" msgid="3075795840572241758">"Số bản dựng"</string>
     <string name="selinux_status" msgid="6212165375172061672">"Trạng thái SELinux"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Không khả dụng"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Trạng thái"</string>
@@ -1273,12 +1320,13 @@
     <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>
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Đặt lại"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Đã đặt lại cài đặt mạng"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Tác vụ này sẽ đặt lại tất cả cài đặt mạng, bao gồm:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dữ liệu di động"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="5547979398298881406">"Thao tác này sẽ đặt lại tất cả cài đặt mạng, bao gồm:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dữ liệu di động"</li>\n<li>"Bluetooth"</li></string>
     <string name="reset_network_button_text" msgid="2035676527471089853">"Đặt lại cài đặt"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Đặt lại tất cả cài đặt mạng? Bạn không thể hoàn tác thao tác này!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Đặt lại cài đặt"</string>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Có người dùng khác trên thiết bị này.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu người dùng khác"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Nhà cung cấp dịch vụ trên eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Điều này sẽ không hủy gói dịch vụ di động của bạn."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"bộ lưu trữ USB"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Đồng thời, để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"thẻ SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Xóa bộ nhớ USB"</string>
     <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>
@@ -1324,26 +1377,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. Các ứ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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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>
@@ -1468,7 +1513,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Hiển thị hình mở khóa hồ sơ"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Rung khi nhấn"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Nút Nguồn khóa tức thì"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Trừ khi vẫn mở khóa bởi <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Trừ khi vẫn được <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> mở khóa"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Đặt hình mở khóa"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Thay đổi hình mở khóa"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Cách vẽ hình mở khóa"</string>
@@ -1491,6 +1536,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">"<xliff:g id="TIME">^1</xliff:g> trước"</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>
@@ -1659,6 +1707,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>
@@ -1754,9 +1806,10 @@
     <string name="usage_time_label" msgid="295954901452833058">"Thời gian sử dụng"</string>
     <string name="accessibility_settings" msgid="3975902491934816215">"Trợ năng"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Cài đặt trợ năng"</string>
-    <string name="accessibility_settings_summary" msgid="981260486011624939">"Trình đọc màn hình, màn hình, điều khiển tương tác"</string>
+    <string name="accessibility_settings_summary" msgid="981260486011624939">"Trình đọc màn hình, màn hình, tương tác"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Cài đặt hiển thị"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Bạn có thể tùy chỉnh thiết bị này cho phù hợp với nhu cầu của mình. Bạn có thể thay đổi các tính năng trợ năng này sau trong Cài đặt."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Tăng kích thước phông chữ"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Trình đọc màn hình"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Âm thanh và văn bản trên màn hình"</string>
     <string name="display_category_title" msgid="685461049938269166">"Màn hình"</string>
@@ -1768,9 +1821,9 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Nhấn vào mục trên màn hình của bạn để nghe mục được đọc to"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Phụ đề"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Phóng to"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Phóng đại bằng cách nhấn 3 lần"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Phóng to bằng cách nhấn 3 lần"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Phóng đại bằng nút"</string>
-    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Phóng đại bằng nút và nhấn ba lần"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Phóng to bằng nút và nhấn ba lần"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Phóng to trên màn hình"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Nhấn 3 lần để thu phóng"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Nhấn vào nút để thu phóng"</string>
@@ -1870,8 +1923,12 @@
     <string name="print_settings" msgid="4742428530112487843">"In"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Tắt"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
-      <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>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> dịch vụ in đang bật</item>
+      <item quantity="one">1 dịch vụ in đang 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>
@@ -1939,12 +1996,35 @@
     <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="4006631636646776488">"Đ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> liên tục để điện thoại ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn 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="2369957934555162428">"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> liên tục để máy tính bảng ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn 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="6195430620406365292">"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> liên tục để thiết bị ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn 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_wakeup_alarm" product="default" msgid="1638726742782558262">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục để điện thoại ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g>.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn 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_wakeup_alarm" product="tablet" msgid="8771690983566539742">"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_0">%1$s</xliff:g> liên tục để máy tính bảng ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g>.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn 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_wakeup_alarm" product="device" msgid="2854944538238649520">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục để thiết bị ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g>.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn 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="6936542136153283692">"Tắt sử dụng trong nền và dừng ứng dụng?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục bật điện thoại của bạn.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g> và không cho ứng dụng này chạy trong nền."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"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_0">%1$s</xliff:g> liên tục bật máy tính bảng của bạn.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g> và không cho ứng dụng này chạy trong nền."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Thiết bị của bạn không thể quản lý pin bình thường vì <xliff:g id="APP_0">%1$s</xliff:g> liên tục bật thiết bị của bạn.\n\nĐể khắc phục sự cố này, bạn có thể dừng <xliff:g id="APP_1">%1$s</xliff:g> và không cho ứ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="7774807745601479888">"Đ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> liên tục 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="118745801732181618">"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> liên tục 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="6783678153382298295">"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> liên tục 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>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="3392999761958982492">"Chờ mạng di động"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mạng di động ở chế độ chờ"</string>
     <string name="power_phone" msgid="5392641106474567277">"Cuộc gọi thoại"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Máy tính bảng ở chế độ rảnh"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
@@ -1953,7 +2033,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>
@@ -2005,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Chi tiết từ lần sạc đầy gần đây nhất"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Lần sạc đầy gần đây nhất"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Thời gian sử dụng pin còn lại chỉ mang tính tương đối và có thể thay đổi tùy theo mức sử dụng"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Dữ liệu về mức sử dụng pin chỉ mang tính tương đối và có thể thay đổi tùy theo mức sử dụng"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Khi đang sử dụng"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Khi ở chế độ nền"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Mức sử dụng pin"</string>
@@ -2336,12 +2417,12 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Mọi thay đổi bạn thực hiện đối với các tài khoản trên web sẽ được tự động sao chép sang máy tính bảng của bạn.\n\nMột số tài khoản cũng có thể tự động đồng bộ hóa lên web mọi thay đổi bạn thực hiện trên máy tính bảng. Tài khoản Google hoạt động theo cách này."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Mọi thay đổi bạn thực hiện đối với các tài khoản trên web sẽ được tự động sao chép sang điện thoại của bạn.\n\nMột số tài khoản cũng có thể tự động đồng bộ hóa lên web mọi thay đổi bạn thực hiện trên điện thoại. Tài khoản Google hoạt động theo cách này."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Tắt tính năng tự động đồng bộ hóa dữ liệu?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Việc này sẽ bảo toàn mức sử dụng dữ liệu và pin, tuy nhiên bạn sẽ cần phải đồng bộ hóa từng tài khoản theo cách thủ công để thu thập thông tin gần đây. Và bạn sẽ không nhận được thông báo khi có cập nhật."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Việc này sẽ bảo toàn mức sử dụng dữ liệu và pin, tuy nhiên bạn sẽ cần phải đồng bộ hóa từng tài khoản theo cách thủ công để thu thập thông tin gần đây. Ngoài ra, bạn sẽ không nhận được thông báo khi có cập nhật."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ngày đặt lại chu kỳ sử dụng"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ngày của từng tháng:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Thiết lập"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Thiết lập cảnh báo sử dụng dữ liệu"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Thiết lập giới hạn sử dụng dữ liệu"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Đặt cảnh báo sử dụng dữ liệu"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Đặt giới hạn sử dụng dữ liệu"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Giới hạn sử dụng dữ liệu"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Máy tính bảng của bạn sẽ tắt dữ liệu di động khi đạt đến giới hạn bạn đặt.\n\nDo việc sử dụng dữ liệu được máy tính bảng của bạn tính và nhà cung cấp dịch vụ có thể tính mức sử dụng khác nhau nên hãy xem xét việc đặt giới hạn vừa phải."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Điện thoại của bạn sẽ tắt dữ liệu di động khi đạt đến giới hạn bạn đặt.\n\nDo việc sử dụng dữ liệu được điện thoại của bạn tính và nhà cung cấp dịch vụ có thể tính mức sử dụng khác nhau nên hãy xem xét việc đặt giới hạn vừa phải."</string>
@@ -2358,10 +2439,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng, giá trị này được máy tính bảng của bạn đo. Việc tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng, giá trị này được điện thoại của bạn đo. Việc tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Hạn chế của mạng"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Mạng được kiểm soát được coi như mạng di động khi dữ liệu nền bị hạn chế. Các ứng dụng có thể cảnh báo trước khi sử dụng các mạng này để tải xuống dung lượng lớn."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Mạng có đo lượng dữ liệu được coi như mạng di động khi dữ liệu nền bị hạn chế. Các ứng dụng có thể cảnh báo trước khi sử dụng các mạng này để tải xuống dung lượng lớn."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mạng di động"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mạng Wi‑Fi được kiểm soát"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Để chọn mạng được kiểm soát, hãy bật Wi‑Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Mạng Wi‑Fi có đo lượng dữ liệu"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Để chọn mạng có đo lượng dữ liệu, hãy bật Wi‑Fi."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Cách tính dữ liệu của nhà cung cấp dịch vụ có thể khác với thiết bị của bạn."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Cuộc gọi khẩn cấp"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Quay lại cuộc gọi"</string>
@@ -2564,7 +2645,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>
@@ -2584,7 +2665,7 @@
     <string name="access_point_names" msgid="1381602020438634481">"Tên điểm truy cập"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Chế độ 4G LTE được tăng cường"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Sử dụng dữ liệu LTE để cải thiện giọng nói và thông tin liên lạc (Được đề xuất)"</string>
-    <string name="preferred_network_type_title" msgid="3431041717309776341">"Loại mạng ưa thích"</string>
+    <string name="preferred_network_type_title" msgid="3431041717309776341">"Loại mạng ưu tiên"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (được đề xuất)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"SIM công việc"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"Quyền truy cập nội dung và ứng dụng"</string>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"trượt để mở khóa, mật khẩu, hình mở khóa, mã PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"thách thức công việc, công việc, hồ sơ"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"hồ sơ công việc, hồ sơ được quản lý, thống nhất, hợp nhất, làm việc, hồ sơ"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"cử chỉ"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"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_assist_gesture_launch" msgid="813968759791342591">"cử chỉ"</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>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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">"Truy cập 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>
@@ -2877,7 +2965,7 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Tên quy tắc"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Nhập tên quy tắc"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Tên quy tắc đã được sử dụng"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Thêm tùy chọn khác"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Thêm quy tắc khác"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Xóa quy tắc"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Chọn loại quy tắc"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Xóa quy tắc \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Chỉ từ các liên hệ có gắn dấu sao"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Không có"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Báo thức"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Báo thức luôn được ưu tiên và phát ra âm thanh"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Lời nhắc"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sự kiện"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Tất cả người gọi"</string>
@@ -2965,19 +3054,14 @@
     <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>
     <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"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" 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_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. 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 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="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>
@@ -3075,7 +3159,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Mặc định)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Hệ thống)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Mặc định của hệ thống)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Bộ nhớ Apps"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Bộ nhớ ứng dụng"</string>
     <string name="usage_access" msgid="5479504953931038165">"Quyền truy cập sử dụng"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Cho phép quyền truy cập sử dụng"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Tùy chọn sử dụng ứng dụng"</string>
@@ -3095,10 +3179,19 @@
     <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>
-    <string name="high_power_system" msgid="7362862974428225301">"Tối ưu hóa pin không khả dụng"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Không tối ưu hóa pin"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Không áp dụng tối ưu hóa pin. Pin của bạn có thể hết nhanh hơn."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Cho phép ứng dụng luôn chạy trong nền?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Cho phép <xliff:g id="APP_NAME">%1$s</xliff:g> luôn chạy trong nền có thể làm giảm thời lượng pin. \n\nBạn có thể thay đổi điều này sau đó từ Cài đặt &gt; Ứng dụng và thông báo."</string>
@@ -3187,8 +3280,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>
@@ -3278,6 +3371,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>
@@ -3296,8 +3398,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>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3452,26 +3552,33 @@
     <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_summary" msgid="242037150983277829">"Để mở nhanh máy ảnh, hãy nhấn vào nút nguồn 2 lần. Thao tác này 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 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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Bật"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Tắt"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Đã mở khóa trình khởi động"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Tự động đồng bộ hóa dữ liệu công việc"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Cho phép ứng dụng tự động làm mới dữ liệu"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Đồng bộ hóa tài khoản"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Bật đồng bộ hóa cho <xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$d</xliff:g> mục"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Bật đồng bộ hóa cho tất cả các mục"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Tắt đồng bộ hóa cho tất cả các mục"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Thông tin thiết bị được quản lý"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Thay đổi và cài đặt do tổ chức của bạn quản lý"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Thay đổi và cài đặt do <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> quản lý"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"Thông tin 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>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Trạng thái đăng ký IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Đã đăng ký"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Chưa được đăng ký"</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 1005c8ad81791f08acb9b6816fe92ba0e5852876..cf3af7a0cb7910f2e9947ca75328f5458e47603e 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 64488cb5e815b00cf272226b3bd13a2cd54f27db..a5861cef5a36682ade70e021b100038dd11ca85e 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,11 +341,11 @@
     <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>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"锁定屏幕偏好设置"</string>
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"锁屏时的偏好设置"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"隐私设置"</string>
@@ -354,40 +366,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"以后再说"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"要跳过指纹设置？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已选择使用指纹作为解锁手机的方式之一。如果您现在跳过这项设置，则以后还需要再进行设置。设置过程只需大约一分钟的时间。"</string>
     <string name="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="1688030823464420974">"如果您下次绘制的解锁图案仍然有误，系统将删除此设备上的数据"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"如果您下次输入的 PIN 码仍然有误，系统将删除此设备上的数据"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"如果您下次输入的密码仍然有误，系统将删除此设备上的数据"</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="5047439819181833824">"错误次数过多。系统将删除此设备上的数据。"</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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"自动开启 WLAN"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"位于已保存的高品质网络（例如您的家庭网络）附近时自动重新开启 WLAN"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"无法使用，因为 WLAN 搜索功能已关闭"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"要使用该功能，请选择一个网络评分服务提供方"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避开状况不佳的网络"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"仅在WLAN互联网连接状况良好时使用WLAN网络"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"仅使用互联网连接情况良好的网络"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"连接到开放网络"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"自动连接到高品质的公共网络"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"要使用该功能，请选择一个网络评分服务提供方"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"要使用该功能，请选择一个兼容的网络评分服务提供方"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安装证书"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"为了提高位置信息的精确度，系统应用和服务仍然会扫描 WLAN 网络。您可以在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>扫描设置<xliff:g id="LINK_END_1">LINK_END</xliff:g>中更改此设置。"</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"要提高位置信息的精确度，请在<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>扫描设置<xliff:g id="LINK_END_1">LINK_END</xliff:g>中开启 WLAN 扫描功能。"</string>
@@ -715,10 +747,10 @@
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"WLAN 会自动重新开启"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"WLAN 不会自动重新开启"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"WLAN网络"</string>
-    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS按钮"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按钮"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多选项"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN码输入"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"WLAN直连"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 码输入"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"WLAN 直连"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"配置"</string>
@@ -779,6 +811,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>
@@ -810,8 +843,7 @@
       <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_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>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
@@ -829,7 +861,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"网络前缀长度"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WLAN直连"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WLAN 直连"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"设备信息"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"记住该连接"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"搜索设备"</string>
@@ -846,10 +878,18 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"要取消连接<xliff:g id="PEER_NAME">%1$s</xliff:g>的邀请吗？"</string>
     <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_checkbox_text" msgid="7763495093333664887">"WLAN 热点"</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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"一律开启/耗电量更高"</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="6978257596231155345">"显示时间、通知图标及其他信息。耗电量更高。"</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>
@@ -1099,7 +1146,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"信号强度"</string>
     <string name="status_roaming" msgid="2638800467430913403">"漫游"</string>
     <string name="status_operator" msgid="2274875196954742087">"网络"</string>
-    <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLANMAC 地址"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLAN MAC 地址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"蓝牙地址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序列号"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"无法获取"</string>
@@ -1273,6 +1320,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>
@@ -1292,16 +1340,21 @@
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"内部存储空间和所有数据都将被重置"</string>
     <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"此操作会清除您平板电脑"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
-    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"此操作会清除您手机"<b>"内部存储设备"</b>"中的所有数据，包括：\n\n"<li>"您的Google帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"下载的应用"</li></string>
+    <string name="master_clear_desc" product="default" msgid="4800386183314202571">"此操作会清除您手机"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"目前，您已登录以下帐号：\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"此设备上目前还有其他用户。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM 卡中的运营商"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"这样并不会取消您的移动服务套餐。"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD卡"</b>"。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"格式化USB存储设备"</string>
     <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 +1377,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>
@@ -1376,7 +1418,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>
@@ -1421,8 +1463,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,12 +1536,15 @@
     <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>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"启用更多设置选项"</string>
     <string name="application_info_label" msgid="5736524913065714880">"应用信息"</string>
-    <string name="storage_label" msgid="8700867073480107253">"存储空间"</string>
+    <string name="storage_label" msgid="8700867073480107253">"存储"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"默认打开"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"默认操作"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"屏幕兼容性"</string>
@@ -1659,6 +1707,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>
@@ -1673,7 +1725,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"物理键盘设置"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按空格键两次可插入句号"</string>
     <string name="show_password" msgid="4837897357002495384">"显示密码"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"输入字符时短暂显示这些字符"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"输入时短暂显示这些字符"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"此拼写检查工具可能会收集您键入的所有文字，包括密码和信用卡号等个人数据。它源自应用“<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>”。要使用此拼写检查工具吗？"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"设置"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"语言"</string>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"屏幕阅读器、显示、互动控件"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"阅读辅助设置"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"您可以根据自己的需求对此设备进行自定义。以后，您可以在“设置”中更改这些辅助功能设置。"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"放大字体"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"屏幕阅读器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音频和屏幕上的文字"</string>
     <string name="display_category_title" msgid="685461049938269166">"显示"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"由于<xliff:g id="APP">%1$s</xliff:g>一直让手机保持唤醒状态，因此您的手机无法正常管理电池。\n\n要尝试解决此问题，您可以停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"由于<xliff:g id="APP">%1$s</xliff:g>一直让平板电脑保持唤醒状态，因此您的平板电脑无法正常管理电池。\n\n要尝试解决此问题，您可以停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"由于<xliff:g id="APP">%1$s</xliff:g>一直让设备保持唤醒状态，因此您的设备无法正常管理电池。\n\n要尝试解决此问题，您可以停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让手机保持唤醒状态，因此您的手机无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让平板电脑保持唤醒状态，因此您的平板电脑无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让设备保持唤醒状态，因此您的设备无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"停止应用"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"要关闭后台使用功能并停止应用吗？"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让手机保持唤醒状态，因此您的手机无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>，并阻止该应用在后台运行。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让平板电脑保持唤醒状态，因此您的平板电脑无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>，并阻止该应用在后台运行。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"由于<xliff:g id="APP_0">%1$s</xliff:g>一直让设备保持唤醒状态，因此您的设备无法正常管理电池。\n\n要尝试解决此问题，您可以停止<xliff:g id="APP_1">%1$s</xliff:g>，并阻止该应用在后台运行。"</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="7774807745601479888">"由于<xliff:g id="APP">%1$s</xliff:g>在您并未使用它时仍一直请求获取您的位置信息，因此您的手机无法正常管理电池。\n\n要解决此问题，请关闭此应用的位置信息服务。"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"由于<xliff:g id="APP">%1$s</xliff:g>在您并未使用它时仍一直请求获取您的位置信息，因此您的平板电脑无法正常管理电池。\n\n要解决此问题，请关闭此应用的位置信息服务。"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"由于<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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"自上次充满电后的用电明细"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"上次充满电"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"电池的剩余使用时间为大致数据，且可能会因使用情形而变化"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"电池消耗量为大致值，可能会因使用情形而变化"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"在前台运行时"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"在后台运行时"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"电池用量"</string>
@@ -2333,8 +2414,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"只能连接到移动网络时，此功能可能会导致需要使用后台流量的应用无法正常运行。\n\n您可以在相关应用的设置中为其设定更合适的数据流量控制选项。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"您必须先设置移动数据流量上限，才能限制后台数据流量。"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"要打开自动同步数据功能吗？"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的平板电脑。\n\n有些帐号还可以将您在平板电脑上进行的所有更改自动同步到网络上。Google帐号就支持此类双向同步。"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的手机。\n\n有些帐号还可以将您在手机上进行的所有更改自动同步到网络上。Google帐号就支持此类双向同步。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的平板电脑。\n\n有些帐号还可以将您在平板电脑上进行的所有更改自动同步到网络上。Google 帐号就支持此类双向同步。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"您在网络上对自己的帐号进行的所有更改都会自动同步到您的手机。\n\n有些帐号还可以将您在手机上进行的所有更改自动同步到网络上。Google 帐号就支持此类双向同步。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"要关闭自动同步数据功能吗？"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"这样可以节省数据流量和电池电量，但您需要手动同步每个帐号才能获得最新信息，并且在有更新时不会收到通知。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"流量重置日期"</string>
@@ -2553,7 +2634,7 @@
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"但其他付款应用开启时除外"</string>
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"通过触碰付款终端进行付款时使用以下应用："</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"通过支付终端付款"</string>
-    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"设置付款应用，然后只需将手机背面触碰任何带有非接触标志的终端即可。"</string>
+    <string name="nfc_how_it_works_content" msgid="4749007806393224934">"设置付款应用，然后只需将手机背面靠近任何带有非接触标志的终端即可。"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"知道了"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"更多…"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"要设为您的偏好设置吗？"</string>
@@ -2564,7 +2645,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>
@@ -2654,9 +2735,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>
@@ -2706,9 +2790,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"滑动解锁, 密码, 图案, PIN 码"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"工作验证, 工作, 资料"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"工作资料, 托管资料, 汇整, 统一, 工作, 资料"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"手势"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"手势"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支付、点按、付款"</string>
     <string name="keywords_backup" msgid="470070289135403022">"备份内容, 备份"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"手势"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLAN NFC标签"</string>
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"点按标签即可写入…"</string>
@@ -2791,7 +2876,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>
@@ -2806,6 +2892,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>
@@ -2833,8 +2923,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>
@@ -2918,6 +3006,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"仅限来自收藏的联系人"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"无"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"闹钟"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"闹钟始终优先，并发出提示音"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活动"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"所有来电者"</string>
@@ -2965,11 +3054,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>
@@ -2977,7 +3061,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>
@@ -3095,6 +3179,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>
@@ -3187,8 +3280,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>
@@ -3225,7 +3318,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"周二下午 6:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"周二下午 6:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"未连接"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g> 流量"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">已屏蔽 <xliff:g id="COUNT">%d</xliff:g> 个应用的通知</item>
       <item quantity="one">已屏蔽 1 个应用的通知</item>
@@ -3278,6 +3371,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>
@@ -3290,14 +3392,13 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"以太网流量消耗"</string>
     <string name="wifi" msgid="1081550856200013637">"WLAN"</string>
     <string name="ethernet" msgid="6600095783781389720">"以太网"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> 移动数据"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g>（移动数据流量）"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> WLAN 流量"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> 以太网流量"</string>
     <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>
@@ -3305,7 +3406,7 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"运营商的流量计算方式可能与您设备的计算方式不同"</string>
     <string name="data_used_template" msgid="3245919669966296505">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"设置数据用量警告"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"设置数据流量消耗警告"</string>
     <string name="data_warning" msgid="209133958008062117">"流量警告"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"设置流量上限"</string>
     <string name="data_limit" msgid="1885406964934590552">"流量上限"</string>
@@ -3317,7 +3418,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>
@@ -3381,8 +3482,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>
@@ -3453,32 +3553,39 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"辅助手势"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"敏感度"</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="gesture_setting_on" msgid="3455094265233870280">"开启"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"关闭"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"引导加载程序已解锁"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"请先连接到互联网"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"请连接到互联网或与您的运营商联系"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"在与运营商绑定的设备上无法使用"</string>
-    <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"已释放共 <xliff:g id="SIZE">%1$s</xliff:g>\n\n上次运行日期：<xliff:g id="DATE">%2$s</xliff:g>"</string>
+    <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"总共释放空间：<xliff:g id="SIZE">%1$s</xliff:g>\n\n上次执行日期：<xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"免安装应用"</string>
     <string name="web_action_enable_summary" msgid="3108127559723396382">"在应用中打开链接（即使未安装相关应用也无妨）"</string>
     <string name="web_action_section_title" msgid="7364647086538399136">"免安装应用"</string>
@@ -3492,6 +3599,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"自动同步工作数据"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"让应用自动刷新数据"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"帐号同步"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"已开启 <xliff:g id="ID_1">%1$d</xliff:g> 项（共 <xliff:g id="ID_2">%2$d</xliff:g> 项）的同步功能"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"已开启所有项的同步功能"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"已关闭所有项的同步功能"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"受管理设备的信息"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"由贵单位管理的更改和设置"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"由“<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>”管理的更改和设置"</string>
@@ -3572,6 +3682,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>
@@ -3585,5 +3696,11 @@
     <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="698847081680980774">"新增了哪些精彩功能？"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看前 5 大热门功能"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 注册状态"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"已注册"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未注册"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 4cb0452f80e6ad0032d46a977b0158199dc25623..a29d2b8c60453d034d18a18eca96f4551992a213 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -67,7 +67,7 @@
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"掃瞄中…"</item>
+    <item msgid="8934131797783724664">"掃描中…"</item>
     <item msgid="8513729475867537913">"正在連線..."</item>
     <item msgid="515055375277271756">"正在驗證…"</item>
     <item msgid="1943354004029184381">"正在取得 IP 位址…"</item>
@@ -81,7 +81,7 @@
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"掃瞄中…"</item>
+    <item msgid="8878186979715711006">"掃描中…"</item>
     <item msgid="355508996603873860">"正在連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="554971459996405634">"正在取得 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的授權…"</item>
     <item msgid="7928343808033020343">"正在從 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址…"</item>
@@ -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>
@@ -257,9 +247,9 @@
     <item msgid="6546959730920410907">"修改通話記錄"</item>
     <item msgid="446877710771379667">"讀取日曆"</item>
     <item msgid="7674458294386319722">"修改日曆"</item>
-    <item msgid="8281201165558093009">"Wi-Fi 掃瞄"</item>
+    <item msgid="8281201165558093009">"Wi-Fi 掃描"</item>
     <item msgid="8694611243479480497">"通知"</item>
-    <item msgid="7776439107987345446">"手機掃瞄"</item>
+    <item msgid="7776439107987345446">"手機掃描"</item>
     <item msgid="514615766544675057">"撥打電話"</item>
     <item msgid="8181415497109310680">"讀取 SMS"</item>
     <item msgid="6816551144382117307">"寫入 SMS"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e502fc78e294e02366189163cba02423269ddd0c..a1c7ee623407ef21c64a2341b7df00c665f3ec6e 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>
@@ -103,13 +105,20 @@
     <string name="bluetooth_device_details" msgid="4594773497930028085">"裝置設定"</string>
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"個人資料設定"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"名稱未設定，改用帳戶名稱"</string>
-    <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"掃瞄裝置"</string>
+    <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) -->
@@ -231,8 +243,8 @@
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 儲存裝置在使用期間被移除！"</string>
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"SD 卡在使用期間被移除！"</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"已用空間 (位元組)："</string>
-    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在掃瞄 USB 儲存裝置中的媒體..."</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正在掃瞄 SD 卡中的媒體..."</string>
+    <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"正在掃描 USB 儲存裝置中的媒體..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"正在掃描 SD 卡中的媒體..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB 儲存裝置已掛接為唯讀裝置。"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD 記憶卡已掛接為唯讀裝置。"</string>
     <string name="skip_label" msgid="47510779345218297">"略過"</string>
@@ -314,8 +326,8 @@
     <string name="time_picker_title" msgid="483460752287255019">"時間"</string>
     <string name="lock_after_timeout" msgid="4590337686681194648">"自動鎖定"</string>
     <string name="lock_after_timeout_summary" msgid="6128431871360905631">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> 後"</string>
-    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"休眠後隨即啟用 (由<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>維持解鎖狀態時除外)"</string>
-    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後 (由「<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>」維持解鎖狀態時除外)"</string>
+    <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"休眠後立即上鎖 (<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>保持解鎖狀態時除外)"</string>
+    <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"休眠 <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後 (<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>保持解鎖狀態時除外)"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在鎖定畫面上顯示擁有者資訊"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"螢幕鎖定訊息"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"啟用小工具"</string>
@@ -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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"稍後再做"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"略過指紋設定？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已選擇使用指紋作為唯一的手機解鎖方式。如果您現在略過，將需要稍後設定。設定過程只需約一分鐘。"</string>
     <string name="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="1688030823464420974">"如果您下次畫出錯誤的上鎖圖案，系統將會刪除此裝置上的資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"如果您下次輸入錯誤的 PIN，系統將會刪除此裝置上的資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"如果您下次輸入錯誤的密碼，系統將會刪除此裝置上的資料"</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="5047439819181833824">"輸入錯誤的次數太多，系統將會刪除此裝置上的資料。"</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>
@@ -600,7 +621,7 @@
     <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"允許<xliff:g id="DEVICE_NAME">%1$s</xliff:g>存取您的聯絡人和通話記錄"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"無法連接「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
-    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"掃瞄裝置"</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"掃描裝置"</string>
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"重新整理"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"正在搜尋..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"裝置設定"</string>
@@ -625,7 +646,15 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"進階設定"</string>
     <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="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>
@@ -690,15 +719,18 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"有高品質的公共網絡時通知我"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"自動開啟 Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"附近有已儲存的高品質網絡 (例如家用網絡) 時再開啟 Wi-Fi"</string>
-    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi 掃瞄功能已關閉，因此無法使用"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi 掃描功能已關閉，因此無法使用"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"如要使用，請選擇網絡評分供應商"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"已避免欠佳的連線"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"除非互聯網連線穩定，否則不要使用 Wi-Fi 網絡"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"只使用連線品質穩定的網絡"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"連線至開放網絡"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"自動連線至高品質的公共網絡"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"如要使用該功能，請選擇一個網絡評分供應商"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"如要使用該功能，請選擇一個兼容的網絡評分供應商"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"為提高定位準確度，系統應用程式和服務仍可掃瞄 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"為提高定位準確度，請前往「<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃瞄設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>」開啟 Wi-Fi 掃瞄功能。"</string>
+    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"為提高定位準確度，系統應用程式和服務仍可掃描 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"為提高定位準確度，請前往「<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃描設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>」開啟 Wi-Fi 掃描功能。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"不用再顯示"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠時繼續連接 Wi-Fi 網絡"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"休眠狀態仍保持 Wi-Fi 連線"</string>
@@ -719,7 +751,7 @@
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多選項"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"輸入 WPS PIN"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
-    <string name="wifi_menu_scan" msgid="1470911530412095868">"掃瞄"</string>
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"掃描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"進階設定"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"設定"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網絡"</string>
@@ -767,7 +799,7 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"匿名身分"</string>
     <string name="wifi_password" msgid="5948219759936151048">"密碼"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"顯示密碼"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"選擇 AP 頻段"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"選擇存取點頻段"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2.4 GHz 頻段"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GHz 頻段"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP 設定"</string>
@@ -779,11 +811,12 @@
     <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>
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入您的網絡密碼"</string>
-    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟網絡掃瞄功能 (即使 Wi-Fi 已關閉)，以提升定位精確度及用於其他用途。\n\n您要允許所有需要掃瞄的應用程式這項要求嗎？"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟網絡掃描功能 (即使 Wi-Fi 已關閉)，以提升定位精確度及用於其他用途。\n\n您要允許所有需要掃描的應用程式這項要求嗎？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"如要關閉這項功能，請在展開式選單中選取 [進階]。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒絕"</string>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1010,7 +1051,7 @@
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"充電或放上插座時"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"任何一個狀態"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"充電時"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"安放在插座上時"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"放上插座時"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"永不"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"關閉"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"如要控制手機在插座上和/或休眠時的操作，請開啟螢幕保護程式。"</string>
@@ -1020,8 +1061,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="7337555569694794132">"永遠開啟/已增加電池用量"</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="6978257596231155345">"顯示時間、通知圖示和其他資料。已增加電池用量。"</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>
@@ -1274,6 +1321,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>
@@ -1297,12 +1345,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"您目前已登入下列帳戶：\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"這部裝置上還有其他使用者。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM 卡上的流動網絡供應商"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"此操作不會取消您的流動服務計劃。"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"SD 記憶卡"</b>"資料。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"清除 USB 儲存裝置資料"</string>
     <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>
@@ -1325,26 +1378,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>
@@ -1377,11 +1419,11 @@
     <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_scanning_screen_title" msgid="4408076862929611554">"掃瞄"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi 掃瞄"</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>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃瞄"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"允許系統應用程式和服務隨時偵測藍牙裝置，以提高位置資訊的準確度。"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 和流動網絡位置"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"允許應用程式使用 Google 的位置資訊服務，藉此更快確定您的約略位置。系統會收集匿名的位置資料傳送給 Google。"</string>
@@ -1422,8 +1464,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>
@@ -1469,7 +1514,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"顯示設定檔的解鎖圖案"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"輕按時震動"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"電源按鈕立即上鎖"</string>
-    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"由「<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>」維持解鎖狀態時除外"</string>
+    <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>保持解鎖狀態時除外"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"設定解鎖圖形"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"更改解鎖圖形"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何畫出解鎖圖形"</string>
@@ -1492,6 +1537,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>
@@ -1660,6 +1708,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>
@@ -1758,6 +1810,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"螢幕閱讀器、顯示、互動控制項"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覺輔助設定"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"您可視乎個人需要自訂此裝置。這些無障礙功能可在 [設定] 中變更。"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"放大字型"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"螢幕閱讀器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音訊和螢幕上的文字"</string>
     <string name="display_category_title" msgid="685461049938269166">"螢幕"</string>
@@ -1874,6 +1927,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>
@@ -1911,7 +1968,7 @@
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"不允許應用程式在背景中執行"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"充滿電後的螢幕用量"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
-    <string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃瞄"</string>
+    <string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃描"</string>
     <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
     <string name="power_usage_list_summary" msgid="6775339745194635000">"充滿電後的應用程式用量 (<xliff:g id="TIME">^1</xliff:g>前)"</string>
     <string name="power_usage_list_summary_device" msgid="7036566616386864302">"充滿電 (<xliff:g id="TIME">^1</xliff:g>前) 後的裝置用電量"</string>
@@ -1940,6 +1997,29 @@
     <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="4006631636646776488">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓您的手機處於喚醒狀態，因此手機無法正常管理電池。\n\n如要解決此問題，您可以停止該應用程式。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓您的平板電腦處於喚醒狀態，因此平板電腦無法正常管理電池。\n\n如要解決此問題，您可以停止該應用程式。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓您的裝置處於喚醒狀態，因此裝置無法正常管理電池。\n\n如要解決此問題，您可以停止該應用程式。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓您的手機處於喚醒狀態，因此手機無法正常管理電池。\n\n如要解決此問題，您可以停止「<xliff:g id="APP_1">%1$s</xliff:g>」。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓您的平板電腦處於喚醒狀態，因此平板電腦無法正常管理電池。\n\n如要解決此問題，您可以停止「<xliff:g id="APP_1">%1$s</xliff:g>」。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓您的裝置處於喚醒狀態，因此裝置無法正常管理電池。\n\n如要解決此問題，您可以停止「<xliff:g id="APP_1">%1$s</xliff:g>」。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"停止應用程式"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"要關閉背景使用功能並停用應用程式嗎？"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓您的手機處於喚醒狀態，因此手機無法正常管理電池。\n\n如要解決此問題，請將手機設定為禁止「<xliff:g id="APP_1">%1$s</xliff:g>」在背景中執行。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓您的平板電腦處於喚醒狀態，因此平板電腦無法正常管理電池。\n\n如要解決此問題，請將平板電腦設定為禁止「<xliff:g id="APP_1">%1$s</xliff:g>」在背景中執行。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓您的裝置處於喚醒狀態，因此裝置無法正常管理電池。\n\n如要解決此問題，請將裝置設定為禁止「<xliff:g id="APP_1">%1$s</xliff:g>」在背景中執行。"</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="7774807745601479888">"由於「<xliff:g id="APP">%1$s</xliff:g>」在您未使用時持續要求獲取您的位置資訊，因此手機無法正常管理電池。\n\n如要解決此問題，請關閉此應用程式的位置資訊功能。"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"由於「<xliff:g id="APP">%1$s</xliff:g>」在您未使用時持續要求獲取您的位置資訊，因此平板電腦無法正常管理電池。\n\n如要解決此問題，請關閉此應用程式的位置資訊功能。"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"由於「<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>
@@ -1954,7 +2034,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>
@@ -2006,12 +2086,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"上次充滿電後的詳細用量"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"上次充滿電"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"剩餘電池使用時間只屬約數，視乎使用情況而定"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"電池用量資料只屬約數，視乎使用情況而定"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"在前景中執行時"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"在背景中執行時"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"電池用量"</string>
@@ -2204,7 +2285,7 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"刪除"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"儲存"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"取消"</string>
-    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"正在掃瞄網絡..."</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"正在掃描網絡..."</string>
     <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"輕按所需網絡即可連線"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"連線至現有網絡"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"連線至無安全保護措施的網絡"</string>
@@ -2274,7 +2355,7 @@
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"密碼錯誤"</string>
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"PIN 錯誤"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"正在檢查…"</string>
-    <string name="starting_android" msgid="4001324195902252681">"正在啟動 Andriod…"</string>
+    <string name="starting_android" msgid="4001324195902252681">"正在啟動 Android…"</string>
     <string name="delete" msgid="4219243412325163003">"刪除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他檔案"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"已選取 <xliff:g id="NUMBER">%1$d</xliff:g> 個，共 <xliff:g id="TOTAL">%2$d</xliff:g> 個"</string>
@@ -2289,7 +2370,7 @@
     <string name="data_usage_data_limit" msgid="1193930999713192703">"設定數據上限"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"資料用量週期"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"應用程式數據用量"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"數據漫遊服務"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"數據漫遊"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"限制背景資料"</string>
     <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"允許背景數據"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"分開顯示 4G 用量"</string>
@@ -2567,7 +2648,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 +2738,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>
@@ -2672,7 +2756,7 @@
     <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"短訊, 發短訊, 訊息, 傳送短訊"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"流動網絡, 流動裝置, 流動網絡供應商, 無線, 數據, 4G, 3G, 2G, LTE"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"WiFi, Wi-Fi, 通話, 撥號中"</string>
-    <string name="keywords_home" msgid="3626170808219458848">"應用程式啟動器"</string>
+    <string name="keywords_home" msgid="3626170808219458848">"啟動器"</string>
     <string name="keywords_display" msgid="8910345814565493016">"螢幕, 觸控螢幕"</string>
     <string name="keywords_display_brightness_level" msgid="3891383826236015854">"螢幕變暗, 觸控螢幕, 電池"</string>
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"螢幕變暗, 觸控螢幕, 電池"</string>
@@ -2709,9 +2793,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"滑動解鎖、密碼、上鎖圖形、PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"工作挑戰, 工作, 設定檔"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"工作設定檔, 受管理的設定檔, 整合, 整合, 工作, 設定檔"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"手勢"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"手勢"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支付, 輕按, 付款"</string>
     <string name="keywords_backup" msgid="470070289135403022">"備份內容, 備份"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"手勢"</string>
     <string name="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 +2879,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 +2895,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 +2926,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>
@@ -2921,6 +3009,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"只限已加星號的聯絡人"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"無"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"鬧鐘永遠可優先發出音效"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"所有來電者"</string>
@@ -2968,11 +3057,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 +3064,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 +3182,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>
@@ -3143,7 +3236,7 @@
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"允許小幫手應用程式存取螢幕上的圖片"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"閃動畫面"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"輔助應用程式存取畫面上的文字或擷取螢幕畫面時，畫面邊沿會閃動"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"小幫手應用程式能根據您正在查看的螢幕資訊提供協助，部分應用程式可同時支援應用程式啟動器及語音輸入服務，提供更全面的協助。"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"小幫手應用程式能根據您正在查看的螢幕資訊提供協助，部分應用程式可同時支援啟動器及語音輸入服務，提供更全面的協助。"</string>
     <string name="average_memory_use" msgid="829566450150198512">"平均記憶體用量"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"最高記憶體用量"</string>
     <string name="memory_usage" msgid="1781358557214390033">"記憶體用量"</string>
@@ -3190,8 +3283,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>
@@ -3228,7 +3321,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"星期二下午 6:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"星期二下午 6:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"未連線"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g>數據"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"使用了 <xliff:g id="AMOUNT">%1$s</xliff:g> 數據"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">已停用 <xliff:g id="COUNT">%d</xliff:g> 個應用程式的通知</item>
       <item quantity="one">已停用 1 個應用程式的通知</item>
@@ -3281,6 +3374,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,16 +3401,15 @@
     <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>
       <item quantity="one">1 個限制</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"流動網絡供應商的資料可能有別於裝置上的資料"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"流動網絡供應商的數據計算方式可能與裝置有所不同"</string>
     <string name="data_used_template" msgid="3245919669966296505">"使用了 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"設定數據警告"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"設定數據用量警告"</string>
     <string name="data_warning" msgid="209133958008062117">"數據用量警告"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"設定數據上限"</string>
     <string name="data_limit" msgid="1885406964934590552">"數據上限"</string>
@@ -3320,7 +3421,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 +3485,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>
@@ -3456,25 +3556,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"輔助手勢"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"敏感度"</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="gesture_setting_on" msgid="3455094265233870280">"開啟"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"關閉"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"載入器已解鎖"</string>
@@ -3495,6 +3602,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"自動同步處理工作資料"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"允許應用程式自動重新整理資料"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"帳戶同步"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"<xliff:g id="ID_1">%1$d</xliff:g> 個項目 (共 <xliff:g id="ID_2">%2$d</xliff:g> 個) 的同步功能已開啟"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"所有項目的同步功能已開啟"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"所有項目的同步功能已關閉"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"受管理的裝置資料"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"由您的機構管理的變更和設定"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"由「<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>」管理的變更和設定"</string>
@@ -3575,6 +3685,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 +3699,11 @@
     <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="698847081680980774">"新增了哪些精彩功能？"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看 5 大功能"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 註冊狀態"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"已註冊"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未註冊"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 7d52a497cf613cdb7016fceb15b2925bdc89dd59..181ea93003dba07fc28e5994bebfd060de5074b5 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 ed2077fcd0f861b0974a2d9e11843b6d81345e07..4ba170e20a49a70d8b0f7fe701d4c53643e85232 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"稍後再說"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"要略過指紋設定程序嗎？"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"你已選擇使用指紋做為其中一種手機解鎖方式。如果現在略過這項程序，你必須在稍後完成設定。設定程序只需要一分鐘左右。"</string>
     <string name="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">"如果你這次畫出的 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="1688030823464420974">"如果下次輸入的解鎖圖案仍不正確，系統將刪除這個裝置中的資料"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"如果下次輸入的 PIN 碼仍不正確，系統將刪除這個裝置中的資料"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"如果下次輸入的密碼仍不正確，系統將刪除這個裝置中的資料"</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="5047439819181833824">"錯誤次數過多，系統將刪除這個裝置中的資料。"</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 +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>
@@ -673,7 +702,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"關閉"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC 已關閉，因此無法使用"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"這項功能啟用時，只要將裝置靠在一起，即可讓應用程式內容傳輸至其他支援 NFC 的裝置。例如，你可以傳輸網頁、YouTube 影片、聯絡人等內容。\n\n只要將裝置靠在一起 (一般都是背靠背)，然後輕觸螢幕，接著應用程式會決定要傳輸哪些內容。"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"這項功能啟用時，只要將裝置靠在一起，即可讓應用程式內容傳輸至其他支援 NFC 的裝置。例如，你可以傳輸網頁、YouTube 影片、聯絡人等內容。\n\n只要將裝置靠在一起 (通常是背靠背)，然後輕觸螢幕，應用程式就會決定要傳輸的內容。"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"開啟 Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"自動開啟 Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"位於已儲存的高品質 Wi‑Fi 網路範圍內 (例如家用網路) 時自動重新開啟 Wi‑Fi"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi-Fi 掃描已關閉，因此無法使用"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"如要使用這項功能，請選取網路評分供應商"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避開品質不佳的連線"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"除非 Wi-Fi 網路連線狀態良好，否則不使用"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"僅使用網際網路連線品質穩定的網路"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"連線至開放網路"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"自動連線至高品質的公用網路"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"如要使用這項功能，請選取網路評分供應商"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"如要使用這項功能，請選取相容的網路評分供應商"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"為了提升定位精確度，系統應用程式和服務仍可掃描 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"如要提升定位精確度，請前往<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃描設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>開啟 Wi-Fi 掃描功能。"</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"一律開啟/電池用量已增加"</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="6978257596231155345">"顯示時間、通知圖示和其他資訊。電池用量已增加。"</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>
@@ -1201,7 +1248,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"系統"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"探索「<xliff:g id="NAME">^1</xliff:g>」"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"其他檔案包括應用程式所儲存的共用檔案、透過網際網路或藍牙下載的檔案以及 Android 檔案等。\n\n如要查看這個「<xliff:g id="NAME">^1</xliff:g>」中可供檢視的內容，請輕觸 [探索]。"</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"系統包括用於執行 Android <xliff:g id="VERSION">%s</xliff:g> 版的檔案"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"「系統」中包含用來執行 Android <xliff:g id="VERSION">%s</xliff:g> 版的檔案"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> 可能儲存了相片、音樂、應用程式或其他資料 (儲存空間使用量：<xliff:g id="SIZE">^2</xliff:g>)。\n\n如要查看詳細資料，請切換至 <xliff:g id="USER_1">^1</xliff:g>。"</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"設定你的「<xliff:g id="NAME">^1</xliff:g>」"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"使用可攜式儲存空間"</string>
@@ -1273,6 +1320,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>
@@ -1296,12 +1344,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"你目前已登入下列帳戶：\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"這個裝置上還有其他使用者。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"eSIM 卡中的電信業者"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"這項操作並不會取消你的行動服務方案。"</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他用戶資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"如要清除音樂、圖片及其他使用者資料，必須先清除 "<b>"SD 卡"</b>"。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"清除 USB 儲存裝置"</string>
     <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 +1377,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>
@@ -1351,7 +1393,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更簡訊應用程式？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"你要改用 <xliff:g id="NEW_APP">%1$s</xliff:g> 而不再使用 <xliff:g id="CURRENT_APP">%2$s</xliff:g> 做為簡訊應用程式嗎？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"使用 <xliff:g id="NEW_APP">%s</xliff:g> 做為簡訊應用程式嗎？"</string>
-    <string name="network_scorer_picker_title" msgid="6383879578279046456">"網路評分供應商"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"網路評分服務供應商"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"無"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"變更 Wi‑Fi Assistant？"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"改以「<xliff:g id="NEW_APP">%1$s</xliff:g>」取代「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」管理你的網路連線？"</string>
@@ -1376,7 +1418,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 +1463,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 +1536,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 +1707,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>
@@ -1757,6 +1809,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"螢幕閱讀器、顯示、互動控制項"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"視覺輔助設定"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"你可以根據個人需求自訂這個裝置，日後，你可以前往 [設定] 變更這些無障礙功能。"</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"放大字型"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"螢幕閱讀器"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"音訊和畫面上的文字"</string>
     <string name="display_category_title" msgid="685461049938269166">"螢幕"</string>
@@ -1873,6 +1926,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 +1996,29 @@
     <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="4006631636646776488">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓你的手機保持喚醒狀態，因此手機無法正常管理電池。\n\n你可以停止這個應用程式來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝該應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓你的平板電腦保持喚醒狀態，因此平板電腦無法正常管理電池。\n\n你可以停止這個應用程式來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝該應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓你的裝置保持喚醒狀態，因此裝置無法正常管理電池。\n\n你可以停止這個應用程式來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝該應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓你的手機保持喚醒狀態，因此手機無法正常管理電池。\n\n你可以停止「<xliff:g id="APP_1">%1$s</xliff:g>」來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝該應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓你的平板電腦保持喚醒狀態，因此平板電腦無法正常管理電池。\n\n你可以停止「<xliff:g id="APP_1">%1$s</xliff:g>」來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝該應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓你的裝置保持喚醒狀態，因此裝置無法正常管理電池。\n\n你可以停止「<xliff:g id="APP_1">%1$s</xliff:g>」來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝該應用程式，才能改善電池效能。"</string>
+    <string name="dialog_stop_ok" msgid="2319777211264004900">"停止應用程式"</string>
+    <string name="dialog_background_check_title" msgid="6936542136153283692">"要關閉背景使用功能並停止應用程式嗎？"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓你的手機保持喚醒狀態，因此你的手機無法正常管理電池。\n\n請設定手機禁止讓「<xliff:g id="APP_1">%1$s</xliff:g>」在背景執行，以解決這個問題。"</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓你的平板電腦保持喚醒狀態，因此你的平板電腦無法正常管理電池。\n\n請設定平板電腦禁止讓「<xliff:g id="APP_1">%1$s</xliff:g>」在背景執行，以解決這個問題。"</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"由於「<xliff:g id="APP_0">%1$s</xliff:g>」一直讓你的裝置保持喚醒狀態，因此你的裝置無法正常管理電池。\n\n請設定裝置禁止讓「<xliff:g id="APP_1">%1$s</xliff:g>」在背景執行，以解決這個問題。"</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="7774807745601479888">"由於「<xliff:g id="APP">%1$s</xliff:g>」在你未使用時持續要求取得你的位置資訊，因此手機無法正常管理電池。\n\n請關閉這個應用程式的定位功能，以解決這個問題。"</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"由於「<xliff:g id="APP">%1$s</xliff:g>」在你未使用時持續要求取得你的位置資訊，因此平板電腦無法正常管理電池。\n\n請關閉這個應用程式的定位功能，以解決這個問題。"</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"由於「<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 +2033,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,12 +2085,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"上次充飽後的詳細用量資訊"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"上次完全充飽電"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"電池的剩餘使用時間為約略值，且會因使用情形而有所變動"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"電池用量資料為概略值，而且會依使用情形而有變化"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"在前景執行時"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"在背景執行時"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"電池用量"</string>
@@ -2568,7 +2649,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>
@@ -2658,9 +2739,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>
@@ -2710,9 +2794,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"滑動解鎖, 密碼, 圖案, PIN"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"Work 驗證、Work、設定檔"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"Work 設定檔, 受管理設定檔, 整合, 整合, Work, 設定檔"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"手勢"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"手勢"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"支付、輕觸、付款"</string>
     <string name="keywords_backup" msgid="470070289135403022">"備份內容, 備份"</string>
+    <string name="keywords_assist_gesture_launch" msgid="813968759791342591">"手勢"</string>
     <string name="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>
@@ -2795,7 +2880,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>
@@ -2810,6 +2896,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>
@@ -2837,8 +2927,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>
@@ -2922,6 +3010,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"來自已加星號的聯絡人"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"無"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"鬧鐘一律可優先發出音效"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"活動"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"所有來電者"</string>
@@ -2969,11 +3058,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>
@@ -2981,7 +3065,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>
@@ -3099,6 +3183,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>
@@ -3191,8 +3284,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>
@@ -3229,7 +3322,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"週二下午 6:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"週二下午 6:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"未連線"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g>的數據用量"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g> 的數據用量"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">停用 <xliff:g id="COUNT">%d</xliff:g> 個應用程式的通知功能</item>
       <item quantity="one">停用 1 個應用程式的通知功能</item>
@@ -3282,6 +3375,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>
@@ -3300,8 +3402,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>
@@ -3321,7 +3422,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>
@@ -3385,8 +3486,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>
@@ -3457,25 +3557,32 @@
     <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="assist_gesture_title" msgid="7746563137898655539">"輔助手勢"</string>
-    <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
-    <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"敏感度"</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="gesture_setting_on" msgid="3455094265233870280">"開啟"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"關閉"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"開機載入器已解除鎖定"</string>
@@ -3496,6 +3603,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"自動同步處理工作資料"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"允許應用程式自動重新整理資料"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"帳戶同步處理"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"已啟用 <xliff:g id="ID_1">%1$d</xliff:g> 個項目 (共 <xliff:g id="ID_2">%2$d</xliff:g> 個) 的同步處理功能"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"已啟用所有項目的同步處理功能"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"已停用所有項目的同步處理功能"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"受管理的裝置資訊"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"由貴機構所管理的變更內容和設定"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 所管理的變更內容和設定"</string>
@@ -3576,6 +3686,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>
@@ -3589,5 +3700,11 @@
     <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="698847081680980774">"有什麼新奇功能？"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"查看前 5 大熱門功能"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"IMS 註冊狀態"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"已註冊"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"未註冊"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 1e2e2857913811a177b653ae632e051c47762b7c..df1e99588fb3b4573116178890083092dc656b1c 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 eac018005e04eeaac6dbbf7a9afe114c321e0794..71e956a3bf5c9ef6be2db821f1f3b37d054b4cbe 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,39 @@
     <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="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Yenza kamuva"</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 +460,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 +532,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="1688030823464420974">"Uma ufaka iphethini engalungile kumzamo olandelayo, le datha yamadivayisi izosuswa"</string>
+    <string name="lock_last_pin_attempt_before_wipe_device" msgid="5350785938296254352">"Uma ufaka iphinikhodi engalungile kumzamo olandelayo, le datha yalawa madivayisi izosuswa"</string>
+    <string name="lock_last_password_attempt_before_wipe_device" msgid="6208035114731421034">"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="5047439819181833824">"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 +647,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>
@@ -691,11 +720,14 @@
     <string name="wifi_wakeup" msgid="8815640989361538036">"Vula i-Wi‑Fi ngokuzenzakalelayo"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"I-Wi‑Fi izovuleka eceleni kwamanethiwekhi alondolozwe ngekhwalithi ephezulu, njengenethiwekhi yakho yasekhaya"</string>
     <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Akutholakali ngoba ukuskena kwe-Wi‑Fi kuvaliwe"</string>
+    <string name="wifi_wakeup_summary_scoring_disabled" msgid="108339002136866897">"Ukuze usebenzise, khetha umhlinzeki wesilinganiso senethiwekhi"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Gwema uxhumo olubi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ungasebenzisi inethiwekhi ye-Wi-Fi ngaphandle kokuthi inoxhumano lwe-intanethi olukahle."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Sebenzisa kuphela amanethwekhi anoxhumo oluhle lwe-inthanethi"</string>
     <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Xhumeka kumanethiwekhi avulekile"</string>
     <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Xhuma ngokuzenzakalelayo kumanethiwekhi omphakathi ekhwalithi ephezulu"</string>
+    <string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Ukuze usebenzise, khetha umhlinzeki wesilinganiso senethiwekhi"</string>
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Ukuze usebenzise, khetha umhlinzeki wesilinganiso senethiwekhi ehambisanayo"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Faka izitifiketi"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Ukuze uthuthukisa ukuqonda kwendawo, izinhlelo zokusebenza zesistimu namasistimu angasakwazi ukuthola amanethiwekhi we-Wi‑Fi. 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="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Ukuze uthuthukise ukunemba kwendawo, vula ukuskena kwe-Wi-Fi <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>kuzilungiselelo zokuskena<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -779,6 +811,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>
@@ -810,7 +843,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>
@@ -847,9 +879,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>
@@ -896,6 +936,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>
@@ -953,6 +994,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>
@@ -980,23 +1022,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>
@@ -1020,8 +1061,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="7337555569694794132">"Njalo kuvuliwe / Ukusetshenziswa kwebhethri okungeziwe"</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="6978257596231155345">"Isikhathi sokubonisa, izithonjana zesaziso, nolunye ulwazi. Ukusetshenziswa kwebhethri okungeziwe."</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>
@@ -1274,6 +1321,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>
@@ -1297,12 +1345,17 @@
     <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"Kukhona abanye abasebenzisi abakhona kule divayisi.\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Umculo"</li>\n<li>"Izithombe"</li>\n<li>"Enye idatha yomsebenzisi"</li></string>
+    <string name="master_clear_desc_also_erases_esim" msgid="312352697653096008"><li>"Izinkampani zenethiwekhi ku-eSIM"</li></string>
+    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="5460926449093211144">\n\n"Lokhu ngeke kukhansele uhlelo lwakho lwesevisi yefoni."</string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ukusula futhi umculo, izithombe, nenye idatha yomsebenzisi, "<b>" indawo yokugcina ye-USB"</b>"idinga ukusulwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ukusula umculo, izithombe, nenye imininingo yomsebenzisi, "<b>"ikhadi le-SD"</b>"kumele lisuswe."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Susa isitoreji se-USB"</string>
     <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>
@@ -1325,26 +1378,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>
@@ -1377,7 +1419,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>
@@ -1422,8 +1464,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>
@@ -1492,6 +1537,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>
@@ -1660,6 +1708,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>
@@ -1758,6 +1810,7 @@
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Izifundi zesikrini, ukuboniswa nezilawuli zokuzibandakanya"</string>
     <string name="vision_settings_title" msgid="4204111425716868288">"Izilungiselelo zokubonakala"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Ungenza ngendlela oyifisayo le divayisi ukuze ihlangabezane nezidingo zakho. Lezi zici ezingafinyeleleka zingashintshwa ngemuva kwesikhathi kuzilungiselelo."</string>
+    <string name="vision_settings_suggestion_title" msgid="917294957154878441">"Khulisa usayizi wombhalo"</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Izifundi zesikrini"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Umsindo nombhalo okusikrini"</string>
     <string name="display_category_title" msgid="685461049938269166">"Bonisa"</string>
@@ -1874,6 +1927,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>
@@ -1940,6 +1997,29 @@
     <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="4006631636646776488">"Ifoni yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina ifoni yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungamisa uhlelo lokusebenza.\n\nUma lokhu kuqhubeka ukwenzeka, kungenzeka kumele ukhiphe uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
+    <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"Ithebulethi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina ithebulethi yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungamisa uhlelo lokusebenza.\n\nUma lokhu kuqhubeka ukwenzeka, kungenzeka kumele ukhiphe uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
+    <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"Idivayisi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> igcina idivayisi yakho ivukile.\n\nUkuze uzame ukulungisa le nkinga, ungamisa uhlelo lokusebenza.\n\nUma lokhu kuhlala kwenzeka, kungenzeka kumele ukhiphe uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"Ifoni yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP_0">%1$s</xliff:g> ihlala ivusa ifoni yakho.\n\nUkuze uzame ukulungisa le nkinga, ungamisa i-<xliff:g id="APP_1">%1$s</xliff:g>.\n\nUma lokhu kuhlala kwenzeka, kungenzeka kumele ukhiphe uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"Ithebulethi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP_0">%1$s</xliff:g> ihlala ivusa ithebulethi yakho.\n\nUkuze uzame ukulungisa le nkinga, ungamisa i-<xliff:g id="APP_1">%1$s</xliff:g>.\n\nUma lokhu kuhlala kwenzeka, kungenzeka kumele ukhiphe uhlelo lokusebenza ukuze uthuthukise ukusebenza kwebhethri."</string>
+    <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"Idivayisi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP_0">%1$s</xliff:g> ihlala ivusa idivayisi yakho.\n\nUkuze uzame ukulungisa le nkinga, ungamisa i-<xliff:g id="APP_1">%1$s</xliff:g>.\n\nUma lokhu kuqhubeka ukwenzeka, kungenzeka kumele ukhiphe 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="6936542136153283692">"Vala ukusetshenziswa ngemuva uphinde umise uhlelo lokusebenza?"</string>
+    <string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"Ifoni yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP_0">%1$s</xliff:g> ihlala ivusa ifoni yakho.\n\nUkuze uzame ukulungisa le nkinga, ungamisa i-<xliff:g id="APP_1">%1$s</xliff:g> uphinde uyivimbele kusukela ekusebenzeni ngemuva."</string>
+    <string name="dialog_background_check_message" product="tablet" msgid="8348214419901788270">"Ithebulethi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP_0">%1$s</xliff:g> ihlala ivusa ithebulethi yakho.\n\nUkuze uzame ukulungisa le nkinga, ungamisa i-<xliff:g id="APP_1">%1$s</xliff:g> uphinde uyivimbele kusukela ekusebenzeni ngemuva."</string>
+    <string name="dialog_background_check_message" product="device" msgid="5847977433118915863">"Idivayisi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP_0">%1$s</xliff:g> ihlala ivusa idivayisi yakho.\n\nUkuze uzame ukulungisa le nkinga, ungamisa i-<xliff:g id="APP_1">%1$s</xliff:g> uphinde uyivimbele ekusebenzeni ngemuva."</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="7774807745601479888">"Ifoni yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> ihlala icela indawo yakho uma ungasebenzisi uhlelo lokusebenza.\n\nUkuze ulungise le nkinga, ungavala indawo yalolu hlelo lokuseenza."</string>
+    <string name="dialog_location_message" product="tablet" msgid="118745801732181618">"Ithebulethi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> ihlala icela indawo yakho uma ungasebenzisi uhlelo lokusebenza. \n\nUkuze ulungise le nkinga, ungavala indawo yalolu hlelo lokusebenza."</string>
+    <string name="dialog_location_message" product="device" msgid="6783678153382298295">"Idivayisi yakho ayikwazi ukuphatha ibhethri ngokujwayelekile ngoba i-<xliff:g id="APP">%1$s</xliff:g> ihlala icela indawo yakho uma ungasebenzisi uhlelo lokusebenza.\n\nUkuze ulungise le nkinga, ungavala indawo yalolu 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>
@@ -1954,7 +2034,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>
@@ -2006,12 +2086,13 @@
     <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>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ukwaphuka kusuka ekushajeni okuphelele"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Ukushija okuphelele kokugcina"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Isikhathi esisele sebhethri siyalinganiselwa futhi singashintsha ngokuya ngokusebenzisa"</string>
+    <string name="battery_footer_summary" msgid="67169726550144016">"Idatha yokusetshenziswa kwebhethri iyalinganiselwa futhi ingashintsha kusukela ekusetshenzisweni"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Ngenkathi kusebenza"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Ngenkathi kusemuva"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Ukusetshenziswa kwebhethri"</string>
@@ -2565,7 +2646,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>
@@ -2655,9 +2736,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>
@@ -2707,9 +2791,10 @@
     <string name="keywords_lockscreen" msgid="5746561909668570047">"slayida ukuze uvule, iphasiwedi, iphethini, iphinikhodi"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"ukuphonselwa inselelo komsebenzi, umsebenzi, iphrofayela"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"iphrofayela yomsebenzi, iphrofayela ephethwe, ukuhlanganisa, ukuhlanganisa, umsebenzi, iphrofayela"</string>
-    <string name="keywords_gesture" msgid="5696040361482126337">"ukuthinta"</string>
+    <string name="keywords_gesture" msgid="3526905012224714078">"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_assist_gesture_launch" msgid="813968759791342591">"ukuthinta"</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>
@@ -2792,7 +2877,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>
@@ -2807,6 +2893,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>
@@ -2834,8 +2924,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>
@@ -2919,6 +3007,7 @@
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kusukela koxhumana nabo abanenkanyezi kuphela"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Lutho"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ama-alamu"</string>
+    <string name="zen_mode_alarms_summary" msgid="3774926045611788635">"Ama-alamu ahlala abalulekile futhi enza umsindo"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Izikhumbuzi"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Imibuthano"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Bonke abafonayo"</string>
@@ -2966,11 +3055,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>
@@ -2978,7 +3062,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>
@@ -3096,6 +3180,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>
@@ -3188,8 +3281,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>
@@ -3279,6 +3372,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>
@@ -3297,8 +3399,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>
@@ -3318,7 +3419,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>
@@ -3382,8 +3483,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>
@@ -3454,25 +3554,32 @@
     <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="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>
+    <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="gesture_setting_on" msgid="3455094265233870280">"Kuvuliwe"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Kuvaliwe"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"I-Bootloader isivele ivuliwe"</string>
@@ -3493,6 +3600,9 @@
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Vumelanisa ngokuzenzakalelayo idatha yomsebenzi"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"Vumela izinhlelo zokusebenza ziqalise kabusha idatha ngokuzenzakalelayo"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Ukuvumelanisa kwe-akhawunti"</string>
+    <string name="account_sync_summary_some_on" msgid="3375930757891381175">"Ukuvumelanisa kuvulelwe okungu-<xliff:g id="ID_1">%1$d</xliff:g> kuzinto ezingu-<xliff:g id="ID_2">%2$d</xliff:g>"</string>
+    <string name="account_sync_summary_all_on" msgid="570431636622254156">"Ukuvumelanisa kuvulelwe zonke izinto"</string>
+    <string name="account_sync_summary_all_off" msgid="8782409931761182734">"Ukuvumelanisa kuvalelwe zonke izinto"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Ulwazi lwedivayisi oluphethwe"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Ushintsho nezilungiselelo eziphethwe inhlangano yakho"</string>
     <string name="enterprise_privacy_settings_summary_with_name" msgid="4266234968317996188">"Ushintsho nezilungiselelo eziphethwe yi-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
@@ -3573,6 +3683,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>
@@ -3586,5 +3697,11 @@
     <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="698847081680980774">"Yini okusha nokujabulisayo?"</string>
+    <string name="new_device_suggestion_summary" msgid="7172709269203435870">"Hlola izici ezingu-5 eziphezulu"</string>
+    <string name="ims_reg_title" msgid="7609782759207241443">"Isimo sokubhaliswa se-IMS"</string>
+    <string name="ims_reg_status_registered" msgid="933003316932739188">"Kubhalisiwe"</string>
+    <string name="ims_reg_status_not_registered" msgid="6529783773485229486">"Akubhalisiwe"</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 873576c7041d1d7a65d4d0e4d0795a95139bdab6..5e1a468f87bcbbd172e383c6a40e1e5ad2792c0d 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 9f87d0306dd29c3ce8c2834e55d34f2da42a6eec..acb6ec3effde5948b97706de63b4eaeaed830cd5 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 ef8592588d1d9a0b28a161b1deb2c8770a713ee7..3e80ab49c0c3316a7d1b965a666a9bdaab69a953 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -100,7 +100,7 @@
     <color name="usage_graph_dots">#B0BEC5</color>
 
     <!-- Gestures settings -->
-    <color name="gestures_setting_background_color">#f5f5f5</color>
+    <color name="gestures_setting_background_color">#f4f4f4</color>
 
     <color name="status_bar_color">#3c3c3c</color>
 
@@ -110,4 +110,10 @@
     <!-- 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>
+
+    <!-- Suggestion/condition colors -->
+    <color name="suggestion_condition_background">#f2f2f2</color>
+    <color name="condition_card_background">#f8f8f8</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index f81bf9b3e38d08d1db981ee5f3f2e3b8ae50180b..f1d692388910de383f3481726e752869d3df5144 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -99,4 +99,17 @@
         -->
     </string-array>
 
+    <!-- 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>
+
+    <!-- Whether or not new device intro suggestion is supported for this device -->
+    <bool name="config_new_device_intro_suggestion_supported">false</bool>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index c8737b9c748c0a8184c503b96693d50ce10d95a2..af20217036675edcb1cc8ccb3640f87388cb0a2b 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,15 @@
     <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>
+
+    <dimen name="search_bar_height">48dp</dimen>
+    <dimen name="search_bar_text_size">16dp</dimen>
+
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
     <dimen name="wifi_assistant_padding_start_end">16dp</dimen>
@@ -220,12 +228,13 @@
     <dimen name="fingerprint_error_text_appear_distance">16dp</dimen>
     <dimen name="fingerprint_error_text_disappear_distance">-8dp</dimen>
     <dimen name="fingerprint_animation_size">88dp</dimen>
-    <dimen name="fingerprint_progress_bar_max_size">220dp</dimen>
+    <dimen name="fingerprint_progress_bar_max_size">240dp</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="fingerprint_enrolling_content_margin_vertical">24dp</dimen>
+    <!-- To be the same size as fingerprint progress bar:
+         fingerprint_finish_max_size = fingerprint_progress_bar_max_size
+                  + (fingerprint_enrolling_content_margin_vertical x 2) -->
+    <dimen name="fingerprint_finish_max_size">288dp</dimen>
 
     <dimen name="confirm_credentials_security_method_margin">48dp</dimen>
     <dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen>
@@ -300,9 +309,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>
@@ -316,8 +322,15 @@
     <dimen name="storage_donut_view_label_text_size">14sp</dimen>
     <!-- Text size of the label text in the donut if the label text is long. -->
     <dimen name="storage_donut_view_shrunken_label_text_size">10sp</dimen>
+    <!-- The width of the storage summary donut -->
+    <dimen name="storage_donut_thickness">4dp</dimen>
 
     <!-- Battery meter view size -->
     <dimen name="battery_meter_width">66dp</dimen>
     <dimen name="battery_meter_height">100dp</dimen>
+
+    <!-- Suggestion/condition header padding -->
+    <dimen name="suggestion_condition_header_padding_collapsed">10dp</dimen>
+    <dimen name="suggestion_condition_header_padding_expanded">5dp</dimen>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b77f4b5b5018b3907f07f80b39fa3d7504bf994e..b2070098517422f78c6fa08764c5b3d35a21eecb 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" 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">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="device">Your device will disconnect from "<xliff:g id="device_name">%1$s</xliff:g>."</string>
+    <!-- dialog ok button for disconnect dialog [CHAR LIMIT=20] -->
+    <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,19 @@
     <!-- 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>
+    <!-- Button text to skip enrollment of fingerprint [CHAR LIMIT=40] -->
+    <string name="security_settings_fingerprint_enroll_enrolling_skip">Do it later</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] -->
@@ -859,8 +885,8 @@
     <string name="security_settings_fingerprint_enroll_done">Done</string>
     <!-- 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>
+    <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=NONE] -->
+    <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 +1104,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 +1251,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 +1519,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>
@@ -1632,6 +1700,8 @@
     <string name="wifi_wakeup_summary">Wi\u2011Fi will turn back on near high\u2011quality saved networks, like your home network</string>
     <!-- Checkbox summary for Wi-Fi wakeup option to explain that Wi-Fi wakeup is disabled because Wi-Fi scanning is turned off -->
     <string name="wifi_wakeup_summary_scanning_disabled">Unavailable because Wi\u2011Fi scanning is turned off</string>
+    <!-- Checkbox summary for Wi-Fi wakeup option to explain that a network rating provider needs to be selected to use the feature. -->
+    <string name="wifi_wakeup_summary_scoring_disabled">To use, select a network rating provider</string>
     <!-- Checkbox title for option to toggle poor network detection -->
     <string name="wifi_poor_network_detection">Avoid poor connections</string>
     <!-- Checkbox summary for option to toggle poor network detection -->
@@ -1642,6 +1712,10 @@
     <string name="use_open_wifi_automatically_title">Connect to open networks</string>
     <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
     <string name="use_open_wifi_automatically_summary">Automatically connect to high\u2011quality public networks</string>
+    <!-- Checkbox summary for option to connect to open Wi-Fi automatically, to explain that a network rating provider needs to be selected to use the feature. -->
+    <string name="use_open_wifi_automatically_summary_scoring_disabled">To use, select a network rating provider</string>
+    <!-- Checkbox summary for option to connect to open Wi-Fi automatically, to explain that a compatible network rating provider needs to be selected to use the feature. -->
+    <string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled">To use, select a compatible network rating provider</string>
     <!-- Preference title for option to install certificates -->
     <string name="wifi_install_credentials">Install certificates</string>
     <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off and Wi-Fi
@@ -1820,6 +1894,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>
@@ -1882,8 +1958,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 -->
@@ -1962,12 +2036,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 -->
@@ -2115,6 +2208,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] -->
@@ -2247,6 +2342,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 -->
@@ -2303,40 +2400,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>
@@ -2384,10 +2479,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=50] 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 / Increased battery usage</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. Increased battery usage.</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] -->
@@ -3025,13 +3133,17 @@
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
     <string name="master_clear_desc" product="tablet">"This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc" product="default">"This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>Your Google account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps"</li></string>
+    <string name="master_clear_desc" product="default">"This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>Your Google account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
     <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
     <string name="master_clear_accounts" product="default">"\n\nYou are currently signed into the following accounts:\n"</string>
     <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
     <string name="master_clear_other_users_present" product="default">"\n\nThere are other users present on this device.\n"</string>
     <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
     <string name="master_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
+    <!-- SD card & phone storage settings screen, list of items on an eSIM (embedded SIM) that will be erased during this operation [CHAR LIMIT=NONE] -->
+    <string name="master_clear_desc_also_erases_esim">"<li>Carriers on eSIM</li>"</string>
+    <!-- SD card & phone storage settings screen, notification if there are eSIM (embedded SIM) profiles present that the user's mobile service plan will not be canceled [CHAR LIMIT=NONE] -->
+    <string name="master_clear_desc_no_cancel_mobile_plan">"\n\nThis will not cancel your mobile service plan.</string>
     <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
     <string name="master_clear_desc_erase_external_storage" product="nosdcard">"\n\nTo clear music, pictures, and other user data, the <b>USB storage</b> needs to be erased."</string>
     <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
@@ -3044,6 +3156,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 -->
@@ -3092,49 +3210,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>
@@ -3208,7 +3302,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 -->
@@ -3313,10 +3407,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] -->
@@ -3472,6 +3572,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">
@@ -3871,6 +3977,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 -->
@@ -4111,6 +4226,8 @@
     <string name="vision_settings_title">Vision Settings</string>
     <!-- Settings description for a brief version of Vision-Related Accessibility Settings. Tells the user that they can adjust these settings now to help them through the remainder of the Setup Wizard and that they can later be changed in Settings. Displayed in Setup Wizard only. [CHAR LIMIT=none] -->
     <string name="vision_settings_description">You can customize this device to fit your needs. These accessibility features can be changed later in Settings.</string>
+    <!-- Label for suggested action which will allow the user to change the font size and other accessibility settings. [CHAR LIMIT=40] -->
+    <string name="vision_settings_suggestion_title">Increase font size</string>
     <!-- Title for the accessibility preference category of screen reader services and settings. [CHAR LIMIT=50] -->
     <string name="screen_reader_category_title">Screen readers</string>
     <!-- Title for the accessibility preference category of audio services and settings. [CHAR LIMIT=50] -->
@@ -4373,6 +4490,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>
 
@@ -4536,6 +4659,60 @@
     <!-- 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 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 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 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_wakeup_alarm" 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 try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g>.\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_wakeup_alarm" 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 try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g>.\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_wakeup_alarm" 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 try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g>.\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=70] -->
+    <string name="dialog_background_check_title">Turn off background usage &amp; stop app?</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 try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g> and prevent it 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 try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g> and prevent it 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 try to fix this issue, you can stop <xliff:g id="app">%1$s</xliff:g> and prevent it 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 -->
@@ -4565,7 +4742,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>
@@ -4685,6 +4862,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] -->
@@ -4695,8 +4874,8 @@
     <string name="battery_detail_since_full_charge">Breakdown since last full charge</string>
     <!-- Title for usage time since last full charge. [CHAR LIMIT=60] -->
     <string name="battery_last_full_charge">Last full charge</string>
-    <!-- Description for text in battery footer. [CHAR LIMIT=120] -->
-    <string name="battery_footer_summary">Remaining battery time is approximate and can change based on usage</string>
+    <!-- Description for text in battery footer. [CHAR LIMIT=NONE] -->
+    <string name="battery_footer_summary">Battery usage data is approximate and can change based on usage</string>
     <!-- Title for text that shows the amount of time an app has been running while in the foreground. [CHAR LIMIT=80] -->
     <string name="battery_detail_foreground">While in active use</string>
     <!-- Title for text that shows the amount of time an app has been running while in the background. [CHAR LIMIT=80] -->
@@ -5976,7 +6155,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>
@@ -6037,6 +6216,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] -->
@@ -6049,6 +6230,33 @@
     <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>
+    <string name="help_url_icc_lock" translatable="false"></string>
+    <string name="help_uri_process_stats_summary" translatable="false"></string>
+    <string name="help_uri_process_stats_apps" translatable="false"></string>
 
     <!-- User account title [CHAR LIMIT=30] -->
     <string name="user_account_title">Account for content</string>
@@ -6236,12 +6444,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]-->
@@ -6308,9 +6523,10 @@
     <string name="keywords_lockscreen">slide to unlock, password, pattern, PIN</string>
     <string name="keywords_profile_challenge">work challenge, work, profile</string>
     <string name="keywords_unification">work profile, managed profile, unify, unification, work, profile</string>
-    <string name="keywords_gesture">gesture</string>
+    <string name="keywords_gesture">gestures</string>
     <string name="keywords_payment_settings">pay, tap, payments</string>
     <string name="keywords_backup">backup, back up</string>
+    <string name="keywords_assist_gesture_launch">gesture</string>
 
     <!-- NFC Wi-Fi pairing/setup strings-->
 
@@ -6565,8 +6781,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>
@@ -6619,6 +6838,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>
 
@@ -6705,12 +6938,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>
 
@@ -6947,6 +7174,9 @@
     <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
     <string name="zen_mode_alarms">Alarms</string>
 
+    <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option summary -->
+    <string name="zen_mode_alarms_summary">Alarms are always a priority and make sound</string>
+
     <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
     <string name="zen_mode_reminders">Reminders</string>
 
@@ -7069,46 +7299,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] -->
@@ -7404,6 +7626,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>
 
@@ -7670,10 +7907,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>
@@ -7899,12 +8138,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>
 
@@ -7960,10 +8217,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>
@@ -8012,7 +8266,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>
@@ -8173,11 +8427,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>
@@ -8363,7 +8617,7 @@
     <!-- 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]-->
+    <!-- Preference title for gesture settings [CHAR LIMIT=40 BACKUP_MESSAGE_ID:5280023307132819052]-->
     <string name="gesture_preference_title">Gestures</string>
 
     <!-- Preference summary for gesture settings (phone) [CHAR LIMIT=NONE]-->
@@ -8379,35 +8633,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>
+
+    <!-- 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>
 
-    <!-- Title text for ambient display pick up (phone) [CHAR LIMIT=60]-->
+    <!-- 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>
@@ -8419,14 +8695,14 @@
     <!-- 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 text for the assist gesture [CHAR LIMIT=60]-->
-    <string name="assist_gesture_title">Assist gesture</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 text for the assist gesture [CHAR LIMIT=160]-->
-    <string name="assist_gesture_summary"></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 text for the assist gesture sensitivity setting [CHAR LIMIT=NONE]-->
-    <string name="assist_gesture_sensitivity_title">Sensitivity</string>
+    <!-- Title text for the assist gesture [CHAR LIMIT=60] DO NOT TRANSLATE -->
+    <string name="assist_gesture_title" translatable="false"></string>
 
     <!-- Switch text for each gesture setting state -->
     <string name="gesture_setting_on">On</string>
@@ -8477,6 +8753,12 @@
     <string name="auto_sync_account_summary">Let apps refresh data automatically</string>
     <!-- Preference label to sync account [CHAR LIMIT=60] -->
     <string name="account_sync_title">Account sync</string>
+    <!-- Preference summary for account sync when syncing is on for some items [CHAR LIMIT=NONE] -->
+    <string name="account_sync_summary_some_on">Sync on for <xliff:g name="count" example="5">%1$d</xliff:g> of <xliff:g name="total" example="8">%2$d</xliff:g> items</string>
+    <!-- Preference summary for account sync when syncing is on for everything [CHAR LIMIT=NONE] -->
+    <string name="account_sync_summary_all_on">Sync on for all items</string>
+    <!-- Preference summary for account sync when syncing is off for everything [CHAR LIMIT=NONE] -->
+    <string name="account_sync_summary_all_off">Sync off for all items</string>
 
     <!-- Enterprise Privacy --> <skip />
 
@@ -8633,6 +8915,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] -->
@@ -8680,13 +8965,23 @@
     <!-- 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>
 
-
     <!--Label of IMS registration header -->
     <string name="ims_reg_title">"IMS registration state"</string>
     <!--Used when IMS registration state is registered -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index bae36b3a39705d75d63976312e2a38d81c7320f3..fee7c74017560ca3cfad2907225ae567afa01a31 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -79,6 +79,7 @@
         <item name="android:gravity">center</item>
         <item name="android:singleLine">true</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textSize">24sp</item>
     </style>
 
     <style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material">
@@ -282,6 +283,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 +423,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 +450,17 @@
         <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/suggestion_condition_background</item>
+    </style>
+
+    <style name="TextAppearance.SearchBar" parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle">
+        <item name="android:textSize">@dimen/search_bar_text_size</item>
+    </style>
+
 </resources>
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index d9124c577c5cfc8d37dedf414b4554e29b873346..8b5e7d3edab353b02b7af90195843a849d94d85e 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,8 @@
            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="singleLineTitle">false</item>
         <item name="android:dialogLayout">@layout/preference_dialog_edittext</item>
     </style>
 
@@ -68,10 +69,11 @@
         <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>
+        <item name="singleLineTitle">false</item>
     </style>
 
     <style name="SyncSwitchPreference" parent="SettingsPreference">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 3dbaa8b8a9285715064bf26e8cdf6132328f694f..0b883e4d9dbef1d42d0b809d2718e1cc839b4627 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 f774335705b759f4fa68cf9613ba40901c95bf3d..6bd6c4dd709a7fb8e7c5651e8410427dafc3f7dd 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 9f08400382770269e0ac9d0fdc3cea8eb7104e86..9b553ac5a515ea128dc77a14c2c9ed821de1f7c6 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 ab997a577f1908580e35cd254fe1818a8ecbc141..7f57ed0ab4e8655bab247b0377c246d12e045d64 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"
@@ -39,6 +39,7 @@
       android:key="remove_account"
       android:layout="@layout/remove_account_button"
       android:order="1000"
-      android:selectable="false"/>
+      android:selectable="false"
+      settings:allowDividerAbove="true"/>
 
 </PreferenceScreen>
diff --git a/res/xml/ambient_display_settings.xml b/res/xml/ambient_display_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..47fed8a8c5f11246af25647ec5ffb5ae34d8ac0a
--- /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 639735dcb59679245c3ddd5d165f28772230881f..4a5ee1dda91d3562019ad1f51876b852ddc35ab0 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -20,6 +20,31 @@
     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>
+
+    <!-- Empty category to draw divider -->
+    <PreferenceCategory
+        android:key="all_app_info_divider"
+        android:order="-190"/>
+
     <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 2aae95ee5e596039b73f238dc25e3ee4ec480b39..1daf15de74a87d62faf7ff9ddce69413ce2515f2 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/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index 1c71bfa55d16778cbee266a103738b4846d695b3..b96afbf84b6beb0a84fcbf9f711d8bfb73ffc3d2 100644
--- a/res/xml/app_storage_settings.xml
+++ b/res/xml/app_storage_settings.xml
@@ -41,7 +41,6 @@
 
     <PreferenceCategory
         android:key="storage_category"
-        android:layout="@layout/tall_preference_category"
         android:title="@string/app_info_storage_title"
         settings:allowDividerAbove="false"
         settings:allowDividerBelow="false">
diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml
index 52ee247970fc4b9b68b205ae4d7deca06fe47724..4455655f3d282cf60e0f7b5e5874e810d3baf7f5 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,6 @@
     <SwitchPreference
         android:key="gesture_assist"
         android:title="@string/assist_gesture_title"
-        android:summary="@string/assist_gesture_summary" />
-
-    <com.android.settings.SeekBarPreference
-        android:key="gesture_assist_sensitivity"
-        android:title="@string/assist_gesture_sensitivity_title"
-        android:defaultValue="2"
-        android:max="4" />
+        app:keywords="@string/keywords_assist_gesture_launch"/>
 
 </PreferenceScreen>
diff --git a/res/xml/bluetooth_device_details_fragment.xml b/res/xml/bluetooth_device_details_fragment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..952ec1a27c50e64654db1ee4573daff9fab55cb6
--- /dev/null
+++ b/res/xml/bluetooth_device_details_fragment.xml
@@ -0,0 +1,34 @@
+<?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_device_advanced_title">
+
+    <com.android.settings.applications.LayoutPreference
+        android:key="bluetooth_device_header"
+        android:layout="@layout/settings_entity_header"
+        android:selectable="false"/>
+
+    <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 0000000000000000000000000000000000000000..30eaf09b46400be7d8fab4a30539e2234128e968
--- /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 783a860429f04aa75fafa7f5a88d8ed2c0ccdf60..86d6d01ee310c3c6ca92a993d14e7540a0ff238e 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,28 @@
 
 <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" />
+
+    <PreferenceCategory>
+
+        <Preference
+            android:key="bt_rename_device"
+            android:title="@string/bluetooth_device_name"
+            android:summary="@string/summary_placeholder" />
+
+        <Preference
+            android:key="bt_received_files"
+            android:title="@string/bluetooth_show_received_files" />
+
+    </PreferenceCategory>
+
+    <com.android.settingslib.widget.FooterPreference />
 
 </PreferenceScreen>
diff --git a/res/drawable/search_panel_list_background.xml b/res/xml/bluetooth_settings_obsolete.xml
similarity index 73%
rename from res/drawable/search_panel_list_background.xml
rename to res/xml/bluetooth_settings_obsolete.xml
index 7f7b5604e6b02dc1e17570e8a9b935b61b416ec7..55a099cb19e81a9e30c120922112996af4b3f2f2 100644
--- a/res/drawable/search_panel_list_background.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.
 -->
 
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:inset="0dip">
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/bluetooth_settings" >
 
-    <color android:color="?android:attr/colorBackground" />
-
-</inset>
+</PreferenceScreen>
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index d70cc335ce877315efda2f23f6853147618abc21..ecbcbd1119a1ab36132af31dfd04e2723f85782d 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 a1f3110216c451dec406bdf2ee7a52171f649b07..aca87fb657160f80e170c8154b96c7bf4fe8b8a2 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 1873eeee19bcccf0028a74f5dd23a6aee89dbe67..7c0c0b3f3038f6e790ca51b24e082f0aa6b8c65b 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" />
 
@@ -187,11 +188,16 @@
             android:title="@string/wifi_allow_scan_with_traffic"
             android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
 
-       <SwitchPreference
+        <SwitchPreference
             android:key="mobile_data_always_on"
             android:title="@string/mobile_data_always_on"
             android:summary="@string/mobile_data_always_on_summary"/>
 
+        <SwitchPreference
+            android:key="tethering_hardware_offload"
+            android:title="@string/tethering_hardware_offload"
+            android:summary="@string/tethering_hardware_offload_summary"/>
+
         <ListPreference
             android:key="select_usb_configuration"
             android:title="@string/select_usb_configuration_title"
@@ -416,12 +422,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 50e68910e474655fd42d9068dcd5e745cff57861..27ef86948d106bb5a4ef8b07595ff6e967f4c9fe 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -31,9 +31,11 @@
         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" />
 
+    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
     <SwitchPreference
         android:key="auto_brightness"
         android:title="@string/auto_brightness_title"
@@ -50,6 +52,7 @@
             android:targetClass="@string/config_wallpaper_picker_class" />
     </com.android.settingslib.RestrictedPreference>
 
+    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
     <com.android.settings.TimeoutListPreference
         android:key="screen_timeout"
         android:title="@string/screen_timeout"
@@ -57,10 +60,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 +82,13 @@
     <Preference
         android:key="screensaver"
         android:title="@string/screensaver_settings_title"
-        android:fragment="com.android.settings.DreamSettings" />
+        android:fragment="com.android.settings.dream.DreamSettings" />
+
+    <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
+    <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 +108,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 54854a85b88c777398857b498960fd8fee00e917..4d89de6da9aa66e74a3cc0303cdd978237324a49 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 f7fe853958c40f9c4eee70c59bd202f634b03e41..1601aaefbca54bab2fdbc65b821fa4ea34e2383f 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 f77d7788afa3cafeff6b2e8c76b5e99e224f1962..94d97825eb125c0f6144f65dea71d40717086d8a 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 0000000000000000000000000000000000000000..d27a6e3747b2b9b718761e6442ffd320b9878ea9
--- /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/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index be643b16ff442f40c946bd16c78ad267eb447425..715ea1411582fc2c0f44cfd5b2e5acaf5aaca543 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml
@@ -24,25 +24,21 @@
             android:order="100">
 
         <com.android.settingslib.RestrictedPreference android:key="credential_storage_type"
-                android:title="@string/credential_storage_type"
-                android:persistent="false" />
+                android:title="@string/credential_storage_type" />
 
         <Preference android:key="trusted_credentials"
                 android:title="@string/trusted_credentials"
                 android:summary="@string/trusted_credentials_summary"
-                android:persistent="false"
                 android:fragment="com.android.settings.TrustedCredentialsSettings"/>
 
         <com.android.settingslib.RestrictedPreference android:key="user_credentials"
                 android:title="@string/user_credentials"
                 android:summary="@string/user_credentials_summary"
-                android:persistent="false"
                 android:fragment="com.android.settings.UserCredentialsSettings"/>
 
         <com.android.settingslib.RestrictedPreference android:key="credentials_install"
                 android:title="@string/credentials_install"
-                android:summary="@string/credentials_install_summary"
-                android:persistent="false">
+                android:summary="@string/credentials_install_summary">
 
             <intent android:action="android.credentials.INSTALL"
                     android:targetPackage="com.android.certinstaller"
@@ -52,8 +48,7 @@
 
         <com.android.settingslib.RestrictedPreference android:key="credentials_reset"
                 android:title="@string/credentials_reset"
-                android:summary="@string/credentials_reset_summary"
-                android:persistent="false">
+                android:summary="@string/credentials_reset_summary">
 
             <intent android:action="com.android.credentials.RESET"
                     android:targetPackage="com.android.settings"
diff --git a/res/xml/installed_app_details_ia.xml b/res/xml/installed_app_details.xml
similarity index 89%
rename from res/xml/installed_app_details_ia.xml
rename to res/xml/installed_app_details.xml
index 538205f8343fefdcda4b278fe1f906da892116f5..df7027c8e0bfb13bdb2fa6d150e40f0652c47e48 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:selectable="true"
+        app:summaryLineCount="1" />
 
     <Preference
         android:key="storage_settings"
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index 6e65da689c78bcc918a5f0e37a6dd8a5b083a9a1..2996c78c28955453c8a11d616f278f73c3fe7599 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -18,11 +18,12 @@
 <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"
         android:title="@string/phone_language"
+        android:icon="@drawable/ic_translate_24dp"
         android:fragment="com.android.settings.localepicker.LocaleListEditor"/>
 
     <PreferenceCategory
@@ -63,37 +64,38 @@
 
     <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_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 7feffcaa32c0687c705a11bb0c027cbff3098c28..ee25bee5989dae81c003c7a2ae4cc786b6a2e160 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 f78a7694de6db609d2aac24a4cf23169acabf437..dc4fecd8b775c092c8edf7f2f3e7fa1235797d94 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 78122aa4a7099304cd7e426db4b69603c682073d..0b4a1de367c383c481643202912321ad23ce0096 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/xml/power_abnormal_detail.xml b/res/xml/power_abnormal_detail.xml
new file mode 100644
index 0000000000000000000000000000000000000000..de918a9432a081d351394c7064d21713e458ef47
--- /dev/null
+++ b/res/xml/power_abnormal_detail.xml
@@ -0,0 +1,24 @@
+<?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/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 78%
rename from res/xml/power_usage_detail_ia.xml
rename to res/xml/power_usage_detail.xml
index 39e6c385d52176319886ce578ca24a7769bb32cc..919f321edc0903d3b077c33d138ae017c5a4fa3c 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"/>
 
@@ -29,20 +29,28 @@
         android:selectable="false"
         android:order="-9999"/>
 
+    <Preference
+        android:key="high_usage"
+        android:icon="@drawable/ic_battery_alert_24dp"
+        android:title="@string/power_high_usage_title"/>
+
     <PreferenceCategory
         android:title="@string/battery_detail_info_title">
 
         <Preference
             android:key="app_usage_foreground"
-            android:title="@string/battery_detail_foreground"/>
+            android:title="@string/battery_detail_foreground"
+            android:selectable="false"/>
 
         <Preference
             android:key="app_usage_background"
-            android:title="@string/battery_detail_background"/>
+            android:title="@string/battery_detail_background"
+            android:selectable="false"/>
 
         <Preference
             android:key="app_power_usage"
-            android:title="@string/battery_detail_power_usage"/>
+            android:title="@string/battery_detail_power_usage"
+            android:selectable="false"/>
 
     </PreferenceCategory>
 
diff --git a/res/xml/power_usage_summary.xml b/res/xml/power_usage_summary.xml
index abd659e60762fd4f3b7009e51561b81b6d6270aa..efdae9214f7f240addbc87624bb049502cf397ca 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">
 
@@ -54,14 +59,14 @@
             android:title="@string/battery_percentage"
             android:summary="@string/battery_percentage_description"/>
 
-        <!-- Cross-listed item, if you change this, also change it in ia_display_settings.xml -->
+        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->
         <SwitchPreference
             android:key="auto_brightness_battery"
             android:title="@string/auto_brightness_title"
             android:summary="@string/auto_brightness_summary"
             settings:keywords="@string/keywords_display_auto_brightness"/>
 
-        <!-- Cross-listed item, if you change this, also change it in ia_display_settings.xml -->
+        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->
         <com.android.settings.TimeoutListPreference
             android:key="screen_timeout_battery"
             android:title="@string/screen_timeout"
@@ -69,6 +74,12 @@
             android:entries="@array/screen_timeout_entries"
             android:entryValues="@array/screen_timeout_values"/>
 
+        <!-- Cross-listed item, if you change this, also change it in display_settings.xml -->
+        <Preference
+            android:key="ambient_display_battery"
+            android:title="@string/ambient_display_screen_title"
+            android:fragment="com.android.settings.display.AmbientDisplaySettings" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/security_settings_encrypted.xml b/res/xml/security_settings_encrypted.xml
index 391f0fe036285c758f185af306483dcd3a45840e..0d3fe760f5f5e1a90db6e41a5dc296cb4bc7d1ec 100644
--- a/res/xml/security_settings_encrypted.xml
+++ b/res/xml/security_settings_encrypted.xml
@@ -18,12 +18,10 @@
                   android:title="@string/security_settings_title">
 
     <PreferenceCategory
-        android:key="security_category"
+        android:key="security_category_for_encrypted_device"
         android:title="@string/crypt_keeper_settings_title">
 
         <Preference
-            android:enabled="false"
-            android:shouldDisableView="false"
             android:key="crypt_keeper_encrypt_title"
             android:title="@string/crypt_keeper_encrypt_title"
             android:summary="@string/crypt_keeper_encrypted_summary"/>
diff --git a/res/xml/security_settings_unencrypted.xml b/res/xml/security_settings_unencrypted.xml
index 7c51d259aaed03c1b8f35f0d730a440ba9e7941d..27dbe968038581c2198fe9840ca35d52f5b88fda 100644
--- a/res/xml/security_settings_unencrypted.xml
+++ b/res/xml/security_settings_unencrypted.xml
@@ -18,14 +18,14 @@
                   android:title="@string/crypt_keeper_settings_title">
 
     <PreferenceCategory
-        android:key="security_category"
+        android:key="security_category_for_unencrypted_device"
         android:title="@string/crypt_keeper_settings_title">
 
         <Preference
             android:key="encryption"
             android:title="@string/crypt_keeper_encrypt_title"
             android:fragment="com.android.settings.CryptKeeperSettings" />
-    
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index b31d0eb89d54483c3f405852e8f60e0ee279d7a0..54699d364b4ff951f196efb7b946677304a73800 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -26,20 +26,20 @@
         android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"
         android:key="toggle_asm"
         android:title="@string/automatic_storage_manager_preference_title"
-        android:icon="@drawable/ic_settings_storage"
+        android:icon="@drawable/ic_storage"
         android:order="1"
         settings:allowDividerAbove="true"
         settings:allowDividerBelow="true"/>
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_photos_videos"
         android:title="@string/storage_photos_videos"
-        android:icon="@drawable/ic_photo_library_vd_theme_24"
+        android:icon="@drawable/ic_photo_library"
         settings:allowDividerAbove="true"
         android:order="2" />
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_music_audio"
         android:title="@string/storage_music_audio"
-        android:icon="@drawable/ic_music_note_vd_theme_24"
+        android:icon="@drawable/ic_media_stream"
         android:order="3" />
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_games"
@@ -49,12 +49,12 @@
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_movies"
         android:title="@string/storage_movies_tv"
-        android:icon="@drawable/ic_theaters_vd_theme_24"
+        android:icon="@drawable/ic_local_movies"
         android:order="5" />
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_other_apps"
         android:title="@string/storage_other_apps"
-        android:icon="@drawable/ic_apps_vd_theme_24"
+        android:icon="@drawable/ic_storage_apps"
         android:order="6" />
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_files"
diff --git a/res/xml/storage_profile_fragment.xml b/res/xml/storage_profile_fragment.xml
index be269e5513a53a73083461b9572cf87132d2d7c1..a12bdd53c418e3d0694bcfabb42f7c2bd810cb97 100644
--- a/res/xml/storage_profile_fragment.xml
+++ b/res/xml/storage_profile_fragment.xml
@@ -21,12 +21,12 @@
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_photos_videos"
         android:title="@string/storage_photos_videos"
-        android:icon="@drawable/ic_photo_library_vd_theme_24"
+        android:icon="@drawable/ic_photo_library"
         android:order="2" />
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_music_audio"
         android:title="@string/storage_music_audio"
-        android:icon="@drawable/ic_music_note_vd_theme_24"
+        android:icon="@drawable/ic_media_stream"
         android:order="3" />
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_games"
@@ -36,13 +36,13 @@
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_movies"
         android:title="@string/storage_movies_tv"
-        android:icon="@drawable/ic_theaters_vd_theme_24"
+        android:icon="@drawable/ic_local_movies"
         android:order="5"
     />
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_other_apps"
         android:title="@string/storage_other_apps"
-        android:icon="@drawable/ic_apps_vd_theme_24"
+        android:icon="@drawable/ic_storage_apps"
         android:order="6" />
     <com.android.settings.deviceinfo.StorageItemPreference
         android:key="pref_files"
diff --git a/res/xml/suggestion_ordering.xml b/res/xml/suggestion_ordering.xml
index 1eeafba1bf8f57258e381080f938dbf98fd26e8f..e21fe5b82c13e378394f1bd3eb6600da278ec0d1 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 b26af385c2ea007bac7dc108f1e436a56ba51b2c..6269bdc4177529e5b3bf75923d3ffe887357547a 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 a936a50620ec9c619d100f51f33ce5077246b9b1..a5062915280cffe781964973b01a205b105bd9bb 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 78c4c449b0d575999cfb27b20517c476594063c3..c141dad1ed13bfc2f46bcb50c458624c2c3f4b6c 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 ac992d7c51ff07621801adbb595480405264c370..1747b63f9d150ddf69c187d55b5d14f20c45f33f 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_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index f9926cafd2867d638a0f4fa53707493ffb6b0e1a..64e61b196b52d50b7d4adad31fb0e32d1d993460 100644
--- a/res/xml/wifi_network_details_fragment.xml
+++ b/res/xml/wifi_network_details_fragment.xml
@@ -18,10 +18,11 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
 
-    <!-- Connected Network Header -->
-    <Preference
-            android:key="connection_detail"
-            android:layout="@layout/connection_detail_pref"/>
+    <com.android.settings.applications.LayoutPreference
+        android:key="connection_header"
+        android:layout="@layout/settings_entity_header"
+        android:selectable="false"
+        android:order="-10000"/>
 
     <!-- General Details Category -->
     <PreferenceCategory
diff --git a/res/xml/wifi_p2p_settings.xml b/res/xml/wifi_p2p_settings.xml
index 2b19ee994b3fba6213b04f8bc1d329256a687d48..0bdc1cf75b238b56d44eadb17bb6e6cc525c553d 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/res/xml/zen_mode_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml
index e2b8f48a079f306ebaed8d95960e59caf2f29ccc..e4f8f5e0f6f35744b91a20ff8140f7fcdf3898c3 100644
--- a/res/xml/zen_mode_priority_settings.xml
+++ b/res/xml/zen_mode_priority_settings.xml
@@ -19,13 +19,6 @@
     android:key="zen_mode_priority_settings"
     android:title="@string/zen_mode_priority_settings_title" >
 
-    <!-- Alarms -->
-    <SwitchPreference
-        android:key="alarms"
-        android:title="@string/zen_mode_alarms"
-        android:enabled="false"
-        android:defaultValue="true"/>
-
     <!-- Reminders -->
     <SwitchPreference
         android:key="reminders"
@@ -36,6 +29,14 @@
         android:key="events"
         android:title="@string/zen_mode_events"/>
 
+    <!-- Alarms -->
+    <SwitchPreference
+        android:key="alarms"
+        android:title="@string/zen_mode_alarms"
+        android:summary="@string/zen_mode_alarms_summary"
+        android:enabled="false"
+        android:defaultValue="true"/>
+
     <!-- Messages -->
     <DropDownPreference
         android:key="messages"
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 7393091ee875f13a4f7b59f2f3e98674d8c8898e..e61f9594dac027e9d5db77547287d840d97e4e82 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -146,7 +146,8 @@ public class ApnEditor extends SettingsPreferenceFragment
             Telephony.Carriers.ROAMING_PROTOCOL, // 20
             Telephony.Carriers.MVNO_TYPE,   // 21
             Telephony.Carriers.MVNO_MATCH_DATA,  // 22
-            Telephony.Carriers.EDITED   // 23
+            Telephony.Carriers.EDITED,   // 23
+            Telephony.Carriers.USER_EDITABLE    //24
     };
 
     private static final int ID_INDEX = 0;
@@ -172,6 +173,7 @@ public class ApnEditor extends SettingsPreferenceFragment
     private static final int MVNO_TYPE_INDEX = 21;
     private static final int MVNO_MATCH_DATA_INDEX = 22;
     private static final int EDITED_INDEX = 23;
+    private static final int USER_EDITABLE_INDEX = 24;
 
 
     @Override
@@ -282,7 +284,8 @@ public class ApnEditor extends SettingsPreferenceFragment
         Log.d(TAG, "onCreate: EDITED " + mCursor.getInt(EDITED_INDEX));
         // if it's not a USER_EDITED apn, check if it's read-only
         if (mCursor.getInt(EDITED_INDEX) != Telephony.Carriers.USER_EDITED &&
-                apnTypesMatch(mReadOnlyApnTypes, mCursor.getString(TYPE_INDEX))) {
+                (mCursor.getInt(USER_EDITABLE_INDEX) == 0 ||
+                apnTypesMatch(mReadOnlyApnTypes, mCursor.getString(TYPE_INDEX)))) {
             Log.d(TAG, "onCreate: apnTypesMatch; read-only APN");
             mReadOnlyApn = true;
             disableAllFields();
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 37552edd65738d58da0e0c8cb12db25ea0ad6cdb..d554301063c3621b0ccdf96498c59019ff058a85 100755
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -193,7 +193,7 @@ public class ApnSettings extends RestrictedSettingsFragment implements
         mUnavailable = isUiRestricted();
         setHasOptionsMenu(!mUnavailable);
         if (mUnavailable) {
-            addPreferencesFromResource(R.xml.empty_settings);
+            addPreferencesFromResource(R.xml.placeholder_prefs);
             return;
         }
 
diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index 7572d9720917eb7b7da88069479628a8fa823132..6371e3a57b27ccecaacc5fee5274e5c8084294ef 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -29,6 +29,7 @@ import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.CustomDialogPreference;
 
 public class BugreportPreference extends CustomDialogPreference {
 
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index d662c2ed5c69d2901df0cccefcaf8f1cf6048060..e5d40b7add0ef96cdff969cdf7145d19b786697f 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -47,14 +47,16 @@ import android.widget.Toast;
 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 @@ import java.io.IOException;
  * 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 @@ public final class CredentialStorage extends Activity {
 
     // 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 @@ public final class CredentialStorage extends Activity {
             }
             case UNLOCKED: {
                 if (!checkKeyGuardQuality()) {
-                    new ConfigureKeyGuardDialog();
+                    final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
+                    dialog.show(getFragmentManager(), ConfigureKeyGuardDialog.TAG);
                     return;
                 }
                 installIfAvailable();
@@ -188,7 +191,8 @@ public final class CredentialStorage extends Activity {
     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 @@ public final class CredentialStorage extends Activity {
      * 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 @@ public final class CredentialStorage extends Activity {
             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 @@ public final class CredentialStorage extends Activity {
      */
     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 @@ public final class CredentialStorage extends Activity {
             }
         }
 
-        @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();
         }
@@ -383,42 +390,6 @@ public final class CredentialStorage extends Activity {
         }
     }
 
-    /**
-     * 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.
      */
@@ -504,8 +475,7 @@ public final class CredentialStorage extends Activity {
      * 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 @@ public final class CredentialStorage extends Activity {
             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 @@ public final class CredentialStorage extends Activity {
                 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 99c6e8b011b88827a240675ae338adccda35b237..1f331d7a635387b566e6e9418e137399caeaca1d 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -888,7 +888,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             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 d9b98f0f5aa907bec716fb721e79bde7a929325e..e11bccd7cc047b1ee0778b6919e77b85286eb7db 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -37,6 +37,8 @@ import android.widget.Button;
 
 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/CustomDialogPreference.java b/src/com/android/settings/CustomDialogPreference.java
deleted file mode 100644
index 383163f492089550b688000fb9ba1de5289b1643..0000000000000000000000000000000000000000
--- a/src/com/android/settings/CustomDialogPreference.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.v14.preference.PreferenceDialogFragment;
-import android.support.v7.preference.DialogPreference;
-import android.util.AttributeSet;
-import android.view.View;
-
-public class CustomDialogPreference extends DialogPreference {
-
-    private CustomPreferenceDialogFragment mFragment;
-
-    public CustomDialogPreference(Context context, AttributeSet attrs, int defStyleAttr,
-            int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    public CustomDialogPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public CustomDialogPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public CustomDialogPreference(Context context) {
-        super(context);
-    }
-
-    public boolean isDialogOpen() {
-        return getDialog() != null && getDialog().isShowing();
-    }
-
-    public Dialog getDialog() {
-        return mFragment != null ? mFragment.getDialog() : null;
-    }
-
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
-            DialogInterface.OnClickListener listener) {
-    }
-
-    protected void onDialogClosed(boolean positiveResult) {
-    }
-
-    protected void onClick(DialogInterface dialog, int which) {
-    }
-
-    protected void onBindDialogView(View view) {
-    }
-
-    private void setFragment(CustomPreferenceDialogFragment fragment) {
-        mFragment = fragment;
-    }
-
-    public static class CustomPreferenceDialogFragment extends PreferenceDialogFragment {
-
-        public static CustomPreferenceDialogFragment newInstance(String key) {
-            final CustomPreferenceDialogFragment fragment = new CustomPreferenceDialogFragment();
-            final Bundle b = new Bundle(1);
-            b.putString(ARG_KEY, key);
-            fragment.setArguments(b);
-            return fragment;
-        }
-
-        private CustomDialogPreference getCustomizablePreference() {
-            return (CustomDialogPreference) getPreference();
-        }
-
-        @Override
-        protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-            super.onPrepareDialogBuilder(builder);
-            getCustomizablePreference().setFragment(this);
-            getCustomizablePreference().onPrepareDialogBuilder(builder, this);
-        }
-
-        @Override
-        public void onDialogClosed(boolean positiveResult) {
-            getCustomizablePreference().onDialogClosed(positiveResult);
-        }
-
-        @Override
-        protected void onBindDialogView(View view) {
-            super.onBindDialogView(view);
-            getCustomizablePreference().onBindDialogView(view);
-        }
-
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            super.onClick(dialog, which);
-            getCustomizablePreference().onClick(dialog, which);
-        }
-    }
-}
diff --git a/src/com/android/settings/CustomEditTextPreference.java b/src/com/android/settings/CustomEditTextPreference.java
deleted file mode 100644
index 66c693223373e7748bac58bb803ea3506dcdee70..0000000000000000000000000000000000000000
--- a/src/com/android/settings/CustomEditTextPreference.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.support.v14.preference.EditTextPreferenceDialogFragment;
-import android.support.v7.preference.EditTextPreference;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.EditText;
-
-public class CustomEditTextPreference extends EditTextPreference {
-
-    private CustomPreferenceDialogFragment mFragment;
-
-    public CustomEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    public CustomEditTextPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public CustomEditTextPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public CustomEditTextPreference(Context context) {
-        super(context);
-    }
-
-    public EditText getEditText() {
-        return mFragment != null ? (EditText) mFragment.getDialog().findViewById(android.R.id.edit)
-                : null;
-    }
-
-    public boolean isDialogOpen() {
-        return getDialog() != null && getDialog().isShowing();
-    }
-
-    public Dialog getDialog() {
-        return mFragment != null ? mFragment.getDialog() : null;
-    }
-
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
-            DialogInterface.OnClickListener listener) {
-    }
-
-    protected void onDialogClosed(boolean positiveResult) {
-    }
-
-    protected void onClick(DialogInterface dialog, int which) {
-    }
-
-    protected void onBindDialogView(View view) {
-    }
-
-    private void setFragment(CustomPreferenceDialogFragment fragment) {
-        mFragment = fragment;
-    }
-
-    public static class CustomPreferenceDialogFragment extends EditTextPreferenceDialogFragment {
-
-        public static CustomPreferenceDialogFragment newInstance(String key) {
-            final CustomPreferenceDialogFragment fragment = new CustomPreferenceDialogFragment();
-            final Bundle b = new Bundle(1);
-            b.putString(ARG_KEY, key);
-            fragment.setArguments(b);
-            return fragment;
-        }
-
-        private CustomEditTextPreference getCustomizablePreference() {
-            return (CustomEditTextPreference) getPreference();
-        }
-
-        @Override
-        protected void onBindDialogView(View view) {
-            super.onBindDialogView(view);
-            getCustomizablePreference().onBindDialogView(view);
-        }
-
-        @Override
-        protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-            super.onPrepareDialogBuilder(builder);
-            getCustomizablePreference().setFragment(this);
-            getCustomizablePreference().onPrepareDialogBuilder(builder, this);
-        }
-
-        @Override
-        public void onDialogClosed(boolean positiveResult) {
-            super.onDialogClosed(positiveResult);
-            getCustomizablePreference().onDialogClosed(positiveResult);
-        }
-
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            super.onClick(dialog, which);
-            getCustomizablePreference().onClick(dialog, which);
-        }
-    }
-}
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 8dfb02b486b5fad7659c211884586980e1ac95d4..0805e4b9891b2398fb5038bd64eab7002874dde6 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -24,7 +24,6 @@ import android.provider.SearchIndexableResource;
 
 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.SafetyInfoPreferenceController;
 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 1ef3b534bd71bf31e3b266dcb7226262568a3432..15818e27093e096e6521c08b3ca727a367aec14d 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.ThemePreferenceController;
 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 @@ import java.util.List;
 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() {
@@ -92,25 +90,24 @@ public class DisplaySettings extends DashboardFragment {
             Context context, Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
         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,
+                new AmbientDisplayConfiguration(context),
+                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;
     }
 
@@ -131,6 +128,8 @@ public class DisplaySettings extends DashboardFragment {
                 public List<String> getNonIndexableKeys(Context context) {
                     List<String> keys = super.getNonIndexableKeys(context);
                     keys.add(KEY_DISPLAY_SIZE);
+                    keys.add(WallpaperPreferenceController.KEY_WALLPAPER);
+                    keys.add(KEY_AMBIENT_DISPLAY);
                     return keys;
                 }
 
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
deleted file mode 100644
index bb9e9783e81bf13252d7cfe53d88c481e13b6428..0000000000000000000000000000000000000000
--- 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/EditPinPreference.java b/src/com/android/settings/EditPinPreference.java
index fdad0a17280383044fd4c5ab8a98650e97b86adc..2da45412e1c452a37d355fada3ede8d58df4554b 100644
--- a/src/com/android/settings/EditPinPreference.java
+++ b/src/com/android/settings/EditPinPreference.java
@@ -23,6 +23,8 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.EditText;
 
+import com.android.settingslib.CustomEditTextPreference;
+
 /**
  * TODO: Add a soft dialpad for PIN entry.
  */
@@ -31,9 +33,9 @@ class EditPinPreference extends CustomEditTextPreference {
     interface OnPinEnteredListener {
         void onPinEntered(EditPinPreference preference, boolean positiveResult);
     }
-    
+
     private OnPinEnteredListener mPinListener;
-    
+
     public EditPinPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
@@ -41,7 +43,7 @@ class EditPinPreference extends CustomEditTextPreference {
     public EditPinPreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
-    
+
     public void setOnPinEnteredListener(OnPinEnteredListener listener) {
         mPinListener = listener;
     }
diff --git a/src/com/android/settings/EncryptionAndCredential.java b/src/com/android/settings/EncryptionAndCredential.java
index 1750e75036de29d78adf9d391fb5000ddc76753d..4892f7ef3896b2655b1344132daa15af1f9e969f 100644
--- a/src/com/android/settings/EncryptionAndCredential.java
+++ b/src/com/android/settings/EncryptionAndCredential.java
@@ -20,7 +20,6 @@ import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -34,7 +33,6 @@ import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.dashboard.DashboardFragment;
 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.RestrictedPreference;
 
@@ -106,7 +104,6 @@ public class EncryptionAndCredential extends SettingsPreferenceFragment implemen
             }
         }
 
-
         // Credential storage
         mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
 
@@ -168,7 +165,7 @@ public class EncryptionAndCredential extends SettingsPreferenceFragment implemen
 
     @Override
     protected int getHelpResource() {
-        return R.string.help_url_security;
+        return R.string.help_url_encryption;
     }
 
     /**
@@ -182,83 +179,57 @@ public class EncryptionAndCredential extends SettingsPreferenceFragment implemen
         @Override
         public List<SearchIndexableResource> getXmlResourcesToIndex(
                 Context context, boolean enabled) {
-            final List<SearchIndexableResource> index = new ArrayList<SearchIndexableResource>();
+            final List<SearchIndexableResource> index = new ArrayList<>();
 
-            final DevicePolicyManager dpm = (DevicePolicyManager)
-                    context.getSystemService(Context.DEVICE_POLICY_SERVICE);
-            final UserManager um = UserManager.get(context);
-
-            if (um.isAdminUser()) {
-                switch (dpm.getStorageEncryptionStatus()) {
-                    case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
-                        // The device is currently encrypted.
-                        index.add(getSearchResource(context, R.xml.security_settings_encrypted));
-                        break;
-                    case DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE:
-                        // This device supports encryption but isn't encrypted.
-                        index.add(getSearchResource(context, R.xml.security_settings_unencrypted));
-                        break;
-                }
-            }
+            // Add everything. We will suppress some of them in getNonIndexableKeys()
+            index.add(getSearchResource(context, R.xml.encryption_and_credential));
+            index.add(getSearchResource(context, R.xml.security_settings_encrypted));
+            index.add(getSearchResource(context, R.xml.security_settings_unencrypted));
 
             return index;
         }
 
+        @Override
+        protected boolean isPageSearchEnabled(Context context) {
+            final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+            return um.isAdminUser();
+        }
+
         private SearchIndexableResource getSearchResource(Context context, int xmlResId) {
             final SearchIndexableResource sir = new SearchIndexableResource(context);
             sir.xmlResId = xmlResId;
             return sir;
         }
 
-        @Override
-        public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
-            final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
-            final Resources res = context.getResources();
-
-            final String screenTitle = res.getString(
-                R.string.encryption_and_credential_settings_title);
-
-            SearchIndexableRaw data = new SearchIndexableRaw(context);
-            data.title = screenTitle;
-            data.screenTitle = screenTitle;
-            result.add(data);
-
-            final UserManager um = UserManager.get(context);
-            if (!um.isAdminUser()) {
-                int resId = um.isLinkedUser() ?
-                        R.string.profile_info_settings_title : R.string.user_info_settings_title;
-
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(resId);
-                data.screenTitle = screenTitle;
-                result.add(data);
-            }
-
-            // Credential storage
-            if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
-                KeyStore keyStore = KeyStore.getInstance();
-
-                final int storageSummaryRes = keyStore.isHardwareBacked() ?
-                        R.string.credential_storage_type_hardware :
-                        R.string.credential_storage_type_software;
-
-                data = new SearchIndexableRaw(context);
-                data.title = res.getString(storageSummaryRes);
-                data.screenTitle = screenTitle;
-                result.add(data);
-            }
-
-            return result;
-        }
-
         @Override
         public List<String> getNonIndexableKeys(Context context) {
-            final List<String> keys = new ArrayList<String>();
-
-            final UserManager um = UserManager.get(context);
+            final List<String> keys = super.getNonIndexableKeys(context);
+            if (!isPageSearchEnabled(context)) {
+                return keys;
+            }
+            final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
 
             if (um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
                 keys.add(KEY_CREDENTIALS_MANAGER);
+                keys.add(KEY_RESET_CREDENTIALS);
+                keys.add(KEY_CREDENTIALS_INSTALL);
+                keys.add(KEY_CREDENTIAL_STORAGE_TYPE);
+                keys.add(KEY_USER_CREDENTIALS);
+            }
+
+            final DevicePolicyManager dpm = (DevicePolicyManager)
+                    context.getSystemService(Context.DEVICE_POLICY_SERVICE);
+            switch (dpm.getStorageEncryptionStatus()) {
+                case DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE:
+                    // The device is currently encrypted. Disable security_settings_unencrypted
+                    keys.addAll(getNonIndexableKeysFromXml(
+                            context, R.xml.security_settings_unencrypted));
+                    break;
+                default:
+                    // This device supports encryption but isn't encrypted.
+                    keys.addAll(getNonIndexableKeysFromXml(
+                            context, R.xml.security_settings_encrypted));
+                    break;
             }
 
             return keys;
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 42ca516b50620844c28dd7c5a62de3b3e52495e3..f0115b8ef3c8f1e2756c6de9a384a6d68254e761 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -17,23 +17,27 @@
 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;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
 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;
@@ -53,6 +57,12 @@ public class EncryptionInterstitial extends SettingsActivity {
         return modIntent;
     }
 
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent());
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
     @Override
     protected boolean isValidFragment(String fragmentName) {
         return EncryptionInterstitialFragment.class.getName().equals(fragmentName);
@@ -74,10 +84,8 @@ public class EncryptionInterstitial extends SettingsActivity {
         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 +172,10 @@ public class EncryptionInterstitial extends SettingsActivity {
                 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 +186,93 @@ public class EncryptionInterstitial extends SettingsActivity {
             }
         }
 
-        @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();
+        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 int getDialogMetricsCategory(int dialogId) {
-            if (dialogId == ACCESSIBILITY_WARNING_DIALOG) {
-                return MetricsEvent.DIALOG_ENCRYPTION_INTERSTITIAL_ACCESSIBILITY;
+        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;
             }
-            return 0;
+
+
+            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();
         }
 
-        private void setRequirePasswordState(boolean required) {
-            mPasswordRequired = required;
+        @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 7eb28a070516ff4d0b6c185d03e38bdcbc24841b..0de15e35aecca16fdcd9dac5f81734dd9257e1d3 100644
--- a/src/com/android/settings/HelpTrampoline.java
+++ b/src/com/android/settings/HelpTrampoline.java
@@ -39,7 +39,11 @@ public class HelpTrampoline extends Activity {
 
             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 1eac33f1ba24f46fd5cd52de75ede0906dd276fc..1ae971188ada1af93b62267feb3cc032461c93b6 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -289,6 +289,11 @@ public class IccLockSettings extends SettingsPreferenceFragment
         getContext().unregisterReceiver(mSimStateReceiver);
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_icc_lock;
+    }
+
     @Override
     public void onSaveInstanceState(Bundle out) {
         // Need to store this state for slider open/close
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 69f563e6932e3b0b6e0c7043aa1b8c85db27f2f2..2c9701832ee0eafe0746edb343ae5e43904520ab 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.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -32,7 +35,10 @@ import android.os.Environment;
 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.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -47,13 +53,12 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.widget.CarrierDemoPasswordDialogFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmLockPattern;
 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
@@ -64,18 +69,18 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
  *
  * This is the initial screen.
  */
-public class MasterClear extends OptionsMenuFragment
-        implements CarrierDemoPasswordDialogFragment.Callback {
+public class MasterClear extends OptionsMenuFragment {
     private static final String TAG = "MasterClear";
 
     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 ScrollView mScrollView;
 
     private final OnGlobalLayoutListener mOnGlobalLayoutListener = new OnGlobalLayoutListener() {
@@ -115,9 +120,12 @@ public class MasterClear extends OptionsMenuFragment
         }
     }
 
-    private void showFinalConfirmation() {
+    @VisibleForTesting
+    void showFinalConfirmation() {
         Bundle args = new Bundle();
         args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
+        // TODO: Offer the user a choice to wipe eSIMs when it is technically feasible to do so.
+        args.putBoolean(ERASE_ESIMS_EXTRA, true);
         ((SettingsActivity) getActivity()).startPreferencePanel(
                 this, MasterClearConfirm.class.getName(),
                 args, R.string.master_clear_confirm_title, null, null, 0);
@@ -127,15 +135,21 @@ public class MasterClear extends OptionsMenuFragment
      * If the user clicks to begin the reset sequence, we next require a
      * keyguard confirmation if the user has currently enabled one.  If there
      * is no keyguard available, we simply go to the final confirmation prompt.
+     *
+     * If the user is in demo mode, route to the demo mode app for confirmation.
      */
-    private final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
-
-        public void onClick(View v) {
-            if ( Utils.isCarrierDemoUser(v.getContext())) {
-                // Require the carrier password before displaying the final confirmation.
-                final FragmentManager fm = getChildFragmentManager();
-                if (fm != null && !fm.isDestroyed()) {
-                    new CarrierDemoPasswordDialogFragment().show(fm, null /* tag */);
+    @VisibleForTesting
+    protected final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
+
+        public void onClick(View view) {
+            final Context context = view.getContext();
+            if (Utils.isDemoUser(context)) {
+                final ComponentName componentName = Utils.getDeviceOwnerComponent(context);
+                if (componentName != null) {
+                    final Intent requestFactoryReset = new Intent()
+                            .setPackage(componentName.getPackageName())
+                            .setAction(Intent.ACTION_FACTORY_RESET);
+                    context.startActivity(requestFactoryReset);
                 }
             } else if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
                 showFinalConfirmation();
@@ -143,11 +157,6 @@ public class MasterClear extends OptionsMenuFragment
         }
     };
 
-    @Override
-    public void onPasswordVerified() {
-        showFinalConfirmation();
-    }
-
     /**
      * In its initial state, the activity presents a button for the user to
      * click in order to initiate a confirmation sequence.  This method is
@@ -198,6 +207,14 @@ public class MasterClear extends OptionsMenuFragment
             });
         }
 
+        if (showWipeEuicc()) {
+            final View esimAlsoErased = mContentView.findViewById(R.id.also_erases_esim);
+            esimAlsoErased.setVisibility(View.VISIBLE);
+
+            final View noCancelMobilePlan = mContentView.findViewById(R.id.no_cancel_mobile_plan);
+            noCancelMobilePlan.setVisibility(View.VISIBLE);
+        }
+
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         loadAccountList(um);
         StringBuffer contentDescription = new StringBuffer();
@@ -220,6 +237,28 @@ public class MasterClear extends OptionsMenuFragment
         mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(mOnGlobalLayoutListener);
     }
 
+    /**
+     * Whether to show strings indicating that the eUICC will be wiped.
+     *
+     * <p>We show the strings on any device which supports eUICC as long as the eUICC was ever
+     * provisioned (that is, at least one profile was ever downloaded onto it).
+     */
+    @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;
+    }
+
+    @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) {
@@ -349,7 +388,7 @@ public class MasterClear extends OptionsMenuFragment
         final UserManager um = UserManager.get(context);
         final boolean disallow = !um.isAdminUser() || RestrictedLockUtils.hasBaseUserRestriction(
                 context, UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
-        if (disallow && !Utils.isCarrierDemoUser(context)) {
+        if (disallow && !Utils.isDemoUser(context)) {
             return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
         } else if (admin != null) {
             View view = inflater.inflate(R.layout.admin_support_details_empty_view, null);
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 218ebbbb3e822d1a2208e652dc8d7271d82a4485..39bf01a0d97d412efc333e2245fed609fe60fe71 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -24,7 +24,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 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 +51,7 @@ public class MasterClearConfirm extends OptionsMenuFragment {
 
     private View mContentView;
     private boolean mEraseSdCard;
+    private boolean mEraseEsims;
 
     /**
      * The user has gone through the multiple confirmation, so now we go ahead
@@ -66,12 +67,14 @@ public class MasterClearConfirm extends OptionsMenuFragment {
 
             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 +128,7 @@ public class MasterClearConfirm extends OptionsMenuFragment {
         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 +179,8 @@ public class MasterClearConfirm extends OptionsMenuFragment {
         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/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index ddf0decb6cf87cd9a823927efbda7c437e1c1393..db1f01d761bae8dbdc71bb81c65df6b6948732e1 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -20,6 +20,8 @@ import android.app.Activity;
 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.AsyncResult;
 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 @@ public class RadioInfo extends Activity {
     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 @@ public class RadioInfo extends Activity {
     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 @@ public class RadioInfo extends Activity {
         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 @@ public class RadioInfo extends Activity {
         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 @@ public class RadioInfo extends Activity {
         imsVolteProvisionedSwitch.setOnCheckedChangeListener(mImsVolteCheckedChangeListener);
         imsVtProvisionedSwitch.setOnCheckedChangeListener(mImsVtCheckedChangeListener);
         imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
+        eabProvisionedSwitch.setOnCheckedChangeListener(mEabCheckedChangeListener);
 
         mTelephonyManager.listen(mPhoneStateListener,
                   PhoneStateListener.LISTEN_CALL_STATE
@@ -1162,6 +1178,11 @@ public class RadioInfo extends Activity {
         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 @@ public class RadioInfo extends Activity {
         }
     };
 
+    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 @@ public class RadioInfo extends Activity {
         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,26 @@ public class RadioInfo extends Activity {
         }
     };
 
+    OnClickListener mCarrierProvisioningButtonHandler = new OnClickListener() {
+        public void onClick(View v) {
+            final Intent intent = new Intent("com.android.settings.CARRIER_PROVISIONING");
+            final ComponentName serviceComponent = ComponentName.unflattenFromString(
+                    "com.android.omadm.service/.DMIntentReceiver");
+            intent.setComponent(serviceComponent);
+            sendBroadcast(intent);
+        }
+    };
+
+    OnClickListener mTriggerCarrierProvisioningButtonHandler = new OnClickListener() {
+        public void onClick(View v) {
+            final Intent intent = new Intent("com.android.settings.TRIGGER_CARRIER_PROVISIONING");
+            final ComponentName serviceComponent = ComponentName.unflattenFromString(
+                    "com.android.omadm.service/.DMIntentReceiver");
+            intent.setComponent(serviceComponent);
+            sendBroadcast(intent);
+        }
+    };
+
     AdapterView.OnItemSelectedListener mPreferredNetworkHandler =
             new AdapterView.OnItemSelectedListener() {
 
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
index fd94b677f984d7693ac6f7d79f0db34ab338d259..043071c9edbd9b392e316ae2dbf47a8e0cfe44da 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -20,15 +20,20 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import java.util.Locale;
+
 /**
  * {@link Activity} that displays regulatory information for the "Regulatory information"
  * preference item, and when "*#07#" is dialed on the Phone keypad. To enable this feature,
@@ -41,7 +46,12 @@ import android.widget.TextView;
  */
 public class RegulatoryInfoDisplayActivity extends Activity implements
         DialogInterface.OnDismissListener {
+
     private final String REGULATORY_INFO_RESOURCE = "regulatory_info";
+    private static final String DEFAULT_REGULATORY_INFO_FILEPATH =
+            "/data/misc/elabel/regulatory_info.png";
+    private static final String REGULATORY_INFO_FILEPATH_TEMPLATE =
+            "/data/misc/elabel/regulatory_info_%s.png";
 
     /**
      * Display the regulatory info graphic in a dialog window.
@@ -60,7 +70,18 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
                 .setOnDismissListener(this);
 
         boolean regulatoryInfoDrawableExists = false;
-        int resId = getResourceId();
+
+        final String regulatoryInfoFile = getRegulatoryInfoImageFileName();
+        final Bitmap regulatoryInfoBitmap = BitmapFactory.decodeFile(regulatoryInfoFile);
+
+        if (regulatoryInfoBitmap != null) {
+            regulatoryInfoDrawableExists = true;
+        }
+
+        int resId = 0;
+        if (!regulatoryInfoDrawableExists) {
+            resId = getResourceId();
+        }
         if (resId != 0) {
             try {
                 Drawable d = getDrawable(resId);
@@ -77,8 +98,12 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
 
         if (regulatoryInfoDrawableExists) {
             View view = getLayoutInflater().inflate(R.layout.regulatory_info, null);
-            ImageView image = (ImageView) view.findViewById(R.id.regulatoryInfo);
-            image.setImageResource(resId);
+            ImageView image = view.findViewById(R.id.regulatoryInfo);
+            if (regulatoryInfoBitmap != null) {
+                image.setImageBitmap(regulatoryInfoBitmap);
+            } else {
+                image.setImageResource(resId);
+            }
             builder.setView(view);
             builder.show();
         } else if (regulatoryText.length() > 0) {
@@ -99,7 +124,7 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
                 REGULATORY_INFO_RESOURCE, "drawable", getPackageName());
 
         // When hardware sku property exists, use regulatory_info_<sku> resource if valid.
-        String sku = SystemProperties.get("ro.boot.hardware.sku", "");
+        final String sku = getSku();
         if (!TextUtils.isEmpty(sku)) {
             String regulatory_info_res = REGULATORY_INFO_RESOURCE + "_" + sku.toLowerCase();
             int id = getResources().getIdentifier(
@@ -115,4 +140,20 @@ public class RegulatoryInfoDisplayActivity extends Activity implements
     public void onDismiss(DialogInterface dialog) {
         finish();   // close the activity
     }
+
+    @VisibleForTesting
+    public static String getSku() {
+        return SystemProperties.get("ro.boot.hardware.sku", "");
+    }
+
+    @VisibleForTesting
+    public static String getRegulatoryInfoImageFileName() {
+        final String sku = getSku();
+        if (TextUtils.isEmpty(sku)) {
+            return DEFAULT_REGULATORY_INFO_FILEPATH;
+        } else {
+            return String.format(Locale.US, REGULATORY_INFO_FILEPATH_TEMPLATE,
+                    sku.toLowerCase());
+        }
+    }
 }
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 45490ab7b310585f4ef30b1a19c5240e5559c4ff..1529e777f74e15d6cb7552097c250f7df3db16da 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -34,13 +34,14 @@ import android.widget.Spinner;
 
 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 d220e739ccd77bd51f2b7458566d728b087ada65..f70d3c27efb0c207e74fb7558996e8eb9e406292 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -18,9 +18,11 @@ package com.android.settings;
 
 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,12 +106,27 @@ public class ResetNetworkConfirm extends OptionsMenuFragment {
             }
 
             ImsManager.factoryReset(context);
+            restoreDefaultApn(context);
 
             Toast.makeText(context, R.string.reset_network_complete_toast, Toast.LENGTH_SHORT)
                     .show();
         }
     };
 
+    /**
+     * 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
      */
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index ce8a4add96a7f4e43d9093121529f2db7326a4c2..bbb317ba420e740e508c9c74fa5697d5839696c6 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.Bundle;
 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 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
  * 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 d74a07fa1543e0be69d3d9a53819268e362e140e..5209cc745b4d012819df1dd035701995af7e94e4 100644
--- a/src/com/android/settings/ScreenPinningSettings.java
+++ b/src/com/android/settings/ScreenPinningSettings.java
@@ -33,6 +33,7 @@ import android.widget.Switch;
 
 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;
@@ -73,6 +74,11 @@ public class ScreenPinningSettings extends SettingsPreferenceFragment
         mSwitchBar.setChecked(isLockToAppEnabled(getActivity()));
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_screen_pinning;
+    }
+
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 678a63b34b6c15cd3429f426a9c9cadbe6a43181..736b85c761255c868c2accb4272683b47e2513b5 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.fingerprint.FingerprintSettings;
 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 @@ public class SecuritySettings extends SettingsPreferenceFragment
     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;
@@ -177,6 +182,12 @@ public class SecuritySettings extends SettingsPreferenceFragment
         return MetricsEvent.SECURITY;
     }
 
+    @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 @@ public class SecuritySettings extends SettingsPreferenceFragment
             mTrustAgentClickIntent = savedInstanceState.getParcelable(TRUST_AGENT_CLICK_INTENT);
         }
 
-        mLocationcontroller = new LocationPreferenceController(activity);
         mManageDeviceAdminPreferenceController
                 = new ManageDeviceAdminPreferenceController(activity);
         mEnterprisePrivacyPreferenceController
@@ -632,7 +642,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
                     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 @@ public class SecuritySettings extends SettingsPreferenceFragment
             }
             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 @@ public class SecuritySettings extends SettingsPreferenceFragment
     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 @@ public class SecuritySettings extends SettingsPreferenceFragment
         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 @@ public class SecuritySettings extends SettingsPreferenceFragment
             // 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/SeekBarDialogPreference.java b/src/com/android/settings/SeekBarDialogPreference.java
index a40df55d44193c8b016de8b48846c857e9081566..507c551caa5770e254327d66d877f161e86ab86a 100644
--- a/src/com/android/settings/SeekBarDialogPreference.java
+++ b/src/com/android/settings/SeekBarDialogPreference.java
@@ -23,6 +23,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.SeekBar;
 
+import com.android.settingslib.CustomDialogPreference;
+
 /**
  * Based on frameworks/base/core/java/android/preference/SeekBarDialogPreference.java
  * except uses support lib preferences.
diff --git a/src/com/android/settings/SelectableEditTextPreference.java b/src/com/android/settings/SelectableEditTextPreference.java
index f6237ec0d95e8fc778f82d06378c332b2537919a..551b5e58afe111d78167274101a389cedf6e2eef 100644
--- a/src/com/android/settings/SelectableEditTextPreference.java
+++ b/src/com/android/settings/SelectableEditTextPreference.java
@@ -22,6 +22,8 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.EditText;
 
+import com.android.settingslib.CustomEditTextPreference;
+
 public class SelectableEditTextPreference extends CustomEditTextPreference {
 
     private int mSelectionMode;
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 1db185e1c887529c3d908a822f07fb78e88d8b90..ed5180b93c2f030e7fc8c2b466ffa151ec27f3c8 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -22,6 +22,7 @@ import com.android.settings.applications.AppOpsSummary;
 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
@@ -31,6 +32,7 @@ public class Settings extends SettingsActivity {
     /*
     * Settings subclasses for launching independently.
     */
+    public static class AssistGestureSettingsActivity extends SettingsActivity { /* empty */}
     public static class BluetoothSettingsActivity extends SettingsActivity { /* empty */ }
     public static class SimSettingsActivity extends SettingsActivity { /* empty */ }
     public static class TetherSettingsActivity extends SettingsActivity { /* empty */ }
@@ -139,12 +141,17 @@ public class Settings extends SettingsActivity {
     public static class ManageAppExternalSourcesActivity extends SettingsActivity { /* empty */ }
 
     public static class WifiCallingSuggestionActivity extends SettingsActivity { /* empty */ }
-    public static class ZenModeAutomationSuggestionActivity extends SettingsActivity { /* empty */ }
-    public static class FingerprintSuggestionActivity extends FingerprintSettings { /* empty */ }
     public static class FingerprintEnrollSuggestionActivity extends FingerprintEnrollIntroduction {
         /* empty */
     }
     public static class ScreenLockSuggestionActivity extends ChooseLockGeneric { /* empty */ }
+    public static class DoubleTapPowerSuggestionActivity extends SettingsActivity { /* empty */ }
+    public static class DoubleTwistSuggestionActivity extends SettingsActivity { /* empty */ }
+    public static class AmbientDisplaySuggestionActivity extends SettingsActivity { /* empty */ }
+    public static class AmbientDisplayPickupSuggestionActivity extends SettingsActivity {
+        /* empty */ }
+    public static class SwipeToNotificationSuggestionActivity 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 +175,7 @@ public class Settings extends SettingsActivity {
         }
     }
     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 +184,5 @@ public class Settings extends SettingsActivity {
     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 4045fd2afdd42df141cc662425703b3e470523f7..556dbfb5b3c43b912ef96556ff8c7c3d103cc23c 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -50,6 +50,7 @@ import android.view.View;
 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.dashboard.DashboardSummary;
 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 @@ import java.util.Set;
 public class SettingsActivity extends SettingsDrawerActivity
         implements PreferenceManager.OnPreferenceTreeClickListener,
         PreferenceFragment.OnPreferenceStartFragmentCallback,
-        ButtonBarHandler, FragmentManager.OnBackStackChangedListener {
+        ButtonBarHandler, FragmentManager.OnBackStackChangedListener, OnClickListener {
 
     private static final String LOG_TAG = "Settings";
 
@@ -85,8 +87,6 @@ public class SettingsActivity extends SettingsDrawerActivity
     private static final String SAVE_KEY_CATEGORIES = ":settings:categories";
     @VisibleForTesting
     static final String SAVE_KEY_SHOW_HOME_AS_UP = ":settings:show_home_as_up";
-    @VisibleForTesting
-    static final String SAVE_KEY_SHOW_SEARCH = ":settings:show_search";
 
     /**
      * When starting this activity, the invoking Intent can contain this extra
@@ -190,22 +190,18 @@ public class SettingsActivity extends SettingsDrawerActivity
 
     private DynamicIndexableContentMonitor mDynamicIndexableContentMonitor;
 
-    private ActionBar mActionBar;
     private SwitchBar mSwitchBar;
 
     private Button mNextButton;
 
     @VisibleForTesting
     boolean mDisplayHomeAsUpEnabled;
-    @VisibleForTesting
-    boolean mDisplaySearch;
 
     private boolean mIsShowingDashboard;
     private boolean mIsShortcut;
 
     private ViewGroup mContent;
 
-    private SearchFeatureProvider mSearchFeatureProvider;
     private MetricsFeatureProvider mMetricsFeatureProvider;
 
     // Categories
@@ -230,15 +226,6 @@ public class SettingsActivity extends SettingsDrawerActivity
         return false;
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        if (!mDisplaySearch) {
-            return false;
-        }
-        mSearchFeatureProvider.setUpSearchMenu(menu, this);
-        return true;
-    }
-
     @Override
     public SharedPreferences getSharedPreferences(String name, int mode) {
         if (name.equals(getPackageName() + "_preferences")) {
@@ -282,7 +269,6 @@ public class SettingsActivity extends SettingsDrawerActivity
         final FeatureFactory factory = FeatureFactory.getFactory(this);
 
         mDashboardFeatureProvider = factory.getDashboardFeatureProvider(this);
-        mSearchFeatureProvider = factory.getSearchFeatureProvider();
         mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
 
         // Should happen before any call to getIntent()
@@ -322,7 +308,7 @@ public class SettingsActivity extends SettingsDrawerActivity
         setContentView(mIsShowingDashboard ?
                 R.layout.settings_main_dashboard : R.layout.settings_main_prefs);
 
-        mContent = (ViewGroup) findViewById(R.id.main_content);
+        mContent = findViewById(R.id.main_content);
 
         getFragmentManager().addOnBackStackChangedListener(this);
 
@@ -345,12 +331,28 @@ public class SettingsActivity extends SettingsDrawerActivity
             launchSettingFragment(initialFragmentName, isSubSettings, intent);
         }
 
-        mActionBar = getActionBar();
-        if (mActionBar != null) {
-            mActionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled);
-            mActionBar.setHomeButtonEnabled(mDisplayHomeAsUpEnabled);
+        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);
+
+            // Please forgive me for what I am about to do.
+            //
+            // Need to make the navigation icon non-clickable so that the entire card is clickable
+            // and goes to the search UI. Also set the background to null so there's no ripple.
+            View navView = toolbar.getNavigationView();
+            navView.setClickable(false);
+            navView.setBackground(null);
         }
-        mSwitchBar = (SwitchBar) findViewById(R.id.switch_bar);
+
+        ActionBar actionBar = getActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(mDisplayHomeAsUpEnabled);
+            actionBar.setHomeButtonEnabled(mDisplayHomeAsUpEnabled);
+        }
+        mSwitchBar = findViewById(R.id.switch_bar);
         if (mSwitchBar != null) {
             mSwitchBar.setMetricsTag(getMetricsTag());
         }
@@ -417,7 +419,6 @@ public class SettingsActivity extends SettingsDrawerActivity
     @VisibleForTesting
     void launchSettingFragment(String initialFragmentName, boolean isSubSettings, Intent intent) {
         if (!mIsShowingDashboard && initialFragmentName != null) {
-            mDisplaySearch = false;
             // UP will be shown only if it is a sub settings
             if (mIsShortcut) {
                 mDisplayHomeAsUpEnabled = isSubSettings;
@@ -432,10 +433,8 @@ public class SettingsActivity extends SettingsDrawerActivity
             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;
             mInitialTitleResId = R.string.dashboard_title;
 
             switchToFragment(DashboardSummary.class.getName(), null /* args */, false, false,
@@ -443,13 +442,6 @@ public class SettingsActivity extends SettingsDrawerActivity
         }
     }
 
-    public void setDisplaySearchMenu(boolean displaySearch) {
-        if (displaySearch != mDisplaySearch) {
-            mDisplaySearch = displaySearch;
-            invalidateOptionsMenu();
-        }
-    }
-
     private void setTitleFromIntent(Intent intent) {
         final int initialTitleResId = intent.getIntExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, -1);
         if (initialTitleResId > 0) {
@@ -530,7 +522,6 @@ public class SettingsActivity extends SettingsDrawerActivity
         }
 
         outState.putBoolean(SAVE_KEY_SHOW_HOME_AS_UP, mDisplayHomeAsUpEnabled);
-        outState.putBoolean(SAVE_KEY_SHOW_SEARCH, mDisplaySearch);
     }
 
     @Override
@@ -538,19 +529,13 @@ public class SettingsActivity extends SettingsDrawerActivity
         super.onRestoreInstanceState(savedInstanceState);
 
         mDisplayHomeAsUpEnabled = savedInstanceState.getBoolean(SAVE_KEY_SHOW_HOME_AS_UP);
-        mDisplaySearch = savedInstanceState.getBoolean(SAVE_KEY_SHOW_SEARCH);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
 
-        mDevelopmentPreferencesListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
-            @Override
-            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-                updateTilesList();
-            }
-        };
+        mDevelopmentPreferencesListener = (sharedPreferences, key) -> updateTilesList();
         mDevelopmentPreferences.registerOnSharedPreferenceChangeListener(
                 mDevelopmentPreferencesListener);
 
@@ -939,4 +924,10 @@ public class SettingsActivity extends SettingsDrawerActivity
 
         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 9d5e343f4163115173f868387503d78013f3332b..5f22545ca92caaf5d1d9a2fb05ebc262f9976a1a 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -49,8 +49,10 @@ import com.android.settings.applications.LayoutPreference;
 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.CustomDialogPreference;
+import com.android.settingslib.CustomEditTextPreference;
 import com.android.settingslib.HelpUtils;
+import com.android.settingslib.widget.FooterPreferenceMixin;
 
 import java.util.UUID;
 
@@ -321,12 +323,15 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
         }
     }
 
-    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 f2c24d0f0f79722c5aaaf8931ed81d19edefca3b..0000000000000000000000000000000000000000
--- 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/SetupEncryptionInterstitial.java b/src/com/android/settings/SetupEncryptionInterstitial.java
index 4f30cc0d2958c4afbac9910097e3307f01e57e1c..989cc2b12ccf788d049782abc420ce6f95bb62ca 100644
--- a/src/com/android/settings/SetupEncryptionInterstitial.java
+++ b/src/com/android/settings/SetupEncryptionInterstitial.java
@@ -18,7 +18,6 @@ package com.android.settings;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.widget.LinearLayout;
 
@@ -54,12 +53,6 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial {
         return SetupEncryptionInterstitialFragment.class.getName().equals(fragmentName);
     }
 
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
     @Override
     protected void onCreate(Bundle savedInstance) {
         super.onCreate(savedInstance);
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index 321040eb0e70d41b77f079d0e7fee5d69362dd0b..ac1db15bdc83d8dac06b4555a10a8187a80ed49f 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -60,12 +60,6 @@ public class SetupRedactionInterstitial extends RedactionInterstitial {
         return SetupRedactionInterstitialFragment.class.getName().equals(fragmentName);
     }
 
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
     public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment {
 
         // Setup wizard specific UI customizations can be done here
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index a0a371982f2e0a2d329c605ed6bec9c243f17ddd..d53abae881cb788c3a244c7cd82d35d5af252837 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -17,17 +17,34 @@
 package com.android.settings;
 
 import android.content.Intent;
+import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
 
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
 public class SetupWizardUtils {
 
+    @VisibleForTesting
+    static final String SYSTEM_PROP_SETUPWIZARD_THEME = "setupwizard.theme";
+
     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) {
+            theme = SystemProperties.get(SYSTEM_PROP_SETUPWIZARD_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 9475f45292c75948c29a1da03bfd20f5f756c489..708e17fe695ed53490a1b1a9b43a4868f6da95b9 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -400,7 +400,7 @@ public class TetherSettings extends RestrictedSettingsFragment
     private void updateState(String[] available, String[] tethered,
             String[] errored) {
         updateUsbState(available, tethered, errored);
-        updateBluetoothState(available, tethered, errored);
+        updateBluetoothState();
     }
 
 
@@ -431,41 +431,18 @@ public class TetherSettings extends RestrictedSettingsFragment
         }
 
         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 @@ public class TetherSettings extends RestrictedSettingsFragment
         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 2f4660e2905e003c5e9cb4acfe157f3730d3964d..0e5cd2c197103dde047ca552a83c131e3628ac65 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/TrustAgentSettings.java
@@ -35,7 +35,6 @@ import android.util.ArraySet;
 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;
@@ -78,6 +77,11 @@ public class TrustAgentSettings extends SettingsPreferenceFragment implements
         return MetricsEvent.TRUST_AGENT;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_trust_agent;
+    }
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 8a77fea72659b090a8164b56a8ec451d4fd9b6fd..5371ca414fd6e035f970666da3ad12015c7875f6 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -943,6 +943,8 @@ public final class Utils extends com.android.settingslib.Utils {
         return result;
     }
 
+    // TODO: move this out of Utils to a mixin or a controller or a helper class.
+    @Deprecated
     public static void handleLoadingContainer(View loading, View doneLoading, boolean done,
             boolean animate) {
         setViewShown(loading, !done, animate);
@@ -1036,7 +1038,24 @@ public final class Utils extends com.android.settingslib.Utils {
             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());
     }
 
     /**
@@ -1233,6 +1252,11 @@ public final class Utils extends com.android.settingslib.Utils {
         }
     }
 
+    public static boolean hasFingerprintHardware(Context context) {
+        FingerprintManager fingerprintManager = getFingerprintManagerOrNull(context);
+        return fingerprintManager != null && fingerprintManager.isHardwareDetected();
+    }
+
     /**
      * Launches an intent which may optionally have a user id defined.
      * @param fragment Fragment to use to launch the activity.
@@ -1252,19 +1276,19 @@ public final class Utils extends com.android.settingslib.Utils {
         }
     }
 
-    public static boolean isCarrierDemoUser(Context context) {
-        final String carrierDemoModeSetting =
-                context.getString(com.android.internal.R.string.config_carrierDemoModeSetting);
-        return UserManager.isDeviceInDemoMode(context)
-                && getUserManager(context).isDemoUser()
-                && !TextUtils.isEmpty(carrierDemoModeSetting)
-                && (Settings.Secure.getInt(context.getContentResolver(),
-                        carrierDemoModeSetting, 0) == 1);
+    public static boolean isDemoUser(Context context) {
+        return UserManager.isDeviceInDemoMode(context) && getUserManager(context).isDemoUser();
+    }
+
+    public static ComponentName getDeviceOwnerComponent(Context context) {
+        final DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(
+                Context.DEVICE_POLICY_SERVICE);
+        return dpm.getDeviceOwnerComponentOnAnyUser();
     }
 
     /**
      * Returns if a given user is a profile of another user.
-     * @param user The user whose profiles will be checked.
+     * @param user The user whose profiles wibe checked.
      * @param profile The (potential) profile.
      * @return if the profile is actually a profile
      */
@@ -1311,8 +1335,6 @@ public final class Utils extends com.android.settingslib.Utils {
         }
     }
 
-
-
     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 78f9de68adfb9ed0f9482ca4d7a40b2280ac6044..cb661ed9d57f88694da11bc6038394469946f3f9 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -152,7 +152,9 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
 
         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 e0d2c69c97e55e824f508bce005c3bc8d4886cfd..0a6932f99af5c410268dd244c4ccb49b03cb3744 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -55,7 +55,7 @@ public class AccessibilityServiceWarning {
         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 342b3847a6a0bab81ba0b76a2ec0edfd1a6a7b3f..0766b1acac3721e98b2f5918f7e135d99c369779 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -211,6 +211,18 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
 
     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 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
         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 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
 
         @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 21ead46585480cce81c6296bfa85271408cfc311..da47a95d653e8ad8f65fc46dcb9b6843bf0a76eb 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -51,6 +51,11 @@ public class AccessibilityShortcutPreferenceFragment extends ToggleFeaturePrefer
         return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
     }
 
+    @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/ListDialogPreference.java b/src/com/android/settings/accessibility/ListDialogPreference.java
index a67bf485f5936733600b5dcdf04aa29d494740d5..cfb77bb3ea435bbb1a982d045949a25e35f8b711 100644
--- a/src/com/android/settings/accessibility/ListDialogPreference.java
+++ b/src/com/android/settings/accessibility/ListDialogPreference.java
@@ -31,7 +31,7 @@ import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 
-import com.android.settings.CustomDialogPreference;
+import com.android.settingslib.CustomDialogPreference;
 
 /**
  * Abstract dialog preference that displays a set of values and optional titles.
diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
index 68979ad61b370b836fe755c68875ec65704059a9..9715559eec24562efb6a4bd94d042a578dbfaeb7 100644
--- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
@@ -31,11 +31,9 @@ import android.view.accessibility.AccessibilityManager;
 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;
@@ -67,6 +65,11 @@ public final class MagnificationPreferenceFragment extends SettingsPreferenceFra
         mMagnificationNavbarPreference = findPreference(MAGNIFICATION_NAVBAR_PREFERENCE_SCREEN_KEY);
     }
 
+    @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 38e6b0f0709e3958a37ab0fddfd9710722a5a709..ae57f066c4d01531c71ff981a19a733fd24beaf7 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 da4bdcf6fb0ce04f9650227c1c5f7dc80a5beb9a..976a743d0ed05b30d6f78b3e8511a1feb4c8e0c7 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.provider.Settings;
 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 @@ public class ToggleAccessibilityServicePreferenceFragment
         // 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 6b2c6c8015dd7939e7babefb85bdc888ba4836b8..16df03e48e49da35a56ca7e0bac472fd3755b3d9 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -26,7 +26,7 @@ import android.widget.Switch;
 
 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;
 
 
@@ -104,6 +104,11 @@ public class ToggleAutoclickPreferenceFragment extends ToggleFeaturePreferenceFr
         return MetricsEvent.ACCESSIBILITY_TOGGLE_AUTOCLICK;
     }
 
+    @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 381364180aed87ccf59756f05a50a9385345c040..64d38af609595d2a132e6ecaddc16b3da9d7e632 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -41,6 +41,11 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
         return MetricsEvent.ACCESSIBILITY_TOGGLE_DALTONIZER;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_color_correction;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -49,6 +54,10 @@ public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceF
 
         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 6a4eb5f47f4424eb715469444267065b8091afcc..f66fb4dde362fba5c681eae94f214d3c93fdd28c 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -42,7 +42,6 @@ public abstract class ToggleFeaturePreferenceFragment
     protected ToggleSwitch mToggleSwitch;
 
     protected String mPreferenceKey;
-    protected Preference mSummaryPreference;
 
     protected CharSequence mSettingsTitle;
     protected Intent mSettingsIntent;
@@ -53,36 +52,6 @@ public abstract class ToggleFeaturePreferenceFragment
         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 @@ public abstract class ToggleFeaturePreferenceFragment
         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 @@ public abstract class ToggleFeaturePreferenceFragment
 
     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 @@ public abstract class ToggleFeaturePreferenceFragment
     }
 
     protected void onProcessArguments(Bundle arguments) {
-        if (arguments == null) {
-            getPreferenceScreen().removePreference(mSummaryPreference);
-            return;
-        }
-
         // Key.
         mPreferenceKey = arguments.getString(AccessibilitySettings.EXTRA_PREFERENCE_KEY);
 
@@ -168,9 +132,7 @@ public abstract class ToggleFeaturePreferenceFragment
         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 293d2bfe56be2be632f1cd363c6cc90babc51321..c200d171b72052d5389c44153c8e3957b9e180c9 100644
--- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
@@ -72,6 +72,11 @@ public class ToggleFontSizePreferenceFragment extends PreviewSeekBarPreferenceFr
         Settings.System.putFloat(resolver, Settings.System.FONT_SCALE, mValues[mCurrentIndex]);
     }
 
+    @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 0cdeff04cfffb92650b4352b4548603c05219c21..033d81b9b360de194effd0b23a3033e2544a2315 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -146,7 +146,6 @@ public class ToggleScreenMagnificationPreferenceFragment extends
         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 65959b41e43ce0b7dbbb5e8a63e6c9dc87f60f6a..3d853fe41a091e3de4a86e20ba9fcaa48c4237d6 100644
--- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -22,9 +22,8 @@ import android.os.Bundle;
 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 class AccountDetailDashboardFragment extends DashboardFragment {
     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;
@@ -98,6 +96,11 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
         return TAG;
     }
 
+    @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 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
         controllers.add(mAccountSynController);
         mRemoveAccountController = new RemoveAccountPreferenceController(context, this);
         controllers.add(mRemoveAccountController);
+        controllers.add(new AccountHeaderPreferenceController(
+                context, getLifecycle(), getActivity(), this /* host */, getArguments()));
         return controllers;
     }
 
@@ -127,8 +132,6 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
 
     @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 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
             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 0000000000000000000000000000000000000000..5cbd1b0e8d97cf511bde46ee5644e1dd1d757243
--- /dev/null
+++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.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.accounts;
+
+import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_ACCOUNT;
+import static com.android.settings.accounts.AccountDetailDashboardFragment.KEY_USER_HANDLE;
+
+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 com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+public class AccountHeaderPreferenceController extends PreferenceController
+        implements LifecycleObserver, OnResume {
+
+    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 LayoutPreference mHeaderPreference;
+
+    public AccountHeaderPreferenceController(Context context, Lifecycle lifecycle,
+            Activity activity, PreferenceFragment host, Bundle args) {
+        super(context);
+        mActivity = activity;
+        mHost = host;
+        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;
+        }
+        if (lifecycle != null) {
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @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);
+        mHeaderPreference = (LayoutPreference) screen.findPreference(KEY_ACCOUNT_HEADER);
+    }
+
+    @Override
+    public void onResume() {
+        final AuthenticatorHelper helper = new AuthenticatorHelper(mContext, mUserHandle, null);
+
+        EntityHeaderController
+                .newInstance(mActivity, mHost, mHeaderPreference.findViewById(R.id.entity_header))
+                .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 4820161c5a5cc77873230b397b6d5b9265a50596..03a620bde08db3fc1a6e2ffff8708aaef8300845 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.SettingsPreferenceFragment;
 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/AccountSyncPreferenceController.java b/src/com/android/settings/accounts/AccountSyncPreferenceController.java
index 0b095f7b68c021f87c7c86311e8575704bae1bbd..2eee579637d44f58f609b0cff7fdad828810134b 100644
--- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java
@@ -19,23 +19,31 @@ package com.android.settings.accounts;
 import static android.content.Intent.EXTRA_USER;
 
 import android.accounts.Account;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.SyncAdapterType;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.PreferenceController;
+import com.android.settingslib.accounts.AuthenticatorHelper;
 
-public class AccountSyncPreferenceController extends PreferenceController {
+public class AccountSyncPreferenceController extends PreferenceController
+        implements AuthenticatorHelper.OnAccountsUpdateListener {
 
     private static final String TAG = "AccountSyncController";
     private static final String KEY_ACCOUNT_SYNC = "account_sync";
 
     private Account mAccount;
     private UserHandle mUserHandle;
+    private AuthenticatorHelper mAuthenticatorHelper;
+    private Preference mPreference;
 
     public AccountSyncPreferenceController(Context context) {
         super(context);
@@ -65,8 +73,61 @@ public class AccountSyncPreferenceController extends PreferenceController {
         return KEY_ACCOUNT_SYNC;
     }
 
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        updateSummary(preference);
+    }
+
+    @Override
+    public void onAccountsUpdate(UserHandle userHandle) {
+        updateSummary(mPreference);
+    }
+
     public void init(Account account, UserHandle userHandle) {
         mAccount = account;
         mUserHandle = userHandle;
+        mAuthenticatorHelper = new AuthenticatorHelper(mContext, mUserHandle, this);
+    }
+
+    @VisibleForTesting
+    void updateSummary(Preference preference) {
+        final int userId = mUserHandle.getIdentifier();
+        final SyncAdapterType[] syncAdapters = ContentResolver.getSyncAdapterTypesAsUser(userId);
+        int total = 0;
+        int enabled = 0;
+        if (syncAdapters != null) {
+            for (int i = 0, n = syncAdapters.length; i < n; i++) {
+                final SyncAdapterType sa = syncAdapters[i];
+                if (!sa.accountType.equals(mAccount.type) || !sa.isUserVisible()) {
+                    continue;
+                }
+                final int syncState =
+                        ContentResolver.getIsSyncableAsUser(mAccount, sa.authority, userId);
+                if (syncState > 0) {
+                    total++;
+                    final boolean syncEnabled = ContentResolver.getSyncAutomaticallyAsUser(
+                            mAccount, sa.authority, userId);
+                    final boolean oneTimeSyncMode =
+                            !ContentResolver.getMasterSyncAutomaticallyAsUser(userId);
+                    if (oneTimeSyncMode || syncEnabled) {
+                        enabled++;
+                    }
+                }
+            }
+        }
+        if (enabled == 0) {
+            preference.setSummary(R.string.account_sync_summary_all_off);
+        } else if (enabled == total) {
+            preference.setSummary(R.string.account_sync_summary_all_on);
+        } else {
+            preference.setSummary(
+                    mContext.getString(R.string.account_sync_summary_some_on, enabled, total));
+        }
     }
 }
diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java
index 4f9282909aec1ac06500680e567c4a2d11db950e..3e869fec213d64d8f0d58431b932969edd37ef96 100644
--- a/src/com/android/settings/accounts/AccountTypePreference.java
+++ b/src/com/android/settings/accounts/AccountTypePreference.java
@@ -79,7 +79,6 @@ public class AccountTypePreference extends Preference implements OnPreferenceCli
         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 345f9fc9907311bc931f3178ef7c87eb759b6213..cca15c96d3c6ea8217169cacbb905d7b8beb6c37 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.os.UserManager;
 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 10e36100990154d8e22dbf819136602cce9cf3d4..a3dd94d1c7fd0ad2af0f37cfcfb98dcccb5b2716 100644
--- a/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/accounts/AddUserWhenLockedPreferenceController.java
@@ -20,11 +20,11 @@ import android.provider.Settings.Global;
 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 fce88aa064fc44b1677e8eee39a91ac3999af9a3..fe6f7b4da4e0de3bb03b503f79e480822ff98256 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.SettingsPreferenceFragment;
 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 12219472d79c6a1472ce853f8f6460ee01e980d8..0c530411853ea59d1ba7598b442f0aaef536de61 100644
--- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
+++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
@@ -34,7 +34,7 @@ import java.util.List;
 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 a5a92ee16fd35750247a2b154a963076d61c0ca7..792b77a69226291b73dfbab3375df8ae5d0861f8 100644
--- a/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/UserAndAccountDashboardFragment.java
@@ -57,6 +57,11 @@ public class UserAndAccountDashboardFragment extends DashboardFragment {
         return R.xml.user_and_accounts_settings;
     }
 
+    @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<>();
diff --git a/src/com/android/settings/applications/AccessibilityManagerWrapperImpl.java b/src/com/android/settings/applications/AccessibilityManagerWrapperImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..4ebaea759fcfd72c3dd36a6adcb39e779b1199b3
--- /dev/null
+++ b/src/com/android/settings/applications/AccessibilityManagerWrapperImpl.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.applications;
+
+import android.view.accessibility.AccessibilityManager;
+
+/**
+ * This class replicates a subset of the {@link android.view.accessibility.AccessibilityManager}.
+ * The interface exists so that we can use a thin wrapper around the AccessibilityManager in
+ * production code and a mock in tests.
+ */
+public class AccessibilityManagerWrapperImpl {
+
+    /**
+     * Determines if the accessibility button within the system navigation area is supported.
+     *
+     * @return {@code true} if the accessibility button is supported on this device,
+     * {@code false} otherwise
+     * @hide
+     */
+    public static boolean isAccessibilityButtonSupported() {
+        return AccessibilityManager.isAccessibilityButtonSupported();
+    }
+}
diff --git a/src/com/android/settings/applications/AccessibilityServiceInfoWrapper.java b/src/com/android/settings/applications/AccessibilityServiceInfoWrapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..6ce0a4a9bcd2f6d7df4449d1be1721b4a83728a8
--- /dev/null
+++ b/src/com/android/settings/applications/AccessibilityServiceInfoWrapper.java
@@ -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.
+ */
+
+package com.android.settings.applications;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+
+/**
+ * This interface replicates a subset of the
+ * {@link android.accessibilityservice.AccessibilityServiceInfo}. The interface
+ * exists so that we can use a thin wrapper around it in production code and a mock in tests.
+ * We cannot directly mock or shadow it, because some of the methods we rely on are newer than
+ * the API version supported by Robolectric.
+ */
+public interface AccessibilityServiceInfoWrapper {
+
+    /**
+     * Returns the real {@code AccessibilityServiceInfo} object.
+     */
+    AccessibilityServiceInfo getAccessibilityServiceInfo();
+
+    ComponentName getComponentName();
+}
diff --git a/src/com/android/settings/applications/AccessibilityServiceInfoWrapperImpl.java b/src/com/android/settings/applications/AccessibilityServiceInfoWrapperImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..d0d99ea6533de43be9bde77785eff0f7061ac4a6
--- /dev/null
+++ b/src/com/android/settings/applications/AccessibilityServiceInfoWrapperImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+
+public class AccessibilityServiceInfoWrapperImpl implements AccessibilityServiceInfoWrapper {
+
+    private final AccessibilityServiceInfo mServiceInfo;
+
+    public AccessibilityServiceInfoWrapperImpl(AccessibilityServiceInfo serviceInfo) {
+        mServiceInfo = serviceInfo;
+    }
+
+    @Override
+    public AccessibilityServiceInfo getAccessibilityServiceInfo() {
+        return mServiceInfo;
+    }
+
+    @Override
+    public ComponentName getComponentName() {
+        return mServiceInfo.getComponentName();
+    }
+}
diff --git a/src/com/android/settings/applications/AdvancedAppSettings.java b/src/com/android/settings/applications/AdvancedAppSettings.java
index cce8b7d02fb13b5991be061071dbff0169765092..b623801db7e8d5f64a490c405857ab889d385953 100644
--- a/src/com/android/settings/applications/AdvancedAppSettings.java
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -18,8 +18,8 @@ package com.android.settings.applications;
 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 @@ public class AdvancedAppSettings extends DashboardFragment {
 
     @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 @@ public class AdvancedAppSettings extends DashboardFragment {
         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 @@ public class AdvancedAppSettings extends DashboardFragment {
                             .getPreferenceKey());
                     return keys;
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context);
+                }
             };
 
     static class SummaryProvider implements SummaryLoader.SummaryProvider {
@@ -118,10 +127,10 @@ public class AdvancedAppSettings extends DashboardFragment {
                 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 class AdvancedAppSettings extends DashboardFragment {
     }
 
     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 63e8be75f93ba4ae4a10d85d3edf7f742abb432d..e0fc2b01a706431ddfdf8395d9195f8ffc2c59bc 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;
 
@@ -47,7 +50,12 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(3);
+        mProgressiveDisclosureMixin.setTileLimit(4);
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_apps_and_notifications;
     }
 
     @Override
@@ -57,14 +65,24 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
 
     @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 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
 
                 @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 8eff5263e17ded831a19feeb629b34154c7b0f87..8c7aed7aefa949cf09834d64903cec63e0a2e664 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/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index 3e83856c0e120c1a60d7c154d2afc7d3bb00fa1e..564bc491e0a312594dc107223152e4bf12cc44e9 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -35,6 +35,7 @@ import android.os.IBinder;
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -293,7 +294,8 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
         @Override
         public void onReceive(Context context, Intent intent) {
             String packageName = intent.getData().getSchemeSpecificPart();
-            if (!mFinishing && mAppEntry.info.packageName.equals(packageName)) {
+            if (!mFinishing && (mAppEntry == null || mAppEntry.info == null
+                    || TextUtils.equals(mAppEntry.info.packageName, packageName))) {
                 onPackageRemoved();
             }
         }
diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java
index 6b1ef6756ec2fa58d0706bbf30e245c26658509e..95877e9622d8f88fb37f04333d8489a6c53624e1 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 @@ public abstract class AppInfoWithHeader extends AppInfoBase {
         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 e6c040b4ab48a503048c7820d6e96d1c238a9c2c..b488af696e877de7f17a9ffec5ac9a5093042e52 100644
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -28,6 +28,7 @@ import android.content.pm.PermissionInfo;
 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.core.InstrumentedPreferenceFragment;
 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 @@ public class AppOpsDetails extends InstrumentedPreferenceFragment {
         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 @@ public class AppOpsDetails extends InstrumentedPreferenceFragment {
             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 0000000000000000000000000000000000000000..57ec6d800d1e24274b238f64c1d30321a9bfd635
--- /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 27cac641c3dfc1a5e2d2bbba478240da3ca85562..eae23d11401da2dc54d97cdef1373200cab69f6a 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProvider.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProvider.java
@@ -29,14 +29,8 @@ import java.util.Set;
 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 @@ public interface ApplicationFeatureProvider {
      * 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 @@ public interface ApplicationFeatureProvider {
      * 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 @@ public interface ApplicationFeatureProvider {
      * 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 @@ public interface ApplicationFeatureProvider {
      * 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 685bd2045c9c75b07c1bfe125442ee624d1afe81..10b61c5570b9aad9e20d25c365c858c76951fc8e 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.PackageManager;
 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;
@@ -53,11 +52,6 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
         mUm = UserManager.get(mContext);
     }
 
-    @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) {
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index be3c371ccb932dd9acc5cc32f7707c99c8ea29b4..c5e6d771e6d0356b63fa7cf50defe8a7226637a6 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -24,16 +24,15 @@ import android.view.View;
 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 72564bc3f8e227c49499b28a2fac2eba41f2e45f..c6f3cc0c1e6105c6dec6038cd0da1199089fb04c 100644
--- a/src/com/android/settings/applications/DrawOverlayDetails.java
+++ b/src/com/android/settings/applications/DrawOverlayDetails.java
@@ -20,8 +20,6 @@ import android.app.AppOpsManager;
 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 class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc
 
     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 fe51a87ab772a6f0307fed28e7387b887df68d5a..36ce8f803bdb287ee7a219b393bf9912218ad15b 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.os.UserManager;
 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 @@ public class ExternalSourcesDetails extends AppInfoWithHeader
                 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 3ee3c5069dac4b8138cd2973f86133bfad6e0e7d..39e325507a23fcbdfffed052ef146ce7df74ca2e 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.PackageManager.NameNotFoundException;
 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.TextUtils;
 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.fuelgauge.BatteryUtils;
 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;
@@ -214,7 +209,7 @@ public class InstalledAppDetails extends AppInfoBase
 
                 @Override
                 public Loader<BatteryStatsHelper> onCreateLoader(int id, Bundle args) {
-                    return new BatteryStatsHelperLoader(getContext(), args);
+                    return new BatteryStatsHelperLoader(getContext());
                 }
 
                 @Override
@@ -381,7 +376,7 @@ public class InstalledAppDetails extends AppInfoBase
         }
 
         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 @@ public class InstalledAppDetails extends AppInfoBase
         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 @@ public class InstalledAppDetails extends AppInfoBase
 
     // 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));
     }
 
@@ -1058,9 +1050,10 @@ public class InstalledAppDetails extends AppInfoBase
         } else if (preference == mBatteryPreference) {
             if (isBatteryStatsAvailable()) {
                 BatteryEntry entry = new BatteryEntry(getContext(), null, mUserManager, mSipper);
+                entry.defaultPackageName = mPackageName;
                 AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(),
                         this, mBatteryHelper, BatteryStats.STATS_SINCE_CHARGED, entry,
-                        mBatteryPercent);
+                        mBatteryPercent, null /* mAnomalies */);
             } else {
                 AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(),
                         this, mPackageName);
@@ -1256,7 +1249,8 @@ public class InstalledAppDetails extends AppInfoBase
         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 +1294,6 @@ public class InstalledAppDetails extends AppInfoBase
         }
     }
 
-    /**
-     * @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 b823f8ea815902306b34f86b4cda8739c205d55f..f2bd183bfb06c048b916e09a7989ba957527fc56 100644
--- a/src/com/android/settings/applications/LayoutPreference.java
+++ b/src/com/android/settings/applications/LayoutPreference.java
@@ -19,6 +19,7 @@ package com.android.settings.applications;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.support.annotation.VisibleForTesting;
+import android.support.v4.content.res.TypedArrayUtils;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
@@ -33,19 +34,30 @@ import com.android.settings.Utils;
 public class LayoutPreference extends Preference {
 
     private final View.OnClickListener mClickListener = v -> performClick(v);
+    private boolean mAllowDividerAbove;
+    private boolean mAllowDividerBelow;
 
     @VisibleForTesting
     View mRootView;
 
     public LayoutPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        final TypedArray a = context.obtainStyledAttributes(
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.Preference);
+        mAllowDividerAbove = TypedArrayUtils.getBoolean(a, R.styleable.Preference_allowDividerAbove,
+                R.styleable.Preference_allowDividerAbove, false);
+        mAllowDividerBelow = TypedArrayUtils.getBoolean(a, R.styleable.Preference_allowDividerBelow,
+                R.styleable.Preference_allowDividerBelow, false);
+        a.recycle();
+
+        a = context.obtainStyledAttributes(
                 attrs, com.android.internal.R.styleable.Preference, 0, 0);
         int layoutResource = a.getResourceId(com.android.internal.R.styleable.Preference_layout,
                 0);
         if (layoutResource == 0) {
             throw new IllegalArgumentException("LayoutPreference requires a layout to be defined");
         }
+        a.recycle();
+
         // Need to create view now so that findViewById can be called immediately.
         final View view = LayoutInflater.from(getContext())
                 .inflate(layoutResource, null, false);
@@ -78,6 +90,8 @@ public class LayoutPreference extends Preference {
         final boolean selectable = isSelectable();
         holder.itemView.setFocusable(selectable);
         holder.itemView.setClickable(selectable);
+        holder.setDividerAllowedAbove(mAllowDividerAbove);
+        holder.setDividerAllowedBelow(mAllowDividerBelow);
 
         FrameLayout layout = (FrameLayout) holder.itemView;
         layout.removeAllViews();
@@ -88,7 +102,7 @@ public class LayoutPreference extends Preference {
         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 e400f5e77eeb73ee1a8a2b4daa3fdb9a8b65c801..0000000000000000000000000000000000000000
--- 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 76129b7d1876a5e5dd98fbc487d3fa1ed0be80d5..c0df50c5f24eef8e63cae5ca5a4f5517bbac935a 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -18,6 +18,7 @@ package com.android.settings.applications;
 
 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 class ManageApplications extends InstrumentedPreferenceFragment
     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];
@@ -212,8 +214,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
     }
 
     // Storage types. Used to determine what the extra item in the list of preferences is.
-    public static final int STORAGE_TYPE_DEFAULT = 0;
+    public static final int STORAGE_TYPE_DEFAULT = 0; // Show all apps that are not categorized.
     public static final int STORAGE_TYPE_MUSIC = 1;
+    public static final int STORAGE_TYPE_LEGACY = 2; // Show apps even if they can be categorized.
 
     // sort order
     private int mSortOrder = R.id.sort_order_alpha;
@@ -261,8 +264,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
 
     // 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,13 +341,12 @@ public class ManageApplications extends InstrumentedPreferenceFragment
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+            Bundle savedInstanceState) {
         // initialize the inflater
         mInflater = inflater;
 
         mRootView = inflater.inflate(R.layout.manage_applications_apps, null);
         mLoadingContainer = mRootView.findViewById(R.id.loading_container);
-        mLoadingContainer.setVisibility(View.VISIBLE);
         mListContainer = mRootView.findViewById(R.id.list_container);
         if (mListContainer != null) {
             // Create adapter and list view here
@@ -393,7 +395,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
         return mRootView;
     }
 
-    private void createHeader() {
+    @VisibleForTesting
+    void createHeader() {
         Activity activity = getActivity();
         FrameLayout pinnedHeader = (FrameLayout) mRootView.findViewById(R.id.pinned_header);
         mSpinnerHeader = activity.getLayoutInflater()
@@ -425,12 +428,13 @@ public class ManageApplications extends InstrumentedPreferenceFragment
     }
 
     @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) {
                 filter = new CompoundFilter(ApplicationsState.FILTER_AUDIO, filter);
-            } else {
+            } else if (storageType == STORAGE_TYPE_DEFAULT) {
                 filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
             }
             return filter;
@@ -506,10 +510,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
+    public void onStart() {
+        super.onStart();
         updateView();
-        updateOptionsMenu();
         if (mApplications != null) {
             mApplications.resume(mSortOrder);
             mApplications.updateLoading();
@@ -527,16 +530,11 @@ public class ManageApplications extends InstrumentedPreferenceFragment
     }
 
     @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 +570,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
     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 +598,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
                 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 +613,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
 
     @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 +629,21 @@ public class ManageApplications extends InstrumentedPreferenceFragment
         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 +655,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
                 && 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 +683,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
                 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,
@@ -826,6 +835,10 @@ public class ManageApplications extends InstrumentedPreferenceFragment
     static class ApplicationsAdapter extends BaseAdapter implements Filterable,
             ApplicationsState.Callbacks, AppStateBaseBridge.Callback,
             AbsListView.RecyclerListener, SectionIndexer {
+
+        // how long to wait for app list to populate without showing the loading container
+        private static final long DELAY_SHOW_LOADING_CONTAINER_THRESHOLD_MS = 100L;
+
         private static final SectionInfo[] EMPTY_SECTIONS = new SectionInfo[0];
 
         private final ApplicationsState mState;
@@ -881,8 +894,15 @@ public class ManageApplications extends InstrumentedPreferenceFragment
             }
         };
 
+        private Runnable mShowLoadingContainerRunnable = new Runnable() {
+            public void run() {
+                Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
+                        mManageApplications.mListContainer, false /* done */, false /* animate */);
+            }
+        };
+
         public ApplicationsAdapter(ApplicationsState state, ManageApplications manageApplications,
-                                   int filterMode) {
+                int filterMode) {
             mState = state;
             mFgHandler = new Handler();
             mBgHandler = new Handler(mState.getBackgroundLooper());
@@ -955,7 +975,8 @@ public class ManageApplications extends InstrumentedPreferenceFragment
             // 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 +1063,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
         }
 
         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
@@ -1089,6 +1109,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
 
             if (mSession.getAllApps().size() != 0
                     && mManageApplications.mListContainer.getVisibility() != View.VISIBLE) {
+                // Cancel any pending task to show the loading animation and show the list of
+                // apps directly.
+                mFgHandler.removeCallbacks(mShowLoadingContainerRunnable);
                 Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
                         mManageApplications.mListContainer, true, true);
             }
@@ -1102,7 +1125,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
         }
 
         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();
@@ -1140,14 +1163,20 @@ public class ManageApplications extends InstrumentedPreferenceFragment
             }
         }
 
-        private void updateLoading() {
-            Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
-                    mManageApplications.mListContainer,
-                    mHasReceivedLoadEntries && mSession.getAllApps().size() != 0, false);
+        @VisibleForTesting
+        void updateLoading() {
+            final boolean appLoaded = mHasReceivedLoadEntries && mSession.getAllApps().size() != 0;
+            if (appLoaded) {
+                Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
+                        mManageApplications.mListContainer, true /* done */, false /* animate */);
+            } else {
+                mFgHandler.postDelayed(
+                        mShowLoadingContainerRunnable, DELAY_SHOW_LOADING_CONTAINER_THRESHOLD_MS);
+            }
         }
 
         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 +1395,9 @@ public class ManageApplications extends InstrumentedPreferenceFragment
                 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 +1498,7 @@ public class ManageApplications extends InstrumentedPreferenceFragment
             = 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/MusicViewHolderController.java b/src/com/android/settings/applications/MusicViewHolderController.java
index 61a011d9e2f15d0d44426c50e5096d279d4aa460..af822a0544945d92d2aa931e44bbc25d8dbe5c97 100644
--- a/src/com/android/settings/applications/MusicViewHolderController.java
+++ b/src/com/android/settings/applications/MusicViewHolderController.java
@@ -19,6 +19,7 @@ package com.android.settings.applications;
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.InsetDrawable;
 import android.os.UserHandle;
 import android.provider.DocumentsContract;
 import android.support.annotation.WorkerThread;
@@ -38,6 +39,7 @@ public class MusicViewHolderController implements FileViewHolderController {
     private static final String TAG = "MusicViewHolderController";
 
     private static final String AUTHORITY_MEDIA = "com.android.providers.media.documents";
+    private static final int INSET_SIZE = 24; // dp
 
     private Context mContext;
     private StorageStatsSource mSource;
@@ -71,7 +73,8 @@ public class MusicViewHolderController implements FileViewHolderController {
 
     @Override
     public void setupView(AppViewHolder holder) {
-        holder.appIcon.setImageDrawable(mContext.getDrawable(R.drawable.ic_headset_24dp));
+        holder.appIcon.setImageDrawable(
+                new InsetDrawable(mContext.getDrawable(R.drawable.ic_headset_24dp), INSET_SIZE));
         holder.appName.setText(mContext.getText(R.string.audio_files_title));
         holder.summary.setText(Formatter.formatFileSize(mContext, mMusicSize));
     }
diff --git a/src/com/android/settings/applications/NotificationApps.java b/src/com/android/settings/applications/NotificationApps.java
index c54363aa7352b4f878f0d50d4da7c4868220ab8c..f290d43b8312c6cfcf5ee330f0b7c3aa7a9b2c8b 100644
--- a/src/com/android/settings/applications/NotificationApps.java
+++ b/src/com/android/settings/applications/NotificationApps.java
@@ -17,7 +17,6 @@ package com.android.settings.applications;
 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 @@ import com.android.settings.notification.NotificationBackend;
  */
 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 ffa8e46a935001e2d989ffbcbcda4178452b089b..580b578da73882704342da2e04fd8e4181d1fb12 100644
--- a/src/com/android/settings/applications/PackageManagerWrapper.java
+++ b/src/com/android/settings/applications/PackageManagerWrapper.java
@@ -101,13 +101,16 @@ public interface PackageManagerWrapper {
     void replacePreferredActivity(IntentFilter homeFilter, int matchCategoryEmpty,
             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 8349702b7003f1d728c9a94abab69c00991c45c0..a47137c069fab68d37f87235938222a77315fa24 100644
--- a/src/com/android/settings/applications/PackageManagerWrapperImpl.java
+++ b/src/com/android/settings/applications/PackageManagerWrapperImpl.java
@@ -93,6 +93,11 @@ public class PackageManagerWrapperImpl implements PackageManagerWrapper {
         mPm.replacePreferredActivity(homeFilter, matchCategoryEmpty, componentNames, component);
     }
 
+    @Override
+    public VolumeInfo getPrimaryStorageCurrentVolume() {
+        return mPm.getPrimaryStorageCurrentVolume();
+    }
+
     @Override
     public void deletePackageAsUser(String packageName, IPackageDeleteObserver observer, int flags,
             int userId) {
@@ -100,7 +105,8 @@ public class PackageManagerWrapperImpl implements PackageManagerWrapper {
     }
 
     @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 41f006acb51d4477b2ea8ab985ebfc6907091642..a886a3df554e64062af843aeffe4ab8962e923ed 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.internal.logging.nano.MetricsProto.MetricsEvent;
 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 @@ public class PictureInPictureDetails extends AppInfoWithHeader
     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 6c0928c1e6e32a04df22c37a71d3d951f20bc5dc..b9c3826c92b12f6b52b17c33a0f38a452e1adf50 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.R;
 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.Comparator;
 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 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment {
             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 c00cd5fe04e4de96b06cf9aa3cd08826b7948bc2..cdb8a4c608b030642b8154a188eabfa5206b9ae7 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -102,6 +102,11 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
         return MetricsEvent.PROCESS_STATS_SUMMARY;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_process_stats_summary;
+    }
+
     @Override
     public boolean onPreferenceClick(Preference preference) {
         if (preference == mAppListPreference) {
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 72238f61cdfe549d4297a9dc7804c5d8ae826a95..9f76fb28e86b7b5c14ed3f28dbd1546af62a099f 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -95,6 +95,11 @@ public class ProcessStatsUi extends ProcessStatsBase {
         return MetricsEvent.APPLICATIONS_PROCESS_STATS_UI;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_process_stats_apps;
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..dd9560537de55b3c9b52cc1bffd88650997eddf5
--- /dev/null
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Utils;
+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_DIVIDER = "all_app_info_divider";
+    @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 Preference mDivider;
+    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);
+        keys.add(KEY_DIVIDER);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mCategory = (PreferenceCategory) screen.findPreference(getPreferenceKey());
+        mSeeAllPref = screen.findPreference(KEY_SEE_ALL);
+        mDivider = screen.findPreference(KEY_DIVIDER);
+        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);
+        mDivider.setVisible(false);
+        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);
+        mDivider.setVisible(true);
+        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(TextUtils.expandTemplate(
+                mContext.getResources().getText(R.string.recent_app_summary),
+                Utils.formatElapsedTime(mContext,
+                    System.currentTimeMillis() - stat.getLastTimeUsed(), false)));
+            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 41352bbdd0093492cb343c363713be5823f4b0f6..6c99a2ed7b20123761be45b81f2beda835d96b06 100644
--- a/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
+++ b/src/com/android/settings/applications/ResetAppPrefPreferenceController.java
@@ -22,10 +22,10 @@ import android.support.v7.preference.Preference;
 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/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java
index d90ff1877f7a3031d19f5f87f6175577c42f4fea..58a1dce707d6fcdec7ede1fd6c605cdea5c05060 100644
--- a/src/com/android/settings/applications/SpacePreference.java
+++ b/src/com/android/settings/applications/SpacePreference.java
@@ -17,6 +17,7 @@ package com.android.settings.applications;
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.support.v4.content.res.TypedArrayUtils;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
@@ -33,7 +34,9 @@ public class SpacePreference extends Preference {
     private int mHeight;
 
     public SpacePreference(Context context, AttributeSet attrs) {
-        this(context, attrs, com.android.internal.R.attr.preferenceStyle);
+        this(context, attrs, TypedArrayUtils.getAttr(context,
+                android.support.v7.preference.R.attr.preferenceStyle,
+                android.R.attr.preferenceStyle));
     }
 
     public SpacePreference(Context context, AttributeSet attrs, int defStyleAttr) {
diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java
index 31f461c7e18b24f7802f343dc047e7cabf6e8fd3..069db76de1c7213f8affc1962f4a836ab427c29a 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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SpecialAccessSettings extends DashboardFragment {
 
-public class SpecialAccessSettings extends SettingsPreferenceFragment {
+    private static final String TAG = "SpecialAccessSettings";
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
 
     @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        addPreferencesFromResource(R.xml.special_access);
+    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 aea05b3bbb03161b9dd39b632670b4a428ecd978..50e6948bbf16bd309eac0c2045454d15f4d92440 100644
--- a/src/com/android/settings/applications/WriteSettingsDetails.java
+++ b/src/com/android/settings/applications/WriteSettingsDetails.java
@@ -20,8 +20,6 @@ import android.app.AppOpsManager;
 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.applications.AppStateWriteSettingsBridge.WriteSettin
 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 class WriteSettingsDetails extends AppInfoWithHeader implements OnPrefere
     }
 
     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 05bc8d60d522f4bf8cc4e2719046ddc6dab7ecc9..4a8e9c2206f50c8df0498241cdb3c0a0adcfaee8 100644
--- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
@@ -26,10 +26,10 @@ import android.support.v7.preference.TwoStatePreference;
 
 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 e44e70ff78b834a84f9ba43dfe5e1ebadf22b3d8..faee23dd9b2817ed08d082d9b11a248cabab34cf 100644
--- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
@@ -28,10 +28,10 @@ import android.support.v7.preference.TwoStatePreference;
 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 21dfe19b95c07fff87d22a80ea35d1c1aa72bbc2..fb7be629be2942765d65661378da537a999872ed 100644
--- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
@@ -26,10 +26,10 @@ import android.support.v7.preference.TwoStatePreference;
 
 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 032fb13ad889f5f30ac4df625896f644477b67c8..3443a44d77c79629ed9e8e4970aa978f14f5ec3e 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -27,10 +27,10 @@ import android.text.TextUtils;
 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 aa71c9ab04f9e6b005e5c8708d9d56e99e8b4973..4209a4277146f844a7145852aa4b7ba69b9d690a 100644
--- a/src/com/android/settings/applications/assist/ManageAssist.java
+++ b/src/com/android/settings/applications/assist/ManageAssist.java
@@ -22,11 +22,11 @@ import android.provider.SearchIndexableResource;
 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;
@@ -72,7 +72,8 @@ public class ManageAssist extends DashboardFragment {
             Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new DefaultAssistPreferenceController(context));
-        controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST));
+        controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST,
+                true /* assistOnly */));
         controllers.add(new AssistContextPreferenceController(context, lifecycle));
         controllers.add(new AssistScreenshotPreferenceController(context, lifecycle));
         controllers.add(new AssistFlashScreenPreferenceController(context, lifecycle));
@@ -102,6 +103,5 @@ public class ManageAssist extends DashboardFragment {
                     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 a08711c160cc489fdc757f0d26f38a0e2a9140c7..d3617ef886978ba8f4c6dd2ddc4c690cbfc9acbd 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.DialogFragment;
 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;
@@ -62,6 +62,16 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
         }
     }
 
+    @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) {
@@ -97,7 +107,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
 
         @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 5c0f9a3bf7aa5bbdd1f18cdb59f5c44184c19330..219ce0fe091d887a394369320e45e3de223d532c 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
@@ -18,16 +18,20 @@ package com.android.settings.applications.defaultapps;
 
 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 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
     @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 @@ public class DefaultBrowserPreferenceController extends DefaultAppPreferenceCont
         // 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 2e9387668527e9c6a007c7906fe83b36e00aa92d..a89766f214510a537a64e52211a59f524adb00c0 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.content.pm.ResolveInfo;
 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 @@ public class DefaultHomePreferenceController extends DefaultAppPreferenceControl
         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 f8bab3d3c701f3f5cb47e78d02e812bffa21f6cc..7ffc6cd32f20937b88b81321da3f84ee6ec6e3b8 100644
--- a/src/com/android/settings/backup/BackupSettingsActivity.java
+++ b/src/com/android/settings/backup/BackupSettingsActivity.java
@@ -94,14 +94,12 @@ public class BackupSettingsActivity extends Activity implements Indexable {
 
                     // 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 @@ public class BackupSettingsActivity extends Activity implements Indexable {
 
                 @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/AlwaysDiscoverable.java b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java
new file mode 100644
index 0000000000000000000000000000000000000000..5d7cbd59faaf81180dafcfd177bab7daba95d45d
--- /dev/null
+++ b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Handler;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/** Helper class, intended to be used by an Activity, to keep the local Bluetooth adapter in
+ *  discoverable mode indefinitely. By default setting the scan mode to
+ *  BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE will time out after some time, but some
+ *  Bluetooth settings pages would like to keep the device discoverable as long as the page is
+ *  visible. */
+public class AlwaysDiscoverable extends BroadcastReceiver {
+    private static final String TAG = "AlwaysDiscoverable";
+
+    private Context mContext;
+    private LocalBluetoothAdapter mLocalAdapter;
+    private IntentFilter mIntentFilter;
+
+    @VisibleForTesting
+    boolean mStarted;
+
+    public AlwaysDiscoverable(Context context, LocalBluetoothAdapter localAdapter) {
+        mContext = context;
+        mLocalAdapter = localAdapter;
+        mIntentFilter = new IntentFilter();
+        mIntentFilter.addAction(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
+    }
+
+    /** After calling start(), consumers should make a matching call to stop() when they no longer
+     * wish to enforce discoverable mode. */
+    public void start() {
+        if (mStarted) {
+            return;
+        }
+        mContext.registerReceiver(this, mIntentFilter);
+        mStarted = true;
+        if (mLocalAdapter.getScanMode() != BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
+            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+        }
+    }
+
+    public void stop() {
+        if (!mStarted) {
+            return;
+        }
+        mContext.unregisterReceiver(this);
+        mStarted = false;
+        mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (action != BluetoothAdapter.ACTION_SCAN_MODE_CHANGED) {
+            return;
+        }
+        if (mLocalAdapter.getScanMode() != BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
+            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
new file mode 100644
index 0000000000000000000000000000000000000000..bbc8d81ebcb2b21e121758daf6ac33b2e06ae4aa
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.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.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();
+    }
+
+    private void onForgetButtonPressed() {
+        ForgetDeviceDialogFragment fragment =
+                ForgetDeviceDialogFragment.newInstance(mCachedDevice.getAddress());
+        fragment.show(mFragment.getFragmentManager(), ForgetDeviceDialogFragment.TAG);
+    }
+
+    @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) -> {
+            onForgetButtonPressed();
+        });
+    }
+
+    @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 0000000000000000000000000000000000000000..73e9f31c685f25578ac64edbc83b69a218f0e143
--- /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 0000000000000000000000000000000000000000..5ec7c852513fe33d5ac09f4ac1014eff0a5244d9
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.R;
+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 static final String KEY_DEVICE_HEADER = "bluetooth_device_header";
+
+    private EntityHeaderController mHeaderController;
+
+    public BluetoothDetailsHeaderController(Context context, PreferenceFragment fragment,
+            CachedBluetoothDevice device, Lifecycle lifecycle) {
+        super(context, fragment, device, lifecycle);
+    }
+
+    @Override
+    protected void init(PreferenceScreen screen) {
+        final LayoutPreference headerPreference =
+                (LayoutPreference) screen.findPreference(KEY_DEVICE_HEADER);
+        mHeaderController = EntityHeaderController.newInstance(mFragment.getActivity(), mFragment,
+                headerPreference.findViewById(R.id.entity_header));
+        screen.addPreference(headerPreference);
+    }
+
+    protected void setHeaderProperties() {
+        Pair<Integer, String> pair = Utils.getBtClassDrawableWithDescription
+                (mContext.getResources(), mCachedDevice);
+        String summaryText = mCachedDevice.getConnectionSummary();
+        mHeaderController.setLabel(mCachedDevice.getName());
+        mHeaderController.setIcon(mContext.getDrawable(pair.first));
+        mHeaderController.setIconContentDescription(pair.second);
+        mHeaderController.setSummary(summaryText);
+    }
+
+    @Override
+    protected void refresh() {
+        setHeaderProperties();
+        mHeaderController.done(mFragment.getActivity(), true /* rebindActions */);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_DEVICE_HEADER;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
new file mode 100644
index 0000000000000000000000000000000000000000..dbcc5d6c7fba541bfe849394bbd15c6f8c4c2ffa
--- /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.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 0000000000000000000000000000000000000000..b0ed05681d66c90faa3cb1abb26ff1edc6e3c3bc
--- /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 0000000000000000000000000000000000000000..259a5fff89abe6334fb3ccc3fc28f7508ba70173
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+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";
+
+    @VisibleForTesting
+    static int EDIT_DEVICE_NAME_ITEM_ID = Menu.FIRST;
+
+    /**
+     * An interface to let tests override the normal mechanism for looking up the
+     * CachedBluetoothDevice and LocalBluetoothManager, and substitute their own mocks instead.
+     * This is only needed in situations where you instantiate the fragment indirectly (eg via an
+     * intent) and can't use something like spying on an instance you construct directly via
+     * newInstance.
+     */
+    @VisibleForTesting
+    interface TestDataFactory {
+        CachedBluetoothDevice getDevice(String deviceAddress);
+        LocalBluetoothManager getManager(Context context);
+    }
+
+    @VisibleForTesting
+    static TestDataFactory sTestDataFactory;
+
+    private String mDeviceAddress;
+    private LocalBluetoothManager mManager;
+    private CachedBluetoothDevice mCachedDevice;
+
+    public BluetoothDeviceDetailsFragment() {
+        super(DISALLOW_CONFIG_BLUETOOTH);
+    }
+
+    @VisibleForTesting
+    LocalBluetoothManager getLocalBluetoothManager(Context context) {
+        if (sTestDataFactory != null) {
+            return sTestDataFactory.getManager(context);
+        }
+        return Utils.getLocalBtManager(context);
+    }
+
+    @VisibleForTesting
+    CachedBluetoothDevice getCachedDevice(String deviceAddress) {
+        if (sTestDataFactory != null) {
+            return sTestDataFactory.getDevice(deviceAddress);
+        }
+        BluetoothDevice remoteDevice =
+                mManager.getBluetoothAdapter().getRemoteDevice(deviceAddress);
+        return mManager.getCachedDeviceManager().findDevice(remoteDevice);
+    }
+
+    public static BluetoothDeviceDetailsFragment newInstance(String deviceAddress) {
+        Bundle args = new Bundle(1);
+        args.putString(KEY_DEVICE_ADDRESS, deviceAddress);
+        BluetoothDeviceDetailsFragment fragment = new BluetoothDeviceDetailsFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        mDeviceAddress = getArguments().getString(KEY_DEVICE_ADDRESS);
+        mManager = getLocalBluetoothManager(context);
+        mCachedDevice = getCachedDevice(mDeviceAddress);
+        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
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        MenuItem item = menu.add(0, EDIT_DEVICE_NAME_ITEM_ID, 0, R.string.bluetooth_rename_button);
+        item.setIcon(R.drawable.ic_mode_edit);
+        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem menuItem) {
+        if (menuItem.getItemId() == EDIT_DEVICE_NAME_ITEM_ID) {
+            RemoteDeviceNameDialogFragment.newInstance(mCachedDevice).show(
+                    getFragmentManager(), RemoteDeviceNameDialogFragment.TAG);
+            return true;
+        }
+        return super.onOptionsItemSelected(menuItem);
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        ArrayList<PreferenceController> controllers = new ArrayList<>();
+
+        if (mCachedDevice != null) {
+            Lifecycle lifecycle = getLifecycle();
+            controllers.add(new BluetoothDetailsHeaderController(context, this, mCachedDevice,
+                    lifecycle));
+            controllers.add(new BluetoothDetailsButtonsController(context, this, mCachedDevice,
+                    lifecycle));
+            controllers.add(new BluetoothDetailsProfilesController(context, this, mManager,
+                    mCachedDevice, lifecycle));
+            controllers.add(new BluetoothDetailsMacAddressController(context, this, mCachedDevice,
+                    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 0000000000000000000000000000000000000000..f156a5d15363fe70b796151e1bd60eb4ab443450
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
+import android.text.TextUtils;
+import android.util.Log;
+
+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.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";
+
+
+    @VisibleForTesting
+    Preference mPreference;
+    private LocalBluetoothManager mLocalManager;
+    private LocalBluetoothAdapter mLocalAdapter;
+
+    public BluetoothDeviceNamePreferenceController(Context context, Lifecycle lifecycle) {
+        this(context, (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, LocalBluetoothAdapter localAdapter) {
+        super(context);
+        mLocalAdapter = localAdapter;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mPreference = screen.findPreference(getPreferenceKey());
+        super.displayPreference(screen);
+    }
+
+    @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());
+    }
+
+    /**
+     * 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
+     */
+    protected void updateDeviceName(final Preference preference, final String deviceName) {
+        if (deviceName == null) {
+            // TODO: show error message in preference subtitle
+            return;
+        }
+        final CharSequence summary = TextUtils.expandTemplate(
+                mContext.getText(R.string.bluetooth_device_name_summary),
+                BidiFormatter.getInstance().unicodeWrap(deviceName));
+        preference.setSelectable(false);
+        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 7be6dd711fe0a69dee4b9c53266c07dbb7e54f07..a216400d8d1a28c1acad6dbda980a09dbcb2d4f7 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.Preference;
 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.core.instrumentation.MetricsFeatureProvider;
 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 @@ public final class BluetoothDevicePreference extends GearPreference implements
     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) {
@@ -130,16 +117,11 @@ public final class BluetoothDevicePreference extends GearPreference implements
          * any preference info has changed from the previous value.
          */
         setTitle(mCachedDevice.getName());
+        // Null check is done at the framework
+        setSummary(mCachedDevice.getConnectionSummary());
 
-        int summaryResId = mCachedDevice.getConnectionSummary();
-        if (summaryResId != 0) {
-            setSummary(summaryResId);
-        } else {
-            setSummary(null);   // empty summary for unpaired devices
-        }
-
-
-        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 +228,4 @@ public final class BluetoothDevicePreference extends GearPreference implements
         }
     }
 
-    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/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..b64da26f1e75dc35f93af8c4453a9cf2963c99d1
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.Context;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+public class BluetoothDeviceRenamePreferenceController extends
+        BluetoothDeviceNamePreferenceController {
+
+    public static final String PREF_KEY = "bt_rename_device";
+
+    private final Fragment mFragment;
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+
+    public BluetoothDeviceRenamePreferenceController(Context context, Fragment fragment,
+            Lifecycle lifecycle) {
+        super(context, lifecycle);
+        mFragment = fragment;
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+    }
+
+    @VisibleForTesting
+    BluetoothDeviceRenamePreferenceController(Context context, Fragment fragment,
+            LocalBluetoothAdapter localAdapter) {
+        super(context, localAdapter);
+        mFragment = fragment;
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREF_KEY;
+    }
+
+    @Override
+    protected void updateDeviceName(final Preference preference, final String deviceName) {
+        preference.setSummary(deviceName);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (PREF_KEY.equals(preference.getKey())) {
+            mMetricsFeatureProvider.action(mContext,
+                    MetricsProto.MetricsEvent.ACTION_BLUETOOTH_RENAME);
+            LocalDeviceNameDialogFragment.newInstance()
+                    .show(mFragment.getFragmentManager(), LocalDeviceNameDialogFragment.TAG);
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index 6c41f830a12d06daaf612529b3f7660e0fbaea87..c0935ab1da9ef38a5ebe17c8f0eb0028d589e55b 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -208,12 +208,7 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh
      */
     @VisibleForTesting
     boolean maybeEnforceRestrictions() {
-        EnforcedAdmin admin = mRestrictionUtils.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_BLUETOOTH);
-        if (admin == null) {
-            admin = mRestrictionUtils.checkIfRestrictionEnforced(
-                    mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH);
-        }
+        EnforcedAdmin admin = getEnforcedAdmin(mRestrictionUtils, mContext);
         mSwitchWidget.setDisabledByAdmin(admin);
         if (admin != null) {
             mSwitchWidget.setChecked(false);
@@ -225,4 +220,15 @@ public final class BluetoothEnabler implements SwitchWidgetController.OnSwitchCh
         return admin != null;
     }
 
+    public static EnforcedAdmin getEnforcedAdmin(RestrictionUtils mRestrictionUtils,
+            Context mContext) {
+        EnforcedAdmin admin = mRestrictionUtils.checkIfRestrictionEnforced(
+                mContext, UserManager.DISALLOW_BLUETOOTH);
+        if (admin == null) {
+            admin = mRestrictionUtils.checkIfRestrictionEnforced(
+                    mContext, UserManager.DISALLOW_CONFIG_BLUETOOTH);
+        }
+        return admin;
+    }
+
 }
diff --git a/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java b/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
similarity index 60%
rename from src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java
rename to src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
index 4c794ba8eabb99813d3eb5c74b6a1a6414a2bf73..a6ae31c421b82edb9be699848cf1ca4ec3cbef00 100644
--- a/src/com/android/settings/core/lifecycle/events/OnCreateOptionsMenu.java
+++ b/src/com/android/settings/bluetooth/BluetoothFeatureProvider.java
@@ -14,11 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.settings.core.lifecycle.events;
+package com.android.settings.bluetooth;
 
-import android.view.Menu;
-import android.view.MenuInflater;
+/**
+ * Feature provider for bluetooth feature
+ */
+public interface BluetoothFeatureProvider {
+    /**
+     * @return whether additional pairing page is enabled
+     */
+    boolean isPairingPageEnabled();
 
-public interface OnCreateOptionsMenu {
-    void onCreateOptionsMenu(Menu menu, MenuInflater inflater);
+    /**
+     * @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 0000000000000000000000000000000000000000..8d9e1c433d71be6acf0064f729ea3a4834b29618
--- /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/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..c425cdc3134e282f6901ba2978a73247cfbc03cb
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.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.bluetooth;
+
+import android.content.Context;
+import android.content.Intent;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
+
+/**
+ * Controller that shows received files
+ */
+public class BluetoothFilesPreferenceController extends PreferenceController {
+    private static final String TAG = "BluetoothFilesPrefCtrl";
+
+    public static final String KEY_RECEIVED_FILES = "bt_received_files";
+
+    /* Private intent to show the list of received files */
+    @VisibleForTesting
+    static final String ACTION_OPEN_FILES = "com.android.bluetooth.action.TransferHistory";
+    @VisibleForTesting
+    static final String EXTRA_SHOW_ALL_FILES = "android.btopp.intent.extra.SHOW_ALL";
+    @VisibleForTesting
+    static final String EXTRA_DIRECTION = "direction";
+
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+
+    public BluetoothFilesPreferenceController(Context context) {
+        super(context);
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_RECEIVED_FILES;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_RECEIVED_FILES.equals(preference.getKey())) {
+            mMetricsFeatureProvider.action(mContext,
+                    MetricsProto.MetricsEvent.ACTION_BLUETOOTH_FILES);
+            Intent intent = new Intent(ACTION_OPEN_FILES);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            intent.putExtra(EXTRA_DIRECTION, 1 /* DIRECTION_INBOUND */);
+            intent.putExtra(EXTRA_SHOW_ALL_FILES, true);
+            mContext.startActivity(intent);
+            return true;
+        }
+
+        return false;
+    }
+
+
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceController.java
index 508d6c95589275343c034d5f452385b2255e75cb..4d5692fdefde445c06546925c2e38c7c47447814 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 @@ public class BluetoothMasterSwitchPreferenceController extends PreferenceControl
     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,20 @@ public class BluetoothMasterSwitchPreferenceController extends PreferenceControl
         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())) {
+            mActivity.startPreferencePanelAsUser(mFragment, BluetoothSettings.class.getName(), null,
+                    R.string.bluetooth, null, new UserHandle(UserHandle.myUserId()));
+            return true;
+        }
+        return super.handlePreferenceTreeClick(preference);
     }
 
     @Override
@@ -79,6 +102,7 @@ public class BluetoothMasterSwitchPreferenceController extends PreferenceControl
         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 5a3bc36b325193ea26d48b35347b5f8d0867cfe8..25413fa6db5565bd7a538efdb1a4759f6ec079f8 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -18,19 +18,14 @@ package com.android.settings.bluetooth;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
-import android.bluetooth.BluetoothAdapter;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputFilter;
+import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,25 +35,19 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
 /**
- * Dialog fragment for renaming the local Bluetooth device.
+ * Dialog fragment for renaming a Bluetooth device.
  */
-public final class BluetoothNameDialogFragment extends InstrumentedDialogFragment
+abstract class BluetoothNameDialogFragment extends InstrumentedDialogFragment
         implements TextWatcher {
     private static final int BLUETOOTH_NAME_MAX_LENGTH_BYTES = 248;
 
     private AlertDialog mAlertDialog;
     private Button mOkButton;
 
-    // accessed from inner class (not private to avoid thunks)
-    static final String TAG = "BluetoothNameDialogFragment";
-    final LocalBluetoothAdapter mLocalAdapter;
     EditText mDeviceNameView;
 
     // This flag is set when the name is updated by code, to distinguish from user changes
@@ -71,60 +60,43 @@ public final class BluetoothNameDialogFragment extends InstrumentedDialogFragmen
     private static final String KEY_NAME = "device_name";
     private static final String KEY_NAME_EDITED = "device_name_edited";
 
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String action = intent.getAction();
-            if (action.equals(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED)) {
-                updateDeviceName();
-            } else if (action.equals(BluetoothAdapter.ACTION_STATE_CHANGED) &&
-                    (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR) ==
-                            BluetoothAdapter.STATE_ON)) {
-                updateDeviceName();
-            }
-        }
-    };
+    /**
+     * @return the title to use for the dialog.
+     */
+    abstract protected int getDialogTitle();
 
-    public BluetoothNameDialogFragment() {
-        LocalBluetoothManager localManager = Utils.getLocalBtManager(getActivity());
-        mLocalAdapter = localManager.getBluetoothAdapter();
-    }
+    /**
+     * @return the current name used for this device.
+     */
+    abstract protected String getDeviceName();
 
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_RENAME;
-    }
+    /**
+     * Set the device to the given name.
+     * @param deviceName the name to use
+     */
+    abstract protected void setDeviceName(String deviceName);
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        String deviceName = mLocalAdapter.getName();
+        String deviceName = getDeviceName();
         if (savedInstanceState != null) {
             deviceName = savedInstanceState.getString(KEY_NAME, deviceName);
             mDeviceNameEdited = savedInstanceState.getBoolean(KEY_NAME_EDITED, false);
         }
-        mAlertDialog = new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.bluetooth_rename_device)
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                .setTitle(getDialogTitle())
                 .setView(createDialogView(deviceName))
-                .setPositiveButton(R.string.bluetooth_rename_button,
-                        new DialogInterface.OnClickListener() {
-                            public void onClick(DialogInterface dialog, int which) {
-                                String deviceName = mDeviceNameView.getText().toString();
-                                setDeviceName(deviceName);
-                            }
-                        })
-                .setNegativeButton(android.R.string.cancel, null)
-                .create();
+                .setPositiveButton(R.string.bluetooth_rename_button, (dialog, which) -> {
+                    setDeviceName(mDeviceNameView.getText().toString());
+                })
+                .setNegativeButton(android.R.string.cancel, null);
+        mAlertDialog = builder.create();
         mAlertDialog.getWindow().setSoftInputMode(
                 WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 
         return mAlertDialog;
     }
 
-    private void setDeviceName(String deviceName) {
-        Log.d(TAG, "Setting device name to " + deviceName);
-        mLocalAdapter.setName(deviceName);
-    }
-
     @Override
     public void onSaveInstanceState(Bundle outState) {
         outState.putString(KEY_NAME, mDeviceNameView.getText().toString());
@@ -140,6 +112,9 @@ public final class BluetoothNameDialogFragment extends InstrumentedDialogFragmen
                 new Utf8ByteLengthFilter(BLUETOOTH_NAME_MAX_LENGTH_BYTES)
         });
         mDeviceNameView.setText(deviceName);    // set initial value before adding listener
+        if (!TextUtils.isEmpty(deviceName)) {
+            mDeviceNameView.setSelection(deviceName.length());
+        }
         mDeviceNameView.addTextChangedListener(this);
         mDeviceNameView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -171,23 +146,14 @@ public final class BluetoothNameDialogFragment extends InstrumentedDialogFragmen
             mOkButton = mAlertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
             mOkButton.setEnabled(mDeviceNameEdited);    // Ok button enabled after user edits
         }
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-        filter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
-        getActivity().registerReceiver(mReceiver, filter);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getActivity().unregisterReceiver(mReceiver);
     }
 
     void updateDeviceName() {
-        if (mLocalAdapter != null && mLocalAdapter.isEnabled()) {
+        String name = getDeviceName();
+        if (name != null) {
             mDeviceNameUpdated = true;
             mDeviceNameEdited = false;
-            mDeviceNameView.setText(mLocalAdapter.getName());
+            mDeviceNameView.setText(name);
         }
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
new file mode 100644
index 0000000000000000000000000000000000000000..fee37d07e2b54cdd945a943efb86e77d4f5f0292
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+    @VisibleForTesting
+    AlwaysDiscoverable mAlwaysDiscoverable;
+
+    private boolean mInitialScanStarted;
+
+    public BluetoothPairingDetail() {
+        super(DISALLOW_CONFIG_BLUETOOTH);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mInitialScanStarted = false;
+        mAlwaysDiscoverable = new AlwaysDiscoverable(getContext(), mLocalAdapter);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        updateContent(mLocalAdapter.getBluetoothState());
+        mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+
+        // Make the device only visible to connected devices.
+        mAlwaysDiscoverable.stop();
+        disableScanning();
+    }
+
+    @Override
+    void initPreferencesFromPreferenceScreen() {
+        mAvailableDevicesCategory = (BluetoothProgressCategory) findPreference(KEY_AVAIL_DEVICES);
+        mFooterPreference = (FooterPreference) findPreference(KEY_FOOTER_PREF);
+        mFooterPreference.setSelectable(false);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.BLUETOOTH_PAIRING;
+    }
+
+    @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);
+                mAlwaysDiscoverable.start();
+                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,
+                getLifecycle());
+        controllers.add(mDeviceNamePrefController);
+
+        return controllers;
+    }
+
+    @Override
+    public String getDeviceListKey() {
+        return KEY_AVAIL_DEVICES;
+    }
+
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index 7b8fc6c83870629e34c0ceb277d87c892a9bd43b..f95ce46d51ce03ae795204ec92a63f81271b6f59 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -17,6 +17,7 @@ package com.android.settings.bluetooth;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
@@ -27,10 +28,12 @@ import android.text.InputType;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -192,7 +195,16 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i
         mBuilder.setPositiveButton(getString(android.R.string.ok), this);
         mBuilder.setNegativeButton(getString(android.R.string.cancel), this);
         AlertDialog dialog = mBuilder.create();
-        dialog.setOnShowListener(d -> mDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(false));
+        dialog.setOnShowListener(d -> {
+            mDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(false);
+            if (mPairingView != null && mPairingView.requestFocus()) {
+                InputMethodManager imm = (InputMethodManager)
+                        getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                if (imm != null) {
+                    imm.showSoftInput(mPairingView, InputMethodManager.SHOW_IMPLICIT);
+                }
+            }
+        });
         return dialog;
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..ab99aad73c1418891d5cfeeb93fe227680b4aefc
--- /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 dfa97f03cefdb2617ecd6772fba791ce4df4b383..a0c805c702c17a935bf3ca24c53f57fbd6ee84c6 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -17,27 +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;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
@@ -45,23 +39,27 @@ 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.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.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+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;
@@ -70,73 +68,36 @@ import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
  * 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 PAIRED_DEVICE_ORDER = 1;
+    private static final int PAIRING_PREF_ORDER = 2;
 
-    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 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;
+    @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 AlwaysDiscoverable mAlwaysDiscoverable;
 
     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);
-        mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
     }
 
     @Override
@@ -147,16 +108,17 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
     @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();
+        if (mLocalAdapter != null) {
+            mAlwaysDiscoverable = new AlwaysDiscoverable(getContext(), mLocalAdapter);
+        }
     }
 
     @Override
@@ -167,23 +129,11 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
     }
 
     @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 +144,14 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
             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());
         }
@@ -221,167 +166,47 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
         }
 
         // Make the device only visible to connected devices.
-        mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
-
-        if (isUiRestricted()) {
-            return;
+        if (mAlwaysDiscoverable != null) {
+            mAlwaysDiscoverable.stop();
         }
 
-        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_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);
-    }
-
-    @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);
-                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);
+    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);
+                mPairedDevicesCategory.addPreference(mPairingPreference);
+                updateFooterPreference(mFooterPreference);
 
-                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())));
-
-                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;
+                if (mAlwaysDiscoverable != null) {
+                    mAlwaysDiscoverable.start();
                 }
                 return; // not break
 
             case BluetoothAdapter.STATE_TURNING_OFF:
                 messageId = R.string.bluetooth_turning_off;
+                mLocalAdapter.stopScanning();
                 break;
 
             case BluetoothAdapter.STATE_OFF:
@@ -393,18 +218,13 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
 
             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);
         }
-        if (!isUiRestricted()) {
-            getActivity().invalidateOptionsMenu();
-        }
     }
 
     private void setOffMessage() {
@@ -437,34 +257,26 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
                 }
             });
         }
-        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);
     }
 
-    @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());
     }
 
@@ -473,11 +285,16 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
         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)) {
@@ -491,12 +308,27 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
             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());
+            final SettingsActivity activity =
+                    (SettingsActivity) BluetoothSettings.this.getActivity();
+            activity.startPreferencePanel(this,
+                    BluetoothDeviceDetailsFragment.class.getName(), args,
+                    R.string.device_details_title, null, null, 0);
+        }
     };
 
     /**
@@ -506,6 +338,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
      */
     @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
@@ -518,6 +351,31 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
         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) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        final Lifecycle lifecycle = getLifecycle();
+        mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context, lifecycle);
+        mPairingPrefController = new BluetoothPairingPreferenceController(context, this,
+                (SettingsActivity) getActivity());
+        controllers.add(mDeviceNamePrefController);
+        controllers.add(mPairingPrefController);
+        controllers.add(new BluetoothFilesPreferenceController(context));
+        controllers.add(new BluetoothDeviceRenamePreferenceController(context, this, lifecycle));
+
+        return controllers;
+    }
+
     @VisibleForTesting
     static class SummaryProvider implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {
 
@@ -576,23 +434,18 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
                     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/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
index 5a2dcb2a787355740acbfab480dfe50d4bb0145d..7d2cc181897be004cb7137df275c5bc2cc60322b 100644
--- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
@@ -20,7 +20,7 @@ import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.support.annotation.VisibleForTesting;
-import android.text.TextUtils;
+import android.util.Log;
 
 import com.android.settings.R;
 import com.android.settings.widget.SummaryUpdater;
@@ -29,9 +29,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -39,6 +37,7 @@ import java.util.Set;
  * bluetooth summary info.
  */
 public final class BluetoothSummaryUpdater extends SummaryUpdater implements BluetoothCallback {
+    private static final String TAG = "BluetoothSummaryUpdater";
 
     private final LocalBluetoothManager mBluetoothManager;
     private final LocalBluetoothAdapter mBluetoothAdapter;
@@ -58,6 +57,9 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu
     public void onBluetoothStateChanged(int bluetoothState) {
         mEnabled = bluetoothState == BluetoothAdapter.STATE_ON
             || bluetoothState == BluetoothAdapter.STATE_TURNING_ON;
+        if (!mEnabled) {
+            mConnectionState = BluetoothAdapter.STATE_DISCONNECTED;
+        }
         notifyChangeIfNeeded();
     }
 
@@ -161,7 +163,6 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu
         if (devices == null || devices.isEmpty()) {
             return null;
         }
-
         for (BluetoothDevice device : devices) {
             if (device.isConnected()) {
                 deviceName = device.getName();
@@ -171,7 +172,14 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu
                 }
             }
         }
-
+        if (deviceName == null) {
+            Log.w(TAG, "getConnectedDeviceSummary, deviceName is null, numBondedDevices="
+                    + devices.size());
+            for (BluetoothDevice device : devices) {
+                Log.w(TAG, "getConnectedDeviceSummary, device=" + device.getName() + "["
+                        + device.getAddress() + "]" + ", isConnected=" + device.isConnected());
+            }
+        }
         return count > 1 ? mContext.getString(R.string.bluetooth_connected_multiple_devices_summary)
                 : mContext.getString(R.string.bluetooth_connected_summary, deviceName);
     }
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index c1321639d627273ba29650bbc2c1cc94f7d55471..ca06e3c306d83beca844645d6279772af87b2959 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -19,12 +19,15 @@ package com.android.settings.bluetooth;
 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 @@ import java.util.WeakHashMap;
  * @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 @@ public abstract class DeviceListPreferenceFragment extends
         }
         mLocalAdapter = mLocalManager.getBluetoothAdapter();
 
-        addPreferencesForActivity();
-
-        mDeviceListGroup = (PreferenceCategory) findPreference(KEY_BT_DEVICE_LIST);
-    }
+        initPreferencesFromPreferenceScreen();
 
-    void setDeviceListGroup(PreferenceGroup preferenceGroup) {
-        mDeviceListGroup = preferenceGroup;
+        mDeviceListGroup = (PreferenceCategory) findPreference(getDeviceListKey());
     }
 
-    /** 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 @@ public abstract class DeviceListPreferenceFragment extends
 
         mLocalManager.setForegroundActivity(getActivity());
         mLocalManager.getEventManager().registerCallback(this);
-
-        updateProgressUi(mLocalAdapter.isDiscovering());
     }
 
     @Override
@@ -121,7 +122,6 @@ public abstract class DeviceListPreferenceFragment extends
     }
 
     void removeAllDevices() {
-        mLocalAdapter.stopScanning();
         mDevicePreferenceMap.clear();
         mDeviceListGroup.removeAll();
     }
@@ -156,6 +156,7 @@ public abstract class DeviceListPreferenceFragment extends
         btPreference.onClicked();
     }
 
+    @Override
     public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
         if (mDevicePreferenceMap.get(cachedDevice) != null) {
             return;
@@ -201,6 +202,16 @@ public abstract class DeviceListPreferenceFragment extends
         // 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 @@ public abstract class DeviceListPreferenceFragment extends
         }
     }
 
-    public void onScanningStateChanged(boolean started) {
-        updateProgressUi(started);
+    @VisibleForTesting
+    void enableScanning() {
+        // LocalBluetoothAdapter already handles repeated scan requests
+        mLocalAdapter.startScanning(true);
+        mScanEnabled = true;
+    }
+
+    @VisibleForTesting
+    void disableScanning() {
+        mLocalAdapter.stopScanning();
+        mScanEnabled = false;
     }
 
-    private void updateProgressUi(boolean start) {
-        if (mDeviceListGroup instanceof BluetoothProgressCategory) {
-            ((BluetoothProgressCategory) mDeviceListGroup).setProgress(start);
+    @Override
+    public void onScanningStateChanged(boolean started) {
+        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/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 39aca14139f2d8c4db8c84c622ff5e562b5f8581..4af373263578b12d654e267b2cc1184818f8edce 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -23,62 +23,55 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
 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. */);
-    }
+    @VisibleForTesting
+    BluetoothProgressCategory mAvailableDevicesCategory;
 
     private boolean mNeedAuth;
     private String mLaunchPackage;
     private String mLaunchClass;
-    private boolean mStartScanOnStart;
+    private boolean mScanAllowed;
 
-    @Override
-    void addPreferencesForActivity() {
-        addPreferencesFromResource(R.xml.device_picker);
+    public DevicePickerFragment() {
+        super(null /* Not tied to any user restrictions. */);
+    }
 
+    @Override
+    void initPreferencesFromPreferenceScreen() {
         Intent intent = getActivity().getIntent();
         mNeedAuth = intent.getBooleanExtra(BluetoothDevicePicker.EXTRA_NEED_AUTH, false);
         setFilter(intent.getIntExtra(BluetoothDevicePicker.EXTRA_FILTER_TYPE,
                 BluetoothDevicePicker.FILTER_TYPE_ALL));
         mLaunchPackage = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_PACKAGE);
         mLaunchClass = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_CLASS);
+        mAvailableDevicesCategory = (BluetoothProgressCategory) findPreference(KEY_BT_DEVICE_LIST);
     }
 
     @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 +82,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
         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);
     }
 
@@ -99,12 +91,19 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
         super.onStart();
         addCachedDevices();
         mSelectedDevice = null;
-        if (mStartScanOnStart) {
-            mLocalAdapter.startScanning(true);
-            mStartScanOnStart = false;
+        if (mScanAllowed) {
+            enableScanning();
+            mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
         }
     }
 
+    @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();
@@ -118,7 +117,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
 
     @Override
     void onDevicePreferenceClick(BluetoothDevicePreference btPreference) {
-        mLocalAdapter.stopScanning();
+        disableScanning();
         LocalBluetoothPreferences.persistSelectedDeviceInPicker(
                 getActivity(), mSelectedDevice.getAddress());
         if ((btPreference.getCachedDevice().getBondState() ==
@@ -130,14 +129,24 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
         }
     }
 
+    @Override
+    public void onScanningStateChanged(boolean started) {
+        super.onScanningStateChanged(started);
+        started |= mScanEnabled;
+        mAvailableDevicesCategory.setProgress(started);
+    }
+
     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();
         }
     }
 
@@ -146,10 +155,30 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
         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/ForgetDeviceDialogFragment.java b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..1f3a689da66df387a34d98e70116467004337edd
--- /dev/null
+++ b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.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.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+/** Implements an AlertDialog for confirming that a user wishes to unpair or "forget" a paired
+ *  device*/
+public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment {
+    public static final String TAG = "ForgetBluetoothDevice";
+    private static final String KEY_DEVICE_ADDRESS = "device_address";
+
+    private CachedBluetoothDevice mDevice;
+
+    public static ForgetDeviceDialogFragment newInstance(String deviceAddress) {
+        Bundle args = new Bundle(1);
+        args.putString(KEY_DEVICE_ADDRESS, deviceAddress);
+        ForgetDeviceDialogFragment dialog = new ForgetDeviceDialogFragment();
+        dialog.setArguments(args);
+        return dialog;
+    }
+
+    @VisibleForTesting
+    CachedBluetoothDevice getDevice(Context context) {
+        String deviceAddress = getArguments().getString(KEY_DEVICE_ADDRESS);
+        LocalBluetoothManager manager = Utils.getLocalBtManager(context);
+        BluetoothDevice device = manager.getBluetoothAdapter().getRemoteDevice(deviceAddress);
+        return manager.getCachedDeviceManager().findDevice(device);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_PAIRED_DEVICE_FORGET;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle inState) {
+        DialogInterface.OnClickListener onConfirm = (dialog, which) -> {
+            mDevice.unpair();
+            Activity activity = getActivity();
+            if (activity != null) {
+                activity.finish();
+            }
+        };
+        Context context = getContext();
+        mDevice = getDevice(context);
+        AlertDialog dialog = new AlertDialog.Builder(context)
+                .setPositiveButton(R.string.bluetooth_unpair_dialog_forget_confirm_button,
+                        onConfirm)
+                .setNegativeButton(android.R.string.cancel, null)
+                .create();
+        dialog.setTitle(R.string.bluetooth_unpair_dialog_title);
+        dialog.setMessage(context.getString(R.string.bluetooth_unpair_dialog_body,
+                mDevice.getName()));
+        return dialog;
+    }
+}
diff --git a/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java b/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..029b974d20104d7b0edf6fc503419afaf932e5e9
--- /dev/null
+++ b/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragment.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.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+/** Provides a dialog for changing the advertised name of the local bluetooth adapter. */
+public class LocalDeviceNameDialogFragment extends BluetoothNameDialogFragment {
+    public static final String TAG = "LocalAdapterName";
+    private LocalBluetoothAdapter mLocalAdapter;
+
+    public static LocalDeviceNameDialogFragment newInstance() {
+        return new LocalDeviceNameDialogFragment();
+    }
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED.equals(action) ||
+                    (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action) &&
+                            intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)
+                                    == BluetoothAdapter.STATE_ON)) {
+                updateDeviceName();
+            }
+        }
+    };
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LocalBluetoothManager localManager = Utils.getLocalBtManager(getActivity());
+        mLocalAdapter = localManager.getBluetoothAdapter();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+        filter.addAction(BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED);
+        getActivity().registerReceiver(mReceiver, filter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mReceiver);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_RENAME;
+    }
+
+    @Override
+    protected int getDialogTitle() {
+        return R.string.bluetooth_rename_device;
+    }
+
+    @Override
+    protected String getDeviceName() {
+        if (mLocalAdapter != null && mLocalAdapter.isEnabled()) {
+            return mLocalAdapter.getName();
+        }
+        return null;
+    }
+
+    @Override
+    protected void setDeviceName(String deviceName) {
+        mLocalAdapter.setName(deviceName);
+    }
+}
diff --git a/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..4e5acefe6162c9814f5328ccadb314bd55df37a8
--- /dev/null
+++ b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.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.bluetooth;
+
+import android.bluetooth.BluetoothDevice;
+import android.content.Context;
+import android.os.Bundle;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+/** Provides a dialog for changing the display name of a remote bluetooth device. */
+public class RemoteDeviceNameDialogFragment extends BluetoothNameDialogFragment {
+    public static final String TAG = "RemoteDeviceName";
+    private static final String KEY_CACHED_DEVICE_ADDRESS = "cached_device";
+
+    private CachedBluetoothDevice mDevice;
+
+    public static RemoteDeviceNameDialogFragment newInstance(CachedBluetoothDevice device) {
+        Bundle args = new Bundle(1);
+        args.putString(KEY_CACHED_DEVICE_ADDRESS, device.getDevice().getAddress());
+        RemoteDeviceNameDialogFragment fragment = new RemoteDeviceNameDialogFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @VisibleForTesting
+    CachedBluetoothDevice getDevice(Context context) {
+        String deviceAddress = getArguments().getString(KEY_CACHED_DEVICE_ADDRESS);
+        LocalBluetoothManager manager = Utils.getLocalBtManager(context);
+        BluetoothDevice device = manager.getBluetoothAdapter().getRemoteDevice(deviceAddress);
+        return manager.getCachedDeviceManager().findDevice(device);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mDevice = getDevice(context);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DIALOG_BLUETOOTH_PAIRED_DEVICE_RENAME;
+    }
+
+    @Override
+    protected int getDialogTitle() {
+        return R.string.bluetooth_device_name;
+    }
+
+    @Override
+    protected String getDeviceName() {
+        if (mDevice != null) {
+            return mDevice.getName();
+        }
+        return null;
+    }
+
+    @Override
+    protected void setDeviceName(String deviceName) {
+        if (mDevice != null) {
+            mDevice.setName(deviceName);
+        }
+    }
+}
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
index eb194f4443b0a445767b81a4d24c465d17c6c7d8..26edd84d2e2455e2e2c0de268090d24a80e68f56 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 @@ public final class Utils {
             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_settings_print,
+                            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 6a1c06c576c594e2730a82810ea2df31b30b21b9..52028b3e5da4f442978b92f77df07be697ac9b45 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;
@@ -50,6 +54,11 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
         return TAG;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_connected_devices;
+    }
+
     @Override
     protected int getPreferenceScreenResId() {
         return R.xml.connected_devices;
@@ -67,13 +76,51 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
         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 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
 
                 @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 a98f06893dbced79bf1ac19da0caa5883f5d3ccd..9c9ed1265cc02cbf01391b4236b09cbf5684fa8b 100644
--- a/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/UsbModePreferenceController.java
@@ -26,10 +26,10 @@ import android.support.v7.preference.PreferenceScreen;
 
 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 8d98b50b9412755e3700519b9777e254996523ae..df6ccd31ab607453710baca07d3e370403bcf92d 100644
--- a/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
+++ b/src/com/android/settings/core/DynamicAvailabilityPreferenceController.java
@@ -20,9 +20,9 @@ import android.content.Context;
 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 891af5d0059f6af180b4ec4e3aeab37e9d5e29ce..9b24756b19edbb9ff39b74efaf8cd67fff968387 100644
--- a/src/com/android/settings/core/InstrumentedActivity.java
+++ b/src/com/android/settings/core/InstrumentedActivity.java
@@ -18,7 +18,7 @@ package com.android.settings.core;
 
 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 303d4d8498ab350c7b78191eb1502a909245241b..188dbde07822e7b6a29cb66e8ab53cb211dc2a2d 100644
--- a/src/com/android/settings/core/InstrumentedFragment.java
+++ b/src/com/android/settings/core/InstrumentedFragment.java
@@ -21,9 +21,9 @@ import android.content.Context;
 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 @@ public abstract class InstrumentedFragment extends ObservableFragment implements
         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 746c10d482b15b82e949b247e31d48d53c2648c8..bfb69e78a3bfc978d25f3fe07edf2f57239c9da9 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -22,9 +22,9 @@ import android.os.Bundle;
 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 002240da8c6c4153b228dfc9e1adb6cfe7c5296d..2b3a7ab37170dd848c9213e70580c176b8922e7a 100644
--- a/src/com/android/settings/core/PreferenceController.java
+++ b/src/com/android/settings/core/PreferenceController.java
@@ -18,7 +18,7 @@ package com.android.settings.core;
 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 e78e0248401084fb92499f24329e936c9439c4c1..53bd0beb228d16590f3acb55475805f15fd05b0d 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -18,14 +18,11 @@ package com.android.settings.core.gateway;
 
 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.UsageAccessDetails;
 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,6 +73,7 @@ import com.android.settings.deviceinfo.Status;
 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;
@@ -108,10 +107,13 @@ import com.android.settings.notification.ZenModePrioritySettings;
 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;
@@ -244,6 +246,7 @@ public class SettingsGateway {
             EnterprisePrivacySettings.class.getName(),
             WebViewAppPicker.class.getName(),
             LockscreenDashboardFragment.class.getName(),
+            BluetoothDeviceDetailsFragment.class.getName(),
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -260,7 +263,7 @@ public class SettingsGateway {
             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 dd3c1ccee301c4e6fe3f6f70c4fd3a727e1f5b9f..5a9ab56ea993822bd1f25f9e64355cb7d20762cf 100644
--- a/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
+++ b/src/com/android/settings/core/instrumentation/InstrumentedDialogFragment.java
@@ -18,8 +18,8 @@ package com.android.settings.core.instrumentation;
 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 d1c7c7a33d1ea0283c548ddea5299b3933da278c..b4e61587ac2d8b8171865e63ef4a8580308bbb51 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.Context;
 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 @@ import java.util.concurrent.ConcurrentSkipListSet;
 
 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,12 +103,12 @@ public class SharedPreferencesLogger implements SharedPreferences {
             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) {
-        final String prefKey = mTag + "/" + key;
+    private void logValue(String key, Object value, boolean forceLog) {
+        final String prefKey = buildPrefKey(mTag, key);
         if (!forceLog && !mPreferenceKeySet.contains(prefKey)) {
             // Pref key doesn't exist in set, this is initial display so we skip metrics but
             // keeps track of this key.
@@ -112,26 +116,54 @@ public class SharedPreferencesLogger implements SharedPreferences {
             return;
         }
         // 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));
+        mMetricsFeature.count(mContext, buildCountName(prefKey, value), 1);
+
+        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) {
         new AsyncPackageCheck().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, key, value);
     }
 
+    public static String buildCountName(String prefKey, Object value) {
+        return prefKey + "|" + value;
+    }
+
+    public static String buildPrefKey(String tag, String key) {
+        return tag + "/" + key;
+    }
+
     private class AsyncPackageCheck extends AsyncTask<String, Void, Void> {
         @Override
         protected Void doInBackground(String... params) {
@@ -173,25 +205,25 @@ public class SharedPreferencesLogger implements SharedPreferences {
 
         @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 fcd32d1cb3b52415c3756f2f670fc1b2e05bbf81..8de35adfd79579a46ec2e24d8b6113481e323978 100644
--- a/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
+++ b/src/com/android/settings/core/instrumentation/VisibilityLoggerMixin.java
@@ -22,11 +22,11 @@ import android.content.Intent;
 
 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 ef236884a1f30bf327a6a71826634316b48e7353..0000000000000000000000000000000000000000
--- 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 1f88e853a1d297eadb8ff053fd97580eccdf55ab..0000000000000000000000000000000000000000
--- 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 006c9ae9a721910db3fcdbfd78ea0118dcb98da3..0000000000000000000000000000000000000000
--- 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 c3265dde0da87f9d99c22e53285dd0519adeae93..0000000000000000000000000000000000000000
--- 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 8dae7ead3cbccc564f347ea86528cb0c39d4d8c0..0000000000000000000000000000000000000000
--- 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 94a0be1b68c4185f14ccae60ea741e237f175e12..0000000000000000000000000000000000000000
--- 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 74fbe2f394f5f8d5bb9d984f2534c0f4798067d8..0000000000000000000000000000000000000000
--- 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 9c97cf5f239dd945a5846a400770ef4d3650d465..0000000000000000000000000000000000000000
--- 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/OnDestroy.java b/src/com/android/settings/core/lifecycle/events/OnDestroy.java
deleted file mode 100644
index 5499de8278262fae4413ad473226bc4609fb70c5..0000000000000000000000000000000000000000
--- 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 155af00ce332a4e5fa447adbcb617626371bbcd5..0000000000000000000000000000000000000000
--- 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/OnResume.java b/src/com/android/settings/core/lifecycle/events/OnResume.java
deleted file mode 100644
index 30ce42b15df2edee73323c2830d578ec133c0b56..0000000000000000000000000000000000000000
--- 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 fab4041f9a9f57bb8eb41cb68188f73ef003c754..0000000000000000000000000000000000000000
--- 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 3b4e6cc692848cfc826f53e9f61e0897d4747d89..0000000000000000000000000000000000000000
--- 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 8c19b87b173850743d85875b1e7e66029ddd4578..0000000000000000000000000000000000000000
--- 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 d206ed3cf38bd0a0517299856151b09439ca87f9..0000000000000000000000000000000000000000
--- 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 e3e95be7f33b803b36f4663b83871e00b6aeb5cb..70fd659c8d08ad346b9f1adcbac942c6445afad9 100644
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ b/src/com/android/settings/dashboard/DashboardAdapter.java
@@ -17,12 +17,15 @@ package com.android.settings.dashboard;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Resources;
 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,31 +34,42 @@ import android.view.LayoutInflater;
 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.SettingsActivity;
+import com.android.settings.R.id;
 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.ConditionAdapterUtils;
+import com.android.settings.dashboard.conditional.ConditionAdapter;
+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";
 
+    @VisibleForTesting
+    static final String STATE_SUGGESTION_CONDITION_MODE = "suggestion_condition_mode";
+    @VisibleForTesting
+    static final int SUGGESTION_CONDITION_HEADER_POSITION = 0;
+    @VisibleForTesting
+    static final int MAX_SUGGESTION_TO_SHOW = 5;
+
     private final IconCache mCache;
     private final Context mContext;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
@@ -63,6 +77,11 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
     private final SuggestionFeatureProvider mSuggestionFeatureProvider;
     private final ArrayList<String> mSuggestionsShownLogged;
     private boolean mFirstFrameDrawn;
+    private RecyclerView mRecyclerView;
+    private SuggestionParser mSuggestionParser;
+    private SuggestionAdapter mSuggestionAdapter;
+    private SuggestionDismissController mSuggestionDismissHandler;
+    private SuggestionDismissController.Callback mCallback;
 
     @VisibleForTesting
     DashboardData mDashboardData;
@@ -79,30 +98,21 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
 
         @Override
         public void onClick(View v) {
-            Condition expandedCondition = mDashboardData.getExpandedCondition();
-
+            Condition condition = (Condition) v.getTag();
             //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,
-                        MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND,
-                        expandedCondition.getMetricsConstant());
-
-                updateExpandedCondition(expandedCondition);
-            }
+            mMetricsFeatureProvider.action(mContext,
+                    MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
+                    condition.getMetricsConstant());
+            condition.onPrimaryClick();
         }
     };
 
     public DashboardAdapter(Context context, Bundle savedInstanceState,
-            List<Condition> conditions) {
+            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);
@@ -110,14 +120,16 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context);
         mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
         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);
-            suggestionMode = savedInstanceState.getInt(
-                    STATE_SUGGESTION_MODE, DashboardData.SUGGESTION_MODE_DEFAULT);
+            suggestionConditionMode = savedInstanceState.getInt(
+                STATE_SUGGESTION_CONDITION_MODE, suggestionConditionMode);
             mSuggestionsShownLogged = savedInstanceState.getStringArrayList(
                     STATE_SUGGESTIONS_SHOWN_LOGGED);
         } else {
@@ -128,7 +140,7 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
                 .setConditions(conditions)
                 .setSuggestions(suggestions)
                 .setCategories(categories)
-                .setSuggestionMode(suggestionMode)
+                .setSuggestionConditionMode(suggestionConditionMode)
                 .build();
     }
 
@@ -138,39 +150,44 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
 
     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 (!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 (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 (tile.isIconTintable) {
+                        // If this drawable is tintable, tint it to match the color.
+                        tile.icon.setTint(tintColor);
+                    }
+                }
+            }
+
+            for (Tile suggestion : suggestions) {
+                if (suggestion.isIconTintable) {
+                    suggestion.icon.setTint(tintColor);
                 }
             }
         }
 
         final DashboardData prevData = mDashboardData;
         mDashboardData = new DashboardData.Builder(prevData)
-                .setSuggestions(suggestions)
+                .setSuggestions(suggestions.subList(0,
+                        Math.min(suggestions.size(), MAX_SUGGESTION_TO_SHOW)))
                 .setCategories(categories)
                 .build();
         notifyDashboardDataChanged(prevData);
         List<Tile> shownSuggestions = null;
-        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;
+        final int mode = mDashboardData.getSuggestionConditionMode();
+        if (mode == DashboardData.HEADER_MODE_DEFAULT) {
+            shownSuggestions = suggestions.subList(0,
+                    Math.min(suggestions.size(), DashboardData.DEFAULT_SUGGESTION_COUNT));
+        } else if (mode != DashboardData.HEADER_MODE_COLLAPSED) {
+            shownSuggestions = suggestions;
         }
         if (shownSuggestions != null) {
             for (Tile suggestion : shownSuggestions) {
@@ -197,11 +214,28 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         Log.d(TAG, "adapter setConditions called");
         mDashboardData = new DashboardData.Builder(prevData)
                 .setConditions(conditions)
-                .setExpandedCondition(null)
                 .build();
         notifyDashboardDataChanged(prevData);
     }
 
+    public void onSuggestionDismissed(Tile suggestion) {
+        final List<Tile> suggestions = mDashboardData.getSuggestions();
+        if (suggestions == null || suggestions.isEmpty()) {
+            return;
+        }
+        if (suggestions.size() == 1) {
+            // The only suggestion is dismissed, and the the empty suggestion container will
+            // remain as the dashboard item. Need to refresh the dashboard list.
+            final DashboardData prevData = mDashboardData;
+            mDashboardData = new DashboardData.Builder(prevData)
+                    .setSuggestions(null)
+                    .build();
+            notifyDashboardDataChanged(prevData);
+        } else {
+            mSuggestionAdapter.removeSuggestion(suggestion);
+        }
+    }
+
     @Override
     public void notifySummaryChanged(Tile tile) {
         final int position = mDashboardData.getPositionByTile(tile);
@@ -214,8 +248,14 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
 
     @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
@@ -232,34 +272,26 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
                 holder.itemView.setTag(tile);
                 holder.itemView.setOnClickListener(mTileClickListener);
                 break;
-            case R.layout.suggestion_header:
-                onBindSuggestionHeader(holder, (DashboardData.SuggestionHeaderData)
-                        mDashboardData.getItemEntityByPosition(position));
+            case R.layout.suggestion_condition_container:
+                onBindConditionAndSuggestion(
+                    (SuggestionAndConditionContainerHolder) holder, position);
                 break;
-            case R.layout.suggestion_tile:
-                final Tile suggestion = (Tile) mDashboardData.getItemEntityByPosition(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);
-                }
-                onBindTile(holder, suggestion);
+            case R.layout.suggestion_condition_header:
+                onBindSuggestionConditionHeader((SuggestionAndConditionHeaderHolder) holder,
+                        (SuggestionConditionHeaderData)
+                                mDashboardData.getItemEntityByPosition(position));
+                break;
+            case R.layout.suggestion_condition_footer:
                 holder.itemView.setOnClickListener(v -> {
                     mMetricsFeatureProvider.action(mContext,
-                            MetricsEvent.ACTION_SETTINGS_SUGGESTION, suggestionId);
-                    ((SettingsActivity) mContext).startSuggestion(suggestion.intent);
+                            MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, false);
+                    DashboardData prevData = mDashboardData;
+                    mDashboardData = new DashboardData.Builder(prevData).setSuggestionConditionMode(
+                        DashboardData.HEADER_MODE_COLLAPSED).build();
+                    notifyDashboardDataChanged(prevData);
+                    mRecyclerView.scrollToPosition(SUGGESTION_CONDITION_HEADER_POSITION);
                 });
                 break;
-            case R.layout.condition_card:
-                final boolean isExpanded = mDashboardData.getItemEntityByPosition(position)
-                        == mDashboardData.getExpandedCondition();
-                ConditionAdapterUtils.bindViews(
-                        (Condition) mDashboardData.getItemEntityByPosition(position),
-                        holder, isExpanded, mConditionClickListener, v -> onExpandClick(v));
-                break;
         }
     }
 
@@ -278,6 +310,14 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         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,27 +333,16 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         mSuggestionsShownLogged.clear();
     }
 
-    public void onExpandClick(View v) {
-        Condition expandedCondition = mDashboardData.getExpandedCondition();
-        if (v.getTag() == expandedCondition) {
-            mMetricsFeatureProvider.action(mContext,
-                    MetricsEvent.ACTION_SETTINGS_CONDITION_COLLAPSE,
-                    expandedCondition.getMetricsConstant());
-            expandedCondition = null;
-        } else {
-            expandedCondition = (Condition) v.getTag();
-            mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND,
-                    expandedCondition.getMetricsConstant());
-        }
-
-        updateExpandedCondition(expandedCondition);
-    }
-
     public Object getItem(long itemId) {
         return mDashboardData.getItemEntityById(itemId);
     }
 
-    private void notifyDashboardDataChanged(DashboardData prevData) {
+    public Tile getSuggestion(int position) {
+        return mSuggestionAdapter.getSuggestion(position);
+    }
+
+    @VisibleForTesting
+    void notifyDashboardDataChanged(DashboardData prevData) {
         if (mFirstFrameDrawn && prevData != null) {
             final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DashboardData
                     .ItemsDataDiffCallback(prevData.getItemList(), mDashboardData.getItemList()));
@@ -324,94 +353,141 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         }
     }
 
-    private void updateExpandedCondition(Condition condition) {
-        final DashboardData prevData = mDashboardData;
-        mDashboardData = new DashboardData.Builder(prevData)
-                .setExpandedCondition(condition)
-                .build();
-        notifyDashboardDataChanged(prevData);
-    }
-
-    @Override
-    public Tile getSuggestionForPosition(int position) {
-        return (Tile) mDashboardData.getItemEntityByPosition(position);
-    }
-
-    @Override
-    public void onSuggestionDismissed(Tile suggestion) {
-        final List<Tile> suggestions = mDashboardData.getSuggestions();
-        if (suggestions == null) {
-            return;
+    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);
+            }
         }
-        suggestions.remove(suggestion);
-
-        final DashboardData prevData = mDashboardData;
-        mDashboardData = new DashboardData.Builder(prevData)
-                .setSuggestions(suggestions)
-                .build();
-        notifyDashboardDataChanged(prevData);
     }
 
     @VisibleForTesting
-    void onBindSuggestionHeader(final DashboardItemHolder holder, DashboardData
-            .SuggestionHeaderData data) {
-        final boolean moreSuggestions = data.hasMoreSuggestions;
-        final int undisplayedSuggestionCount = data.undisplayedSuggestionCount;
-
-        holder.icon.setImageResource(moreSuggestions ? R.drawable.ic_expand_more
-                : R.drawable.ic_expand_less);
-        holder.title.setText(mContext.getString(R.string.suggestions_title, data.suggestionSize));
-        String summaryContentDescription;
-        if (moreSuggestions) {
-            summaryContentDescription = mContext.getResources().getQuantityString(
-                    R.plurals.settings_suggestion_header_summary_hidden_items,
-                    undisplayedSuggestionCount, undisplayedSuggestionCount);
+    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 {
-            summaryContentDescription = mContext.getString(R.string.condition_expand_hide);
+            holder.icon.setVisibility(View.INVISIBLE);
+            holder.icons.setVisibility(View.INVISIBLE);
         }
-        holder.summary.setContentDescription(summaryContentDescription);
 
-        if (undisplayedSuggestionCount == 0) {
-            holder.summary.setText(null);
-        } else {
+        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.suggestions_summary, undisplayedSuggestionCount));
+                mContext.getString(R.string.condition_summary, data.conditionCount));
+        } else {
+            holder.summary.setText(null);
         }
+
+        final Resources res = mContext.getResources();
+        final int padding = res.getDimensionPixelOffset(
+                curMode == DashboardData.HEADER_MODE_COLLAPSED
+                        ? R.dimen.suggestion_condition_header_padding_collapsed
+                        : R.dimen.suggestion_condition_header_padding_expanded);
+        holder.itemView.setPadding(0, padding, 0, padding);
+
         holder.itemView.setOnClickListener(v -> {
-            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);
-                    }
-                }
-            } else {
-                suggestionMode = DashboardData.SUGGESTION_MODE_COLLAPSED;
+            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)
-                    .setSuggestionMode(suggestionMode)
-                    .build();
+                .setSuggestionConditionMode(nextMode).build();
             notifyDashboardDataChanged(prevData);
+            if (wasCollapsed) {
+                mRecyclerView.scrollToPosition(SUGGESTION_CONDITION_HEADER_POSITION);
+            }
         });
     }
 
+    @VisibleForTesting
+    void onBindConditionAndSuggestion(final SuggestionAndConditionContainerHolder holder,
+            int position) {
+        // If there is suggestions to show, it will be at position 0 as we don't show the suggestion
+        // header anymore.
+        final List<Tile> suggestions = mDashboardData.getSuggestions();
+        if (position == SUGGESTION_CONDITION_HEADER_POSITION
+                && suggestions != null && suggestions.size() > 0) {
+            mSuggestionAdapter = new SuggestionAdapter(mContext, (List<Tile>)
+                mDashboardData.getItemEntityByPosition(position), mSuggestionsShownLogged);
+            mSuggestionDismissHandler = new SuggestionDismissController(mContext,
+                holder.data, mSuggestionParser, mCallback);
+            holder.data.setAdapter(mSuggestionAdapter);
+        } else {
+            ConditionAdapter adapter = new ConditionAdapter(mContext,
+                (List<Condition>) mDashboardData.getItemEntityByPosition(position),
+                    mDashboardData.getSuggestionConditionMode());
+            adapter.addDismissHandling(holder.data);
+            holder.data.setAdapter(adapter);
+        }
+        holder.data.setLayoutManager(new LinearLayoutManager(mContext));
+    }
+
     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);
+        if (tile.remoteViews != null) {
+            final ViewGroup itemView = (ViewGroup) holder.itemView;
+            itemView.removeAllViews();
+            itemView.addView(tile.remoteViews.apply(itemView.getContext(), itemView));
         } else {
-            holder.summary.setVisibility(View.GONE);
+            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);
+            }
         }
     }
 
@@ -428,11 +504,28 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
         if (categories != null) {
             outState.putParcelableArrayList(STATE_CATEGORY_LIST, new ArrayList<>(categories));
         }
-        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 +555,25 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
             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 4e8c7a0e6c4a74caf104b36b6a38522583b9cb1c..8b04dfc732ec62e278bcf785e5159e60d6d09470 100644
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ b/src/com/android/settings/dashboard/DashboardData.java
@@ -16,7 +16,7 @@
 package com.android.settings.dashboard;
 
 import android.annotation.IntDef;
-import android.support.annotation.Nullable;
+import android.graphics.drawable.Icon;
 import android.support.v7.util.DiffUtil;
 import android.text.TextUtils;
 
@@ -29,7 +29,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Description about data list used in the DashboardAdapter. In the data list each item can be
@@ -38,31 +37,35 @@ import java.util.Objects;
  * ItemsData has inner class Item, which represents the Item in data list.
  */
 public class DashboardData {
-    public static final int SUGGESTION_MODE_DEFAULT = 0;
-    public static final int SUGGESTION_MODE_COLLAPSED = 1;
-    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_ITEMS = 2000;
-    private static final int NS_CONDITION = 3000;
+    private static final int NS_SUGGESTION_CONDITION = 3000;
 
     private final List<Item> mItems;
     private final List<DashboardCategory> mCategories;
     private final List<Condition> mConditions;
     private final List<Tile> mSuggestions;
-    private final int mSuggestionMode;
-    private final Condition mExpandedCondition;
+    private final @HeaderMode int mSuggestionConditionMode;
     private int mId;
 
     private DashboardData(Builder builder) {
         mCategories = builder.mCategories;
         mConditions = builder.mConditions;
         mSuggestions = builder.mSuggestions;
-        mSuggestionMode = builder.mSuggestionMode;
-        mExpandedCondition = builder.mExpandedCondition;
+        mSuggestionConditionMode = builder.mSuggestionConditionMode;
 
         mItems = new ArrayList<>();
         mId = 0;
@@ -111,12 +114,8 @@ public class DashboardData {
         return mSuggestions;
     }
 
-    public int getSuggestionMode() {
-        return mSuggestionMode;
-    }
-
-    public Condition getExpandedCondition() {
-        return mExpandedCondition;
+    public int getSuggestionConditionMode() {
+        return mSuggestionConditionMode;
     }
 
     /**
@@ -165,10 +164,10 @@ public class DashboardData {
     /**
      * Get the count of suggestions to display
      *
-     * The displayable count mainly depends on the {@link #mSuggestionMode}
+     * The displayable count mainly depends on the {@link #mSuggestionConditionMode}
      * and the size of suggestions list.
      *
-     * When in default mode, displayable count couldn't larger than
+     * When in default mode, displayable count couldn't be larger than
      * {@link #DEFAULT_SUGGESTION_COUNT}.
      *
      * When in expanded mode, display all the suggestions.
@@ -176,17 +175,20 @@ public class DashboardData {
      * @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 (mSuggestionConditionMode == HEADER_MODE_COLLAPSED) {
+            return 0;
+        }
+        if (mSuggestionConditionMode == HEADER_MODE_DEFAULT) {
+            return Math.min(DEFAULT_SUGGESTION_COUNT, suggestionSize);
+        }
+        return suggestionSize;
     }
 
     public boolean hasMoreSuggestions() {
-        return mSuggestionMode == SUGGESTION_MODE_COLLAPSED
-                || (mSuggestionMode == SUGGESTION_MODE_DEFAULT
-                && mSuggestions.size() > DEFAULT_SUGGESTION_COUNT);
+        return mSuggestionConditionMode == HEADER_MODE_COLLAPSED && mSuggestions.size() > 0
+                || mSuggestionConditionMode == HEADER_MODE_DEFAULT
+                && mSuggestions.size() > DEFAULT_SUGGESTION_COUNT;
     }
 
     private void resetCount() {
@@ -207,47 +209,65 @@ public class DashboardData {
      */
     private void countItem(Object object, int type, boolean add, int nameSpace) {
         if (add) {
-            mItems.add(new Item(object, type, mId + nameSpace, object == mExpandedCondition));
-        }
-        mId++;
-    }
-
-    /**
-     * A special count item method for just suggestions. Id is calculated using suggestion hash
-     * instead of the position of suggestion in list. This is a more stable id than countItem.
-     */
-    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(object, type, mId + nameSpace));
         }
         mId++;
     }
 
     /**
      * Build the mItems list using mConditions, mSuggestions, mCategories data
-     * and mIsShowingAll, mSuggestionMode flag.
+     * and mIsShowingAll, mSuggestionConditionMode 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);
-        }
+        final boolean hasSuggestions = sizeOf(mSuggestions) > 0;
+        final List<Condition> conditions = getConditionsToShow(mConditions);
+        final boolean hasConditions = sizeOf(conditions) > 0;
 
-        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,
-                NS_SPACER);
+        final List<Tile> suggestions = getSuggestionsToShow(mSuggestions);
+        final int hiddenSuggestion =
+                hasSuggestions ? sizeOf(mSuggestions) - sizeOf(suggestions) : 0;
 
         resetCount();
-        if (mSuggestions != null) {
-            int maxSuggestions = getDisplayableSuggestionCount();
-            for (int i = 0; i < mSuggestions.size(); i++) {
-                countSuggestion(mSuggestions.get(i), i < maxSuggestions);
-            }
-        }
+            /* Top suggestion/condition header. This will be present when there is any suggestion
+             * and the mode is collapsed, or it only has conditions and the mode is not fully
+             * expanded. */
+        countItem(new SuggestionConditionHeaderData(conditions, hiddenSuggestion),
+                R.layout.suggestion_condition_header,
+                        hasSuggestions && mSuggestionConditionMode == HEADER_MODE_COLLAPSED
+                        || !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,30 +280,43 @@ public class DashboardData {
         }
     }
 
-    private SuggestionHeaderData buildSuggestionHeaderData() {
-        SuggestionHeaderData data;
-        if (mSuggestions == null) {
-            data = new SuggestionHeaderData();
-        } else {
-            final boolean hasMoreSuggestions = hasMoreSuggestions();
-            final int suggestionSize = mSuggestions.size();
-            final int undisplayedSuggestionCount = suggestionSize - getDisplayableSuggestionCount();
-            data = new SuggestionHeaderData(hasMoreSuggestions, suggestionSize,
-                    undisplayedSuggestionCount);
+    private static int sizeOf(List<?> list) {
+        return list == null ? 0 : list.size();
+    }
+
+    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;
+    }
 
-        return data;
+    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 #mSuggestionConditionMode} have default value while others are not.
      */
     public static class Builder {
-        private int mSuggestionMode = SUGGESTION_MODE_DEFAULT;
-        private Condition mExpandedCondition = null;
+        private @HeaderMode int mSuggestionConditionMode = HEADER_MODE_DEFAULT;
 
         private List<DashboardCategory> mCategories;
         private List<Condition> mConditions;
@@ -296,8 +329,7 @@ public class DashboardData {
             mCategories = dashboardData.mCategories;
             mConditions = dashboardData.mConditions;
             mSuggestions = dashboardData.mSuggestions;
-            mSuggestionMode = dashboardData.mSuggestionMode;
-            mExpandedCondition = dashboardData.mExpandedCondition;
+            mSuggestionConditionMode = dashboardData.mSuggestionConditionMode;
         }
 
         public Builder setCategories(List<DashboardCategory> categories) {
@@ -315,13 +347,8 @@ public class DashboardData {
             return this;
         }
 
-        public Builder setSuggestionMode(int suggestionMode) {
-            this.mSuggestionMode = suggestionMode;
-            return this;
-        }
-
-        public Builder setExpandedCondition(Condition expandedCondition) {
-            this.mExpandedCondition = expandedCondition;
+        public Builder setSuggestionConditionMode(@HeaderMode int mode) {
+            this.mSuggestionConditionMode = mode;
             return this;
         }
 
@@ -363,14 +390,6 @@ public class DashboardData {
             return mOldItems.get(oldItemPosition).equals(mNewItems.get(newItemPosition));
         }
 
-        @Nullable
-        @Override
-        public Object getChangePayload(int oldItemPosition, int newItemPosition) {
-            if (mOldItems.get(oldItemPosition).type == Item.TYPE_CONDITION_CARD) {
-                return "condition"; // return anything but null to mark the payload
-            }
-            return null;
-        }
     }
 
     /**
@@ -380,13 +399,17 @@ public class DashboardData {
         // 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;
-        private static final int TYPE_SUGGESTION_HEADER = R.layout.suggestion_header;
-        private static final int TYPE_SUGGESTION_TILE = R.layout.suggestion_tile;
-        private static final int TYPE_CONDITION_CARD = R.layout.condition_card;
+        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;
+        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})
+        @IntDef({TYPE_DASHBOARD_CATEGORY, TYPE_DASHBOARD_TILE, TYPE_SUGGESTION_CONDITION_CONTAINER,
+                TYPE_SUGGESTION_CONDITION_HEADER, TYPE_SUGGESTION_CONDITION_FOOTER,
+                TYPE_DASHBOARD_SPACER})
         @Retention(RetentionPolicy.SOURCE)
         public @interface ItemTypes{}
 
@@ -408,17 +431,10 @@ public class DashboardData {
          */
         public final int id;
 
-        /**
-         * To store whether the condition is expanded, useless when {@link #type} is not
-         * {@link #TYPE_CONDITION_CARD}
-         */
-        public final boolean conditionExpanded;
-
-        public Item(Object entity, @ItemTypes int type, int id, boolean conditionExpanded) {
+        public Item(Object entity, @ItemTypes int type, int id) {
             this.entity = entity;
             this.type = type;
             this.id = id;
-            this.conditionExpanded = conditionExpanded;
         }
 
         /**
@@ -453,12 +469,6 @@ public class DashboardData {
                     // Only check title and summary for dashboard tile
                     return TextUtils.equals(localTile.title, targetTile.title)
                             && TextUtils.equals(localTile.summary, targetTile.summary);
-                case TYPE_CONDITION_CARD:
-                    // First check conditionExpanded for quick return
-                    if (conditionExpanded != targetItem.conditionExpanded) {
-                        return false;
-                    }
-                    // After that, go to default to do final check
                 default:
                     return entity == null ? targetItem.entity == null
                             : entity.equals(targetItem.entity);
@@ -467,42 +477,25 @@ public class DashboardData {
     }
 
     /**
-     * This class contains the data needed to build the header. The data can also be
-     * used to check the diff in DiffUtil.Callback
+     * 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 SuggestionHeaderData {
-        public final boolean hasMoreSuggestions;
-        public final int suggestionSize;
-        public final int undisplayedSuggestionCount;
-
-        public SuggestionHeaderData(boolean moreSuggestions, int suggestionSize, int
-                undisplayedSuggestionCount) {
-            this.hasMoreSuggestions = moreSuggestions;
-            this.suggestionSize = suggestionSize;
-            this.undisplayedSuggestionCount = undisplayedSuggestionCount;
-        }
-
-        public SuggestionHeaderData() {
-            hasMoreSuggestions = false;
-            suggestionSize = 0;
-            undisplayedSuggestionCount = 0;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-
-            if (!(obj instanceof SuggestionHeaderData)) {
-                return false;
+    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());
             }
-
-            SuggestionHeaderData targetData = (SuggestionHeaderData) obj;
-
-            return hasMoreSuggestions == targetData.hasMoreSuggestions
-                    && suggestionSize == targetData.suggestionSize
-                    && undisplayedSuggestionCount == targetData.undisplayedSuggestionCount;
         }
     }
 
diff --git a/src/com/android/settings/dashboard/DashboardDecorator.java b/src/com/android/settings/dashboard/DashboardDecorator.java
index 9bcf39db202651194acdee401784c83c3ad674b5..6466c0b4fec7d944a04adcfced502987eccac798 100644
--- a/src/com/android/settings/dashboard/DashboardDecorator.java
+++ b/src/com/android/settings/dashboard/DashboardDecorator.java
@@ -43,19 +43,14 @@ public class DashboardDecorator extends RecyclerView.ItemDecoration {
         for (int i = 1; i < childCount; i++) {
             final View child = parent.getChildAt(i);
             final ViewHolder holder = parent.getChildViewHolder(child);
-            if (holder.getItemViewType() == R.layout.dashboard_category) {
-                if (parent.getChildViewHolder(parent.getChildAt(i - 1)).getItemViewType()
-                        != R.layout.dashboard_tile) {
-                    continue;
-                }
-            } else if (holder.getItemViewType() != R.layout.condition_card) {
-                continue;
+            if (holder.getItemViewType() == R.layout.dashboard_category
+                    && parent.getChildViewHolder(parent.getChildAt(i - 1)).getItemViewType()
+                        == R.layout.dashboard_tile) {
+                int top = getChildTop(child);
+                mDivider.setBounds(child.getLeft(), top, child.getRight(),
+                        top + mDivider.getIntrinsicHeight());
+                mDivider.draw(c);
             }
-
-            int top = getChildTop(child);
-            mDivider.setBounds(child.getLeft(), top, child.getRight(),
-                    top + mDivider.getIntrinsicHeight());
-            mDivider.draw(c);
         }
     }
 
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
index 1c55bbbe82411715fd4916cc0db280580d895e35..15608a27bee957d3d76f0db6093229adb6685205 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -55,6 +55,11 @@ public interface DashboardFeatureProvider {
      */
     List<DashboardCategory> getAllCategories();
 
+    /**
+     * Whether or not we should tint icons in setting pages.
+     */
+    boolean shouldTintIcon();
+
     /**
      * Returns an unique string key for the tile.
      */
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 342888e24bf59f96aaffcdc05bec6ea1b63d93c5..88cf666429773999facbd38c1e959940bc2d4e88 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -97,6 +97,11 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider {
         return mCategoryManager.getCategories(mContext);
     }
 
+    @Override
+    public boolean shouldTintIcon() {
+        return mContext.getResources().getBoolean(R.bool.config_tintSettingIcon);
+    }
+
     @Override
     public String getDashboardKeyForTile(Tile tile) {
         if (tile == null || tile.intent == null) {
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index dddfb1bdf95814c07c7eb10e543c40e7d8f460df..f8525447b3ea9ee2a5c153ac8f1252f3692bbf43 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -32,6 +32,7 @@ import com.android.settings.language.LanguageAndInputSettings;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
+import com.android.settings.security.LockscreenDashboardFragment;
 import com.android.settings.system.SystemDashboardFragment;
 import com.android.settingslib.drawer.CategoryKey;
 
@@ -86,6 +87,8 @@ public class DashboardFragmentRegistry {
                 CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);
         PARENT_TO_CATEGORY_KEY_MAP.put(ConfigureNotificationSettings.class.getName(),
                 CategoryKey.CATEGORY_NOTIFICATIONS);
+        PARENT_TO_CATEGORY_KEY_MAP.put(LockscreenDashboardFragment.class.getName(),
+                CategoryKey.CATEGORY_SECURITY_LOCKSCREEN);
 
         CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());
 
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 67eae1e7d293af8f8d58c5a98ad09106f8a959ce..4a53a7cc17e8f2b591e7c3820491b6395c338242 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -32,31 +32,34 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
 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.settings.widget.ActionBarShadowController;
 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";
 
@@ -72,7 +75,6 @@ public class DashboardSummary extends InstrumentedFragment
     private DashboardFeatureProvider mDashboardFeatureProvider;
     private SuggestionFeatureProvider mSuggestionFeatureProvider;
     private boolean isOnCategoriesChangedCalled;
-    private SuggestionDismissController mSuggestionDismissHandler;
 
     @Override
     public int getMetricsCategory() {
@@ -94,7 +96,7 @@ public class DashboardSummary extends InstrumentedFragment
         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)
@@ -191,14 +193,14 @@ public class DashboardSummary extends InstrumentedFragment
         mDashboard.setHasFixedSize(true);
         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);
         mDashboard.setItemAnimator(new DashboardItemAnimator());
         mSummaryLoader.setSummaryConsumer(mAdapter);
-        ConditionAdapterUtils.addDismiss(mDashboard);
+        ActionBarShadowController.attachToRecyclerView(
+                getActivity().findViewById(R.id.search_bar_container), getLifecycle(), mDashboard);
+
         if (DEBUG_TIMING) {
             Log.d(TAG, "onViewCreated took "
                     + (System.currentTimeMillis() - startTime) + " ms");
@@ -236,13 +238,25 @@ public class DashboardSummary extends InstrumentedFragment
         }
     }
 
+    @Override
+    public Tile getSuggestionForPosition(int position) {
+        return mAdapter.getSuggestion(position);
+    }
+
+    @Override
+    public void onSuggestionDismissed(Tile suggestion) {
+        mAdapter.onSuggestionDismissed(suggestion);
+    }
+
     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 +269,12 @@ public class DashboardSummary extends InstrumentedFragment
             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 0cc3d1559370c00efe0a0417c62a92576fc9b276..92055be37647b8f412968ba400ad42c938901584 100644
--- a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
+++ b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
@@ -30,10 +30,10 @@ import com.android.internal.logging.nano.MetricsProto;
 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 0000000000000000000000000000000000000000..c2176d7206b9696ed5675fa06c10a03393310df3
--- /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 68424220a2d3bc96e898fc9f6d965dac6e1801e7..64d263f10e81d8aa0867f4bb03d1a182a9e92ea4 100644
--- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
+++ b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
@@ -44,7 +44,7 @@ public class CellularDataCondition extends Condition {
             setActive(false);
             return;
         }
-        setActive(!telephony.getDataEnabled());
+        setActive(!telephony.isDataEnabled());
     }
 
     @Override
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 0000000000000000000000000000000000000000..eb768e50d0eb304fe8d4f0c81cbdbc647426064c
--- /dev/null
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.annotation.VisibleForTesting;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+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;
+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 com.android.settingslib.WirelessUtils;
+
+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();
+        }
+    };
+
+    @VisibleForTesting
+    ItemTouchHelper.SimpleCallback mSwipeCallback = new ItemTouchHelper.SimpleCallback(0,
+            ItemTouchHelper.START | ItemTouchHelper.END) {
+        @Override
+        public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder,
+                RecyclerView.ViewHolder target) {
+            return true;
+        }
+
+        @Override
+        public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+            return viewHolder.getItemViewType() == R.layout.condition_tile
+                    ? super.getSwipeDirs(recyclerView, viewHolder) : 0;
+        }
+
+        @Override
+        public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+            Object item = getItem(viewHolder.getItemId());
+            // item can become null when running monkey
+            if (item != null) {
+                ((Condition) item).silence();
+            }
+        }
+    };
+
+    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) {
+        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;
+    }
+
+    @Override
+    public int getItemCount() {
+        if (mMode == DashboardData.HEADER_MODE_FULLY_EXPANDED) {
+            return mConditions.size();
+        }
+        return 0;
+    }
+
+    public void addDismissHandling(final RecyclerView recyclerView) {
+        final ItemTouchHelper itemTouchHelper = new ItemTouchHelper(mSwipeCallback);
+        itemTouchHelper.attachToRecyclerView(recyclerView);
+    }
+
+    private 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 void setViewVisibility(View containerView, int viewId, boolean visible) {
+        View view = containerView.findViewById(viewId);
+        if (view != null) {
+            view.setVisibility(visible ? View.VISIBLE : View.GONE);
+        }
+    }
+}
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java b/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
deleted file mode 100644
index aebbf931c81fabeef05c3d276d9a7987319d0243..0000000000000000000000000000000000000000
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapterUtils.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardAdapter;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.WirelessUtils;
-
-public class ConditionAdapterUtils {
-    private static final String TAG = "ConditionAdapterUtils";
-
-    public static void addDismiss(final RecyclerView recyclerView) {
-        ItemTouchHelper.SimpleCallback callback = new ItemTouchHelper.SimpleCallback(0,
-                ItemTouchHelper.START | ItemTouchHelper.END) {
-            @Override
-            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder,
-                    RecyclerView.ViewHolder target) {
-                return true;
-            }
-
-            @Override
-            public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-                return viewHolder.getItemViewType() == R.layout.condition_card
-                        ? 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();
-                }
-            }
-        };
-        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(callback);
-        itemTouchHelper.attachToRecyclerView(recyclerView);
-    }
-
-    public static void bindViews(final Condition condition,
-            DashboardAdapter.DashboardItemHolder view, boolean isExpanded,
-            View.OnClickListener onClickListener, View.OnClickListener onExpandListener) {
-        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());
-        final View collapsedGroup = view.itemView.findViewById(R.id.collapsed_group);
-        collapsedGroup.setTag(condition);
-        final ImageView expand = (ImageView) view.itemView.findViewById(R.id.expand_indicator);
-        expand.setImageResource(isExpanded ? R.drawable.ic_expand_less : R.drawable.ic_expand_more);
-        expand.setContentDescription(expand.getContext().getString(isExpanded
-                ? R.string.condition_expand_hide : R.string.condition_expand_show));
-        collapsedGroup.setOnClickListener(onExpandListener);
-
-        View detailGroup = view.itemView.findViewById(R.id.detail_group);
-        CharSequence[] actions = condition.getActions();
-        if (isExpanded != (detailGroup.getVisibility() == View.VISIBLE)) {
-            if (isExpanded) {
-                final boolean hasButtons = actions.length > 0;
-                setViewVisibility(detailGroup, R.id.divider, hasButtons);
-                setViewVisibility(detailGroup, R.id.buttonBar, hasButtons);
-
-                detailGroup.setVisibility(View.VISIBLE);
-            } else {
-                detailGroup.setVisibility(View.GONE);
-            }
-        }
-
-        if (isExpanded) {
-            view.summary.setText(condition.getSummary());
-            for (int i = 0; i < 2; i++) {
-                Button button = (Button) detailGroup.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);
-                }
-            }
-        }
-    }
-
-    private static void setViewVisibility(View containerView, int viewId, boolean visible) {
-        View view = containerView.findViewById(viewId);
-        if (view != null) {
-            view.setVisibility(visible ? View.VISIBLE : View.GONE);
-        }
-    }
-}
diff --git a/src/com/android/settings/dashboard/conditional/ConditionManager.java b/src/com/android/settings/dashboard/conditional/ConditionManager.java
index f65908fd6c174635ff1e57869b3ce1e13e486be6..a60019a853c37085cc136bf7ee1093dde0b6e2dc 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.os.PersistableBundle;
 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;
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 0000000000000000000000000000000000000000..45396807f8764fa4138bdad81d165c487c6cfdd9
--- /dev/null
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.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) {
+        Tile suggestion = getSuggestion(position);
+        return suggestion.remoteViews != null
+                ? R.layout.suggestion_tile_remote_container
+                : R.layout.suggestion_tile;
+    }
+
+    @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;
+    }
+
+    public void removeSuggestion(Tile suggestion) {
+        mSuggestions.remove(suggestion);
+        notifyDataSetChanged();
+    }
+}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
index 708aadb8e7a21db6d87b5846b5a28a902089384f..100c955716baace00c7e8ca87244d7b21bb661ef 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -22,8 +22,8 @@ import android.support.v7.widget.helper.ItemTouchHelper;
 
 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,9 @@ public class SuggestionDismissController extends ItemTouchHelper.SimpleCallback
 
     @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_remote_container) {
             // 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 14f5e9ceb6282d594d535a77d7e4aa5e5bf324c7..5dc8892eca92a86a758f4e7ecff9c44c322c753c 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 @@ public interface SuggestionFeatureProvider {
      */
     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.
@@ -45,6 +50,11 @@ public interface SuggestionFeatureProvider {
      */
     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.
      */
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 779a8aaf34ade10f345e288264ee0976ae917b8f..2171c2a2d83236195654e95d8bf0c9d4caad66fa 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -16,19 +16,41 @@
 
 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.os.UserHandle;
+import android.provider.Settings;
+import android.support.annotation.NonNull;
+import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.Settings.AmbientDisplayPickupSuggestionActivity;
+import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
+import com.android.settings.Settings.DoubleTapPowerSuggestionActivity;
+import com.android.settings.Settings.DoubleTwistSuggestionActivity;
+import com.android.settings.Settings.SwipeToNotificationSuggestionActivity;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+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.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 +60,34 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
     }
 
     @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);
+        } else if (className.equals(DoubleTapPowerSuggestionActivity.class.getName())) {
+            return DoubleTapPowerPreferenceController
+                    .isSuggestionComplete(context, getSharedPrefs(context));
+        } else if (className.equals(DoubleTwistSuggestionActivity.class.getName())) {
+            return DoubleTwistPreferenceController
+                    .isSuggestionComplete(context, getSharedPrefs(context));
+        } else if (className.equals(AmbientDisplaySuggestionActivity.class.getName())) {
+            return DoubleTapScreenPreferenceController
+                    .isSuggestionComplete(context, getSharedPrefs(context));
+        } else if (className.equals(AmbientDisplayPickupSuggestionActivity.class.getName())) {
+            return PickupGesturePreferenceController
+                    .isSuggestionComplete(context, getSharedPrefs(context));
+        } else if (className.equals(SwipeToNotificationSuggestionActivity.class.getName())) {
+            return SwipeToNotificationPreferenceController
+                    .isSuggestionComplete(context, getSharedPrefs(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(
@@ -61,6 +101,17 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
         mSuggestionRanker.rankSuggestions(suggestions, suggestionIds);
     }
 
+    @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) {
@@ -78,12 +129,12 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
                 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/SuggestionRanker.java b/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java
index a7458bcf9a2c5207a8be9ade04ebdcda793d7597..14c4b1548eea0817843af0f85b93c848c1a96c40 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java
@@ -34,13 +34,13 @@ public class SuggestionRanker {
     // by training a binary classifier to detect the clicked items. The higher the obtained
     // relevance metric, the higher chance of getting clicked.
     private static final Map<String, Double> WEIGHTS = new HashMap<String, Double>() {{
-        put(SuggestionFeaturizer.FEATURE_IS_SHOWN, 4.07506758256);
-        put(SuggestionFeaturizer.FEATURE_IS_DISMISSED, 2.11535473578);
-        put(SuggestionFeaturizer.FEATURE_IS_CLICKED, 1.21885461304);
-        put(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN, 3.18832024515);
-        put(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED, 1.09902706645);
-        put(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED, 0.262631082877);
-        put(SuggestionFeaturizer.FEATURE_SHOWN_COUNT, -220.4361849);
+        put(SuggestionFeaturizer.FEATURE_IS_SHOWN, 5.05140842519);
+        put(SuggestionFeaturizer.FEATURE_IS_DISMISSED, 2.29641455171);
+        put(SuggestionFeaturizer.FEATURE_IS_CLICKED, -2.98812233623);
+        put(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN, 5.02807250202);
+        put(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED, 2.49589700842);
+        put(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED, -4.3377039948);
+        put(SuggestionFeaturizer.FEATURE_SHOWN_COUNT, -2.35993512546);
     }};
 
     private final SuggestionFeaturizer mSuggestionFeaturizer;
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java b/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
index bdd5c60606ed0114f4873ed838c759a66cd61c38..4bed89b644c62eda272499a9a96153371b453680 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionsChecks.java
@@ -16,28 +16,24 @@
 
 package com.android.settings.dashboard.suggestions;
 
-import android.app.AutomaticZenRule;
 import android.app.KeyguardManager;
-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.support.annotation.VisibleForTesting;
 
 import com.android.ims.ImsManager;
 import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
-import com.android.settings.Settings.FingerprintSuggestionActivity;
 import com.android.settings.Settings.ScreenLockSuggestionActivity;
 import com.android.settings.Settings.WifiCallingSuggestionActivity;
-import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
 import com.android.settings.Utils;
+import com.android.settings.fingerprint.FingerprintSuggestionActivity;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wallpaper.WallpaperSuggestionActivity;
 import com.android.settingslib.drawer.Tile;
 
-import java.util.Collection;
-
 /**
  * The Home of all stupidly dynamic Settings Suggestions checks.
  */
@@ -54,32 +50,30 @@ public class SuggestionsChecks {
     }
 
     public boolean isSuggestionComplete(Tile suggestion) {
-        String className = suggestion.intent.getComponent().getClassName();
-        if (className.equals(ZenModeAutomationSuggestionActivity.class.getName())) {
-            return hasEnabledZenAutoRules();
-        } else if (className.equals(WallpaperSuggestionActivity.class.getName())) {
+        ComponentName component = suggestion.intent.getComponent();
+        String className = component.getClassName();
+        if (className.equals(WallpaperSuggestionActivity.class.getName())) {
             return hasWallpaperSet();
         } else if (className.equals(WifiCallingSuggestionActivity.class.getName())) {
             return isWifiCallingUnavailableOrEnabled();
         } else if (className.equals(FingerprintSuggestionActivity.class.getName())) {
-            return isNotSingleFingerprintEnrolled() || !isFingerprintEnabled();
+            return !Utils.hasFingerprintHardware(mContext) || !isFingerprintEnabled()
+                    || isNotSingleFingerprintEnrolled();
         } else if (className.equals(ScreenLockSuggestionActivity.class.getName())) {
             return isDeviceSecured();
         } else if (className.equals(FingerprintEnrollSuggestionActivity.class.getName())) {
-            FingerprintManager manager = Utils.getFingerprintManagerOrNull(mContext);
-            if (manager == null || !isFingerprintEnabled()) {
+            final FingerprintManager manager = Utils.getFingerprintManagerOrNull(mContext);
+            if (manager == null || !isFingerprintEnabled()
+                    || !Utils.hasFingerprintHardware(mContext)) {
                 return true;
             }
             return manager.hasEnrolledFingerprints();
         }
 
-        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() {
@@ -101,17 +95,6 @@ public class SuggestionsChecks {
                 && ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext);
     }
 
-    private boolean hasEnabledZenAutoRules() {
-        Collection<AutomaticZenRule> zenRules =
-                NotificationManager.from(mContext).getAutomaticZenRules().values();
-        for (AutomaticZenRule rule : zenRules) {
-            if (rule.isEnabled()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     @VisibleForTesting
     boolean hasWallpaperSet() {
         return mWallpaperManager.getWallpaperId(WallpaperManager.FLAG_SYSTEM) > 0;
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index a3415255827f086cccba05dc38f412e58dfff525..d9643f254895f226539ab49c5b9f266c9f27bfbb 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.Intent;
 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,28 +30,30 @@ import android.net.TrafficStats;
 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 {
 
@@ -75,6 +74,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
     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;
@@ -103,6 +103,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        mPackageManagerWrapper = new PackageManagerWrapperImpl(getPackageManager());
         final Bundle args = getArguments();
 
         try {
@@ -146,11 +147,11 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
 
         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) {
                 }
@@ -321,22 +322,30 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
 
         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/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 115939c50708a30fbd3531b6f8dfee4913107036..61ca09fbe548151762eb04f39e323ac0bdc45642 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -101,7 +101,7 @@ public class BillingCycleSettings extends DataUsageBase implements
 
     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/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java
index 77460ef8f715df374f58e302a05a35c4024cb3ab..d24c092bf562dc6954db3c75639b8ef2c74b9473 100644
--- a/src/com/android/settings/datausage/CellDataPreference.java
+++ b/src/com/android/settings/datausage/CellDataPreference.java
@@ -36,10 +36,10 @@ import android.view.View;
 import android.widget.Checkable;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.CustomDialogPreference;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.CustomDialogPreference;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index f72d465e0dbb7ce3b6887e379e9e37dd7395c5f4..3c3a231f1677e810c1422252c2faabdac37ae42a 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.AttributeSet;
 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 @@ public class ChartDataUsagePreference extends Preference {
 
         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/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index 7c291c6cd476cdedbec279adcde4cae9a550e562..f37a3c306a10cdd753188a2eef8c8c85b8143ef5 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -18,6 +18,7 @@ import android.content.Context;
 import android.net.INetworkPolicyListener;
 import android.net.NetworkPolicyManager;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.RemoteException;
 import android.util.SparseIntArray;
 
@@ -38,7 +39,7 @@ public class DataSaverBackend {
     private final Context mContext;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
-    private final Handler mHandler = new Handler();
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
     private final NetworkPolicyManager mPolicyManager;
     private final ArrayList<Listener> mListeners = new ArrayList<>();
     private SparseIntArray mUidPolicies = new SparseIntArray();
@@ -194,12 +195,7 @@ public class DataSaverBackend {
 
         @Override
         public void onUidPoliciesChanged(final int uid, final int uidPolicies) {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    handleUidPoliciesChanged(uid, uidPolicies);
-                }
-            });
+            mHandler.post(() -> handleUidPoliciesChanged(uid, uidPolicies));
         }
 
         @Override
@@ -208,12 +204,7 @@ public class DataSaverBackend {
 
         @Override
         public void onRestrictBackgroundChanged(final boolean isDataSaving) throws RemoteException {
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    handleRestrictBackgroundChanged(isDataSaving);
-                }
-            });
+            mHandler.post(() -> handleRestrictBackgroundChanged(isDataSaving));
         }
     };
 
diff --git a/src/com/android/settings/datausage/DataUsageMeteredSettings.java b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
index ce2bc8d00b0cf8c6feba57c2eed1b85d4559d5e5..c2a18e9c9381841cdcd671ec684b0f703033d43b 100644
--- a/src/com/android/settings/datausage/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/datausage/DataUsageMeteredSettings.java
@@ -226,7 +226,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment impleme
 
             @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/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 5a84d13fa3e52bdb1bd872948a13773134b60150..417d74b616c506b407f179b4936ef5519419448c 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -72,11 +72,21 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
     public static final String TEST_RADIOS_PROP = "test.radios";
 
     public static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
-    public static final String KEY_NETWORK_RESTRICTIONS = "network_restrictions";
 
     private static final String KEY_STATUS_HEADER = "status_header";
     private static final String KEY_LIMIT_SUMMARY = "limit_summary";
-    private static final String KEY_WIFI_USAGE_TITLE = "wifi_category";
+
+    // Mobile data keys
+    public static final String KEY_MOBILE_CATEGORY = "mobile_category";
+    public static final String KEY_MOBILE_DATA_USAGE_TOGGLE = "data_usage_enable";
+    public static final String KEY_MOBILE_DATA_USAGE = "cellular_data_usage";
+    public static final String KEY_MOBILE_BILLING_CYCLE = "billing_preference";
+
+    // Wifi keys
+    public static final String KEY_WIFI_USAGE_TITLE = "wifi_category";
+    public static final String KEY_WIFI_DATA_USAGE = "wifi_data_usage";
+    public static final String KEY_NETWORK_RESTRICTIONS = "network_restrictions";
+
 
     private DataUsageController mDataUsageController;
     private DataUsageInfoController mDataInfoController;
@@ -471,16 +481,14 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
                 resource.xmlResId = R.xml.data_usage;
                 resources.add(resource);
 
-                if (hasMobileData(context)) {
-                    resource = new SearchIndexableResource(context);
-                    resource.xmlResId = R.xml.data_usage_cellular;
-                    resources.add(resource);
-                }
-                if (hasWifiRadio(context)) {
-                    resource = new SearchIndexableResource(context);
-                    resource.xmlResId = R.xml.data_usage_wifi;
-                    resources.add(resource);
-                }
+                resource = new SearchIndexableResource(context);
+                resource.xmlResId = R.xml.data_usage_cellular;
+                resources.add(resource);
+
+                resource = new SearchIndexableResource(context);
+                resource.xmlResId = R.xml.data_usage_wifi;
+                resources.add(resource);
+
                 return resources;
             }
 
@@ -488,12 +496,19 @@ public class DataUsageSummary extends DataUsageBase implements Indexable, DataUs
             public List<String> getNonIndexableKeys(Context context) {
                 List<String> keys = super.getNonIndexableKeys(context);
 
-                if (hasMobileData(context)) {
-                    keys.add(KEY_RESTRICT_BACKGROUND);
+                if (!hasMobileData(context)) {
+                    keys.add(KEY_MOBILE_CATEGORY);
+                    keys.add(KEY_MOBILE_DATA_USAGE_TOGGLE);
+                    keys.add(KEY_MOBILE_DATA_USAGE);
+                    keys.add(KEY_MOBILE_BILLING_CYCLE);
                 }
-                if (hasWifiRadio(context)) {
+
+                if (!hasWifiRadio(context)) {
+                    keys.add(KEY_WIFI_DATA_USAGE);
                     keys.add(KEY_NETWORK_RESTRICTIONS);
                 }
+
+                // This title is named Wifi, and will confuse users.
                 keys.add(KEY_WIFI_USAGE_TITLE);
 
                 return keys;
diff --git a/src/com/android/settings/datetime/TimeChangeListenerMixin.java b/src/com/android/settings/datetime/TimeChangeListenerMixin.java
index f3729ae69a5bfeabe329bfc292ab809fd8a3caa8..f93ee0c8122d0f79534a7c0947ee0a00272d1ae3 100644
--- a/src/com/android/settings/datetime/TimeChangeListenerMixin.java
+++ b/src/com/android/settings/datetime/TimeChangeListenerMixin.java
@@ -21,9 +21,9 @@ import android.content.Context;
 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 a2fe07d4e687d41b84ed4874921e77b056a82826..f7b62b1666fe406577586a32560e2967f603a5f4 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -33,6 +33,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 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 @@ public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment
         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 @@ public class AutomaticStorageManagerSettings extends SettingsPreferenceFragment
         }
         return indices.length - 1;
     }
+
 }
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 691fb99205c617926ac8a8ce20924d2777a37250..c0792e73d5b268c2d40b2bd847f3a6d67b05bb12 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -58,7 +58,7 @@ import android.os.UserManager;
 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 android.widget.Toast;
 
 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,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     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 TETHERING_HARDWARE_OFFLOAD = "tethering_hardware_offload";
+    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";
 
@@ -239,7 +240,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     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";
@@ -253,7 +253,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     private IWebViewUpdateService mWebViewUpdateService;
     private UserManager mUm;
     private WifiManager mWifiManager;
-    private PersistentDataBlockManager mOemUnlockManager;
+    private OemLockManager mOemLockManager;
     private TelephonyManager mTelephonyManager;
 
     private SwitchBar mSwitchBar;
@@ -282,6 +282,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     private SwitchPreference mWifiVerboseLogging;
     private SwitchPreference mWifiAggressiveHandover;
     private SwitchPreference mMobileDataAlwaysOn;
+    private SwitchPreference mTetheringHardwareOffload;
     private SwitchPreference mBluetoothDisableAbsVolume;
     private SwitchPreference mBluetoothEnableInbandRinging;
 
@@ -340,12 +341,11 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
     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;
@@ -387,8 +387,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         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);
@@ -406,7 +405,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
             // 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;
         }
 
@@ -436,7 +435,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         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;
         }
@@ -482,6 +481,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         mWifiAggressiveHandover = findAndInitSwitchPref(WIFI_AGGRESSIVE_HANDOVER_KEY);
         mWifiAllowScansWithTraffic = findAndInitSwitchPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY);
         mMobileDataAlwaysOn = findAndInitSwitchPref(MOBILE_DATA_ALWAYS_ON);
+        mTetheringHardwareOffload = findAndInitSwitchPref(TETHERING_HARDWARE_OFFLOAD);
         mLogdSize = addListPreference(SELECT_LOGD_SIZE_KEY);
         if ("1".equals(SystemProperties.get("ro.debuggable", "0"))) {
             mLogpersist = addListPreference(SELECT_LOGPERSIST_KEY);
@@ -564,7 +564,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
         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;
         }
@@ -815,6 +816,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         updateWifiAggressiveHandoverOptions();
         updateWifiAllowScansWithTrafficOptions();
         updateMobileDataAlwaysOnOptions();
+        updateTetheringHardwareOffloadOptions();
         updateSimulateColorSpace();
         updateUSBAudioOptions();
         updateForceResizableOptions();
@@ -1022,18 +1024,17 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                 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);
@@ -1469,7 +1470,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     private void updateBluetoothEnableInbandRingingOptions() {
         if (mBluetoothEnableInbandRinging != null) {
             updateSwitchPreference(mBluetoothEnableInbandRinging,
-                SystemProperties.getBoolean(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, false));
+                SystemProperties.getBoolean(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, true));
         }
     }
 
@@ -1492,6 +1493,18 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                 mMobileDataAlwaysOn.isChecked() ? 1 : 0);
     }
 
+    private void updateTetheringHardwareOffloadOptions() {
+        updateSwitchPreference(mTetheringHardwareOffload, Settings.Global.getInt(
+                getActivity().getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED, 0) != 1);
+    }
+
+    private void writeTetheringHardwareOffloadOptions() {
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.TETHER_OFFLOAD_DISABLED,
+                mTetheringHardwareOffload.isChecked() ? 0 : 1);
+    }
+
     private String defaultLogdSizeValue() {
         String defaultValue = SystemProperties.get(SELECT_LOGD_DEFAULT_SIZE_PROPERTY);
         if ((defaultValue == null) || (defaultValue.length() == 0)) {
@@ -2304,7 +2317,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
-                    OemUnlockUtils.setOemUnlockEnabled(getActivity(), true);
+                    mOemLockManager.setOemUnlockAllowedByUser(true);
                 }
             }
         };
@@ -2375,7 +2388,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                 if (mEnableOemUnlock.isChecked()) {
                     confirmEnableOemUnlock();
                 } else {
-                    OemUnlockUtils.setOemUnlockEnabled(getActivity(), false);
+                    mOemLockManager.setOemUnlockAllowedByUser(false);
                 }
             }
         } else {
@@ -2448,7 +2461,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                     confirmEnableOemUnlock();
                 }
             } else {
-                OemUnlockUtils.setOemUnlockEnabled(getActivity(), false);
+                mOemLockManager.setOemUnlockAllowedByUser(false);
             }
         } else if (preference == mMockLocationAppPref) {
             Intent intent = new Intent(getActivity(), AppPicker.class);
@@ -2509,6 +2522,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
             writeWifiAllowScansWithTrafficOptions();
         } else if (preference == mMobileDataAlwaysOn) {
             writeMobileDataAlwaysOnOptions();
+        } else if (preference == mTetheringHardwareOffload) {
+            writeTetheringHardwareOffloadOptions();
         } else if (preference == mColorTemperaturePreference) {
             writeColorTemperature();
         } else if (preference == mUSBAudio) {
@@ -2763,7 +2778,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
     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,
@@ -2774,10 +2790,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                 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);
@@ -2785,12 +2797,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
 
                 @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;
@@ -2818,11 +2827,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                 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;
             }
@@ -2845,12 +2853,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
      * 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 31f7a2018e1ede116ec2fd80d18f1cd4ddbf15c2..9ea24da2ce914913b3489f4f230f2ca1243edb99 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDisabledActivity.java
@@ -18,11 +18,15 @@ package com.android.settings.development;
 
 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 e97997e79109cda3d6962ca265cdc0730ab2b481..7132631b944772de84cc454eba9a4a4239eb63ed 100644
--- a/src/com/android/settings/development/DevelopmentSettingsEnabler.java
+++ b/src/com/android/settings/development/DevelopmentSettingsEnabler.java
@@ -20,9 +20,9 @@ import android.content.Context;
 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 cee3679ea8940d838145a948ad9a6cef9119795c..0000000000000000000000000000000000000000
--- 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 bee13513c6211e72ad7faec267df7ed482faad12..92328386c5808511850e020206a0e0ecdb2e848a 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -30,18 +30,18 @@ import android.util.Pair;
 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 e8792f29a351ceadaea5852298fcb8f27bb1dfce..1b563011e3085ac0dd3284d1309e2eed13530ffd 100644
--- a/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceController.java
@@ -27,10 +27,10 @@ import android.text.TextUtils;
 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 4724c3d8644af5a85e1dd9ec76778db250bd5a97..88b94876688e6881f729660a6f69c8223be6a321 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java
@@ -25,11 +25,11 @@ import android.view.MenuItem;
 
 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/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 10df004b1b5ce8c34c70aaf09639c99164f058ce..04da586726e315610ffd9fcdbdee3c22804b7116 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -473,6 +473,9 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
                         StorageUseActivity.class.getName());
                 args.putString(ManageApplications.EXTRA_VOLUME_UUID, mVolume.getFsUuid());
                 args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
+                args.putInt(
+                        ManageApplications.EXTRA_STORAGE_TYPE,
+                        ManageApplications.STORAGE_TYPE_LEGACY);
                 intent = Utils.onBuildStartFragmentIntent(getActivity(),
                         ManageApplications.class.getName(), args, null, R.string.apps_storage, null,
                         false, getMetricsCategory());
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 13b3d0b8c19ac2c9a92cb24e980ee42698b2f4ae..b5a7b3b389482a2b86efb03535282df01faf3c01 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -113,6 +113,11 @@ public class StorageDashboardFragment extends DashboardFragment
         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/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index 6ae6c1adc4e70f4910e1b2878c736b5da57b01a7..3dcf935aba7c3733ef44a7ec7b7fb666cedfbe4b 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -30,9 +30,11 @@ import com.android.settings.utils.FileSizeFormatter;
 public class StorageItemPreference extends Preference {
     public int userHandle;
 
+    private static final int UNINITIALIZED = -1;
+
     private ProgressBar mProgressBar;
     private static final int PROGRESS_MAX = 100;
-    private int mProgressPercent = -1;
+    private int mProgressPercent = UNINITIALIZED;
 
     public StorageItemPreference(Context context) {
         this(context, null);
@@ -60,15 +62,9 @@ public class StorageItemPreference extends Preference {
     }
 
     protected void updateProgressBar() {
-        if (mProgressBar == null)
-            return;
-
-        if (mProgressPercent == -1) {
-            mProgressBar.setVisibility(View.GONE);
+        if (mProgressBar == null || mProgressPercent == UNINITIALIZED)
             return;
-        }
 
-        mProgressBar.setVisibility(View.VISIBLE);
         mProgressBar.setMax(PROGRESS_MAX);
         mProgressBar.setProgress(mProgressPercent);
     }
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 80b8ac2a2d23ea1349fd13deb3dbba4d0912ca3f..db68bac43ccba23c33332118ef400926b7adb769 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -553,77 +553,87 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
         }
     };
 
-    /**
-     * 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>();
-
-                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);
-                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);
+            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);
+
+                    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);
-                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;
-            }
-        };
+                    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;
+                }
+            };
 }
diff --git a/src/com/android/settings/deviceinfo/UsbBackend.java b/src/com/android/settings/deviceinfo/UsbBackend.java
index eb4edd822c0ee80695203e06111011a64a9ff4f6..5d2502ba9b28242453b6e9e02de22495112932b9 100644
--- a/src/com/android/settings/deviceinfo/UsbBackend.java
+++ b/src/com/android/settings/deviceinfo/UsbBackend.java
@@ -28,11 +28,11 @@ import android.support.annotation.VisibleForTesting;
 
 public class UsbBackend {
 
-    private static final int MODE_POWER_MASK  = 0x01;
+    public static final int MODE_POWER_MASK  = 0x01;
     public static final int MODE_POWER_SINK   = 0x00;
     public static final int MODE_POWER_SOURCE = 0x01;
 
-    private static final int MODE_DATA_MASK  = 0x03 << 1;
+    public static final int MODE_DATA_MASK  = 0x03 << 1;
     public static final int MODE_DATA_NONE   = 0x00 << 1;
     public static final int MODE_DATA_MTP    = 0x01 << 1;
     public static final int MODE_DATA_PTP    = 0x02 << 1;
@@ -53,7 +53,7 @@ public class UsbBackend {
     }
 
     @VisibleForTesting
-    UsbBackend(Context context, UserRestrictionUtil userRestrictionUtil) {
+    public UsbBackend(Context context, UserRestrictionUtil userRestrictionUtil) {
         mContext = context;
         mUsbManager = context.getSystemService(UsbManager.class);
 
diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index a8ca5b9f02cc9865672b85a226cb4986cb8fc075..3e81fc7c34fcff95ef62a4ad722bed132fd27e71 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -26,12 +26,12 @@ import android.support.v7.preference.PreferenceScreen;
 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 {
@@ -88,9 +88,17 @@ public class AutomaticStorageManagementSwitchPreferenceController extends Prefer
                 Settings.Secure.AUTOMATIC_STORAGE_MANAGER_ENABLED,
                 isChecked ? 1 : 0);
 
-        boolean storageManagerEnabledByDefault = SystemProperties.getBoolean(
-                STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, false);
-        if (isChecked && !storageManagerEnabledByDefault) {
+        final boolean storageManagerEnabledByDefault =
+                SystemProperties.getBoolean(STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY, false);
+        final boolean storageManagerDisabledByPolicy =
+                Settings.Secure.getInt(
+                                mContext.getContentResolver(),
+                                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY,
+                                0)
+                        != 0;
+        // Show warning if it is disabled by default and turning it on or if it was disabled by
+        // policy and we're turning it on.
+        if ((isChecked && (!storageManagerEnabledByDefault || storageManagerDisabledByPolicy))) {
             ActivationWarningFragment fragment = ActivationWarningFragment.newInstance();
             fragment.show(mFragmentManager, ActivationWarningFragment.TAG);
         }
diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java
index 44d3d44e7144ba37510c037a6f252117a5d50884..d653f7c3d7420fdaef091acd59552e099b79c743 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java
@@ -39,6 +39,7 @@ import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.widget.DonutView;
 
+import java.text.NumberFormat;
 import java.util.Locale;
 
 /**
@@ -46,7 +47,7 @@ import java.util.Locale;
  * on a given storage volume. It is visualized with a donut graphing the % used.
  */
 public class StorageSummaryDonutPreference extends Preference implements View.OnClickListener {
-    private int mPercent = -1;
+    private double mPercent = -1;
 
     public StorageSummaryDonutPreference(Context context) {
         this(context, null);
@@ -64,8 +65,7 @@ public class StorageSummaryDonutPreference extends Preference implements View.On
             return;
         }
 
-        mPercent = MathUtils.constrain((int) ((usedBytes * 100) / totalBytes),
-                (usedBytes > 0) ? 1 : 0, 100);
+        mPercent = usedBytes / (double) totalBytes;
     }
 
     @Override
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..b80f65523d614f7a86cd858e4194f1d50763c292
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.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.display;
+
+import android.content.Context;
+import android.content.Intent;
+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.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+
+public class AmbientDisplayAlwaysOnPreferenceController extends PreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private final int ON = 1;
+    private final int OFF = 0;
+
+    public static final String KEY_ALWAYS_ON = "ambient_display_always_on";
+    private static final int MY_USER = UserHandle.myUserId();
+
+    private final AmbientDisplayConfiguration mConfig;
+    private final OnPreferenceChangedCallback mCallback;
+
+    public interface OnPreferenceChangedCallback {
+        void onPreferenceChanged();
+    }
+
+    public AmbientDisplayAlwaysOnPreferenceController(Context context,
+            AmbientDisplayConfiguration config, OnPreferenceChangedCallback callback) {
+        super(context);
+        mConfig = config;
+        mCallback = callback;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_ALWAYS_ON;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        ((SwitchPreference) preference).setChecked(isAlwaysOnEnabled(mConfig));
+    }
+
+    public static boolean isAlwaysOnEnabled(AmbientDisplayConfiguration config) {
+        return config.alwaysOnEnabled(MY_USER);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        int enabled = (boolean) newValue ? ON : OFF;
+        Settings.Secure.putInt(
+                mContext.getContentResolver(), Settings.Secure.DOZE_ALWAYS_ON, enabled);
+        if (mCallback != null) {
+            mCallback.onPreferenceChanged();
+        }
+        return true;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return isAvailable(mConfig);
+    }
+
+    public static boolean isAvailable(AmbientDisplayConfiguration config) {
+        return config.alwaysOnAvailableForUser(MY_USER);
+    }
+
+    public static boolean accessibilityInversionEnabled(AmbientDisplayConfiguration config) {
+        return config.accessibilityInversionEnabled(MY_USER);
+    }
+
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                AmbientDisplaySettings.class.getName(), KEY_ALWAYS_ON,
+                mContext.getString(R.string.ambient_display_screen_title));
+
+        return new InlineSwitchPayload(Settings.Secure.DOZE_ALWAYS_ON,
+                ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),
+                ON /* defaultValue */);
+    }
+}
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..ac99d71506d9c4c4d18af42b473a77c0ccb7cdad
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -0,0 +1,95 @@
+/*
+ * 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.display;
+
+import android.content.Context;
+import android.content.Intent;
+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 com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+
+import static android.provider.Settings.Secure.DOZE_ENABLED;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
+
+public class AmbientDisplayNotificationsPreferenceController extends PreferenceController
+        implements Preference.OnPreferenceChangeListener {
+
+    private final int ON = 1;
+    private final int OFF = 0;
+
+    @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 AmbientDisplayNotificationsPreferenceController(Context context,
+            AmbientDisplayConfiguration config, MetricsFeatureProvider metricsFeatureProvider) {
+        super(context);
+        mMetricsFeatureProvider = metricsFeatureProvider;
+        mConfig = config;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_AMBIENT_DISPLAY_NOTIFICATIONS;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (KEY_AMBIENT_DISPLAY_NOTIFICATIONS.equals(preference.getKey())) {
+            mMetricsFeatureProvider.action(mContext, ACTION_AMBIENT_DISPLAY);
+        }
+        return false;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        ((SwitchPreference) preference).setChecked(mConfig.pulseOnNotificationEnabled(MY_USER));
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        boolean value = (Boolean) newValue;
+        Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ENABLED, value ? ON : OFF);
+        return true;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mConfig.pulseOnNotificationAvailable();
+    }
+
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                AmbientDisplaySettings.class.getName(), KEY_AMBIENT_DISPLAY_NOTIFICATIONS,
+                mContext.getString(R.string.ambient_display_screen_title));
+
+        return new InlineSwitchPayload(Settings.Secure.DOZE_ENABLED,
+                ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),
+                ON /* defaultValue */);
+    }
+}
diff --git a/src/com/android/settings/display/AmbientDisplayPreferenceController.java b/src/com/android/settings/display/AmbientDisplayPreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..f3e3046fbd6bb7d5e160152d119bc8629a3bf7ec
--- /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 0000000000000000000000000000000000000000..666d47a6e7501d2e54b5ed72ccf401458cc9cff0
--- /dev/null
+++ b/src/com/android/settings/display/AmbientDisplaySettings.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.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,
+            AmbientDisplayAlwaysOnPreferenceController.OnPreferenceChangedCallback aodCallback) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new AmbientDisplayNotificationsPreferenceController(context, config,
+                metricsFeatureProvider));
+        controllers.add(new AmbientDisplayAlwaysOnPreferenceController(context, config,
+                aodCallback));
+        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,
+                () -> { updatePreferenceStates(); });
+    }
+
+    @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, null);
+                }
+            };
+}
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 6f9a302c504797063b4b41e75e3b3ab90448b7b3..12f3a8bf554a0d6744af8870348e45ff13d0ee26 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -14,16 +14,17 @@
 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.DisplaySettings;
 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;
@@ -35,6 +36,9 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp
 
     private final String mAutoBrightnessKey;
 
+    private final String SYSTEM_KEY = SCREEN_BRIGHTNESS_MODE;
+    private final int DEFAULT_VALUE = SCREEN_BRIGHTNESS_MODE_MANUAL;
+
     public AutoBrightnessPreferenceController(Context context, String key) {
         super(context);
         mAutoBrightnessKey = key;
@@ -54,25 +58,26 @@ public class AutoBrightnessPreferenceController extends PreferenceController imp
     @Override
     public void updateState(Preference preference) {
         int brightnessMode = Settings.System.getInt(mContext.getContentResolver(),
-                SCREEN_BRIGHTNESS_MODE, SCREEN_BRIGHTNESS_MODE_MANUAL);
-        ((SwitchPreference) preference).setChecked(brightnessMode != SCREEN_BRIGHTNESS_MODE_MANUAL);
+                SYSTEM_KEY, DEFAULT_VALUE);
+        ((SwitchPreference) preference).setChecked(brightnessMode != DEFAULT_VALUE);
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         boolean auto = (Boolean) newValue;
-        Settings.System.putInt(mContext.getContentResolver(), SCREEN_BRIGHTNESS_MODE,
-                auto ? SCREEN_BRIGHTNESS_MODE_AUTOMATIC : SCREEN_BRIGHTNESS_MODE_MANUAL);
+        Settings.System.putInt(mContext.getContentResolver(), SYSTEM_KEY,
+                auto ? SCREEN_BRIGHTNESS_MODE_AUTOMATIC : DEFAULT_VALUE);
         return true;
     }
 
     @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,
+                DisplaySettings.class.getName(), mAutoBrightnessKey,
+                mContext.getString(R.string.display_settings));
 
-        return new InlineSwitchPayload(SCREEN_BRIGHTNESS_MODE,
-                ResultPayload.SettingsSource.SYSTEM, valueMap);
+        return new InlineSwitchPayload(SYSTEM_KEY,
+                ResultPayload.SettingsSource.SYSTEM, SCREEN_BRIGHTNESS_MODE_AUTOMATIC, intent,
+                isAvailable(), DEFAULT_VALUE);
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index fd79e51cafc54c3a30e3f3488470ba6802fc9df5..a39cde5432767dc335e240b20f87860fdae64354 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 @@ public class AutoRotatePreferenceController extends PreferenceController impleme
 
     @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 @@ public class AutoRotatePreferenceController extends PreferenceController impleme
         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 0000000000000000000000000000000000000000..a8ad8c67c62677b0597ec53cb982b540c0d2d12a
--- /dev/null
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 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 getPercentage(value, -1, 1);
+        }
+        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) {
+        if (value > max) {
+            return 1.0;
+        }
+        if (value < min) {
+            return 0.0;
+        }
+        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 0000000000000000000000000000000000000000..957401660e2f5751a28839c761ab07f0d0bd6b1c
--- /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 0c5c1878737a13a4f2c9f5f3a3267e06772e8894..a62e6b51d8f9db086ae5e1cea9073522f2938001 100644
--- a/src/com/android/settings/display/DensityPreference.java
+++ b/src/com/android/settings/display/DensityPreference.java
@@ -16,6 +16,7 @@ package com.android.settings.display;
 
 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.util.Slog;
 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.CustomEditTextPreference;
 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 @@ public class DensityPreference extends CustomEditTextPreference {
     @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/DozePreferenceController.java b/src/com/android/settings/display/DozePreferenceController.java
deleted file mode 100644
index ad72053bf3824f282680b5d976a9e6f1ddab3329..0000000000000000000000000000000000000000
--- a/src/com/android/settings/display/DozePreferenceController.java
+++ /dev/null
@@ -1,78 +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.display;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.SystemProperties;
-import android.provider.Settings;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-import android.text.TextUtils;
-
-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 {
-
-    private static final String KEY_DOZE = "doze";
-
-    private final MetricsFeatureProvider mMetricsFeatureProvider;
-
-    public DozePreferenceController(Context context) {
-        super(context);
-        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_DOZE;
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_DOZE.equals(preference.getKey())) {
-            mMetricsFeatureProvider.action(mContext, ACTION_AMBIENT_DISPLAY);
-        }
-        return false;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        int value = Settings.Secure.getInt(mContext.getContentResolver(), DOZE_ENABLED, 1);
-        ((SwitchPreference) preference).setChecked(value != 0);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        boolean value = (Boolean) newValue;
-        Settings.Secure.putInt(mContext.getContentResolver(), DOZE_ENABLED, value ? 1 : 0);
-        return true;
-    }
-
-    @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);
-    }
-}
diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index 1da16fe11c9eacb63e7c69ea189bbd5725f92e87..23ddf078ac43ddf249fe70b4af9b6bbaa4545108 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -28,7 +28,7 @@ import android.widget.TimePicker;
 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;
@@ -73,6 +73,11 @@ public class NightDisplaySettings extends SettingsPreferenceFragment
         mTemperaturePreference.setContinuousUpdates(true);
     }
 
+    @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 0000000000000000000000000000000000000000..afa2f333590ab07c5ffeb227bb8573e06330979d
--- /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 fab9062bd7301517a24762cfc86e67b175e36a84..7a10802a898add9aec02b15556f827980017d17a 100644
--- a/src/com/android/settings/display/ScreenSaverPreferenceController.java
+++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java
@@ -16,8 +16,8 @@ package com.android.settings.display;
 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 7538cd337fceadc77d1637e0ce9554bd7b77777c..ec3999b514498ff189707d5d00887078ce930766 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -93,6 +93,11 @@ public class ScreenZoomSettings extends PreviewSeekBarPreferenceFragment impleme
         }
     }
 
+    @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 99a19f8c08dc9c256f4dc5c71ccd0cba4a456631..c38ed28453eb6a385b5b2e5f50ac408657be45d7 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -90,11 +90,20 @@ public class ThemePreferenceController extends PreferenceController implements
         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 @@ public class ThemePreferenceController extends PreferenceController implements
                     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/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index aa29afcfbef88a389d0b31e7f2b9035b422a0228..b2e0f7b3729ebe3a35b866a5f18ec885333f15a0 100644
--- a/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -13,27 +13,54 @@
  */
 package com.android.settings.display;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+import android.util.Log;
 
+import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedPreference;
 
 import static android.os.UserManager.DISALLOW_SET_WALLPAPER;
 
+import java.util.List;
+
 public class WallpaperPreferenceController extends PreferenceController {
 
-    private static final String KEY_WALLPAPER = "wallpaper";
+    private static final String TAG = "WallpaperPrefController";
+
+    public static final String KEY_WALLPAPER = "wallpaper";
+
+    private final String mWallpaperPackage;
+    private final String mWallpaperClass;
 
     public WallpaperPreferenceController(Context context) {
         super(context);
+        mWallpaperPackage = mContext.getString(R.string.config_wallpaper_picker_package);
+        mWallpaperClass = mContext.getString(R.string.config_wallpaper_picker_class);
     }
 
     @Override
     public boolean isAvailable() {
-        return true;
+        if (TextUtils.isEmpty(mWallpaperPackage) || TextUtils.isEmpty(mWallpaperClass)) {
+            Log.e(TAG, "No Wallpaper picker specified!");
+            return false;
+        }
+        final ComponentName componentName =
+                new ComponentName(mWallpaperPackage, mWallpaperClass);
+        final PackageManager pm = mContext.getPackageManager();
+        final Intent intent = new Intent();
+        intent.setComponent(componentName);
+        final List<ResolveInfo> resolveInfos =
+                pm.queryIntentActivities(intent, 0 /* flags */);
+        return resolveInfos != null && resolveInfos.size() != 0;
     }
 
     @Override
diff --git a/src/com/android/settings/dream/CurrentDreamPicker.java b/src/com/android/settings/dream/CurrentDreamPicker.java
new file mode 100644
index 0000000000000000000000000000000000000000..da9bf9e3be066b40c9cda250d6baaf637638b35b
--- /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 0000000000000000000000000000000000000000..5b448f8c983460fc3ebb95877bafd2fa3bafa1cb
--- /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 0000000000000000000000000000000000000000..8c10d45745f904a73d3d86fd6c5c4e378000f70e
--- /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 0000000000000000000000000000000000000000..994b70b2245eaec34a32ba3cc79329bfd781c071
--- /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 0000000000000000000000000000000000000000..a55064dc345b82de3be1ba121ebb9006c0900dd1
--- /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 0000000000000000000000000000000000000000..0d870fda0b5e04df222defdef2e224658bb7ca8c
--- /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 003ed1188c676f9abbb35d6426860043650deb1f..be41e4d5e64d68151755e78bef937f3220094e2f 100644
--- a/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceController.java
@@ -17,7 +17,7 @@ package com.android.settings.enterprise;
 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 5343483827f213714bbb238b00a57864bb4c8576..77c60403788385e475e4b4dab163d1098db0013e 100644
--- a/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceController.java
@@ -17,7 +17,7 @@ package com.android.settings.enterprise;
 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 64396c54f77a4cea6d0fc0121021f5d673f64f90..9896420eadbffabe0c74b3e9e053670a3deecd7e 100644
--- a/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
+++ b/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceController.java
@@ -17,7 +17,7 @@ package com.android.settings.enterprise;
 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 556baec56db47b4a2b8269654fbe1abdb3d0530d..9187cecd33c53541eeb1701576b15ebebf992ce5 100644
--- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -21,8 +21,8 @@ import android.support.v7.preference.Preference;
 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 32f2bbee6988a166f255bfb017154a52936990d8..ed91fef0538094ab652f7097e060ee1b87f2071d 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
@@ -18,8 +18,8 @@ import android.support.v7.preference.Preference;
 
 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 84863684a54c45569b7454b691a808c33cba3c65..db6fc1d5b01c40b8f643bef5fc20ca533fb564c6 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceController.java
@@ -16,8 +16,8 @@ package com.android.settings.enterprise;
 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 fc89dc803d0cf40d1ed8724b3286bb5c5e8b5143..65c109c93f3cba67a7014f910301d6d4d7d6b7bc 100644
--- a/src/com/android/settings/enterprise/CaCertsPreferenceController.java
+++ b/src/com/android/settings/enterprise/CaCertsPreferenceController.java
@@ -20,8 +20,8 @@ import android.support.v7.preference.Preference;
 
 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/DevicePolicyManagerWrapper.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
index babf90e195531ed853a68127ecd2cde55dc9c8f5..8605b2e0215f67df8589b0fde3a80a65a3c43692 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapper.java
@@ -44,6 +44,13 @@ public interface DevicePolicyManagerWrapper {
      */
     int getMaximumFailedPasswordsForWipe(@Nullable ComponentName admin, int userHandle);
 
+    /**
+     * Calls {@code DevicePolicyManager.getDeviceOwnerComponentOnCallingUser()}.
+     *
+     * @see android.app.admin.DevicePolicyManager#getDeviceOwnerComponentOnCallingUser
+     */
+    ComponentName getDeviceOwnerComponentOnCallingUser();
+
     /**
      * Calls {@code DevicePolicyManager.getDeviceOwnerComponentOnAnyUser()}.
      *
diff --git a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
index 7906310682d57f007e565cd2a44690684111c2d3..e11aaf65e7affc43ccbbd31eb6ba68a0428e3856 100644
--- a/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
+++ b/src/com/android/settings/enterprise/DevicePolicyManagerWrapperImpl.java
@@ -41,6 +41,11 @@ public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrappe
         return mDpm.getMaximumFailedPasswordsForWipe(admin, userHandle);
     }
 
+    @Override
+    public ComponentName getDeviceOwnerComponentOnCallingUser() {
+        return mDpm.getDeviceOwnerComponentOnCallingUser();
+    }
+
     @Override
     public ComponentName getDeviceOwnerComponentOnAnyUser() {
         return mDpm.getDeviceOwnerComponentOnAnyUser();
diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
index 9876f71ef198e722a656dbffc395a080127397b7..cced8e852699901fff50b4ff0aec9195e39aebf4 100644
--- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
@@ -19,8 +19,8 @@ import android.support.v7.preference.Preference;
 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/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 46ecb7e620f268d1fbe40d6bd1acc9bf2bdcf4e6..a5e2f3c955c7de6b4340fb99916483e0dd621183 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -158,11 +158,14 @@ public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFe
 
     @Override
     public int getMaximumFailedPasswordsBeforeWipeInCurrentUser() {
-        final ComponentName profileOwner = mDpm.getProfileOwnerAsUser(MY_USER_ID);
-        if (profileOwner == null) {
+        ComponentName owner = mDpm.getDeviceOwnerComponentOnCallingUser();
+        if (owner == null) {
+            owner = mDpm.getProfileOwnerAsUser(MY_USER_ID);
+        }
+        if (owner == null) {
             return 0;
         }
-        return mDpm.getMaximumFailedPasswordsForWipe(profileOwner, MY_USER_ID);
+        return mDpm.getMaximumFailedPasswordsForWipe(owner, MY_USER_ID);
     }
 
     @Override
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
index 372982f82967e0ba2c9ecec4bc8aabb741c4ea5e..6ec091bbca552cae1c9093b49b7e12282fc80a00 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
@@ -18,8 +18,8 @@ import android.support.v7.preference.Preference;
 
 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 f7327c87406415f45205e4f4d54419cde6cd4f83..54f0508cece424c2e3f4bbc464ca38922205501a 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -22,10 +22,10 @@ import android.provider.SearchIndexableResource;
 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 35f6e4120b6ea2fd45b546adfdcb3d86a4721775..537ef780d134b39a2ee92c48c9760017e65d191e 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.R;
 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 4c89659c82b6729fa12a60824cb1f141659024af..7833325b995d2a5071a209467baa5be4c3953c67 100644
--- a/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
+++ b/src/com/android/settings/enterprise/ExposureChangesCategoryPreferenceController.java
@@ -20,7 +20,7 @@ import android.support.v7.preference.Preference;
 
 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 d3f9a98245c3b485174514f840f4a4b4478e3cb5..d7f8dc0506dc68bca5c0bf413dc939b6ac69a84f 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipeCurrentUserPreferenceController.java
@@ -15,7 +15,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 FailedPasswordWipeCurrentUserPreferenceController
         extends FailedPasswordWipePreferenceControllerBase {
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/FailedPasswordWipeManagedProfilePreferenceController.java
index 205d7c17081cdecd8d228174b220a74079bc9944..739003a588ed3f984a3e7230e558d78b025c14b3 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 7485fe20edbb3e942f35c6a11e989857dd540e89..298f9119997007d2cbc6ad91db72f123c736529a 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -20,8 +20,8 @@ import android.support.v7.preference.Preference;
 
 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 76c49dade06666ddd513ca9e021fb9714e2c2ce4..55552b689a7fd8b857a8aa16377ae98293ba2ea5 100644
--- a/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
+++ b/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceController.java
@@ -16,8 +16,8 @@ package com.android.settings.enterprise;
 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 b13aec74d92a7dbd410d4644f32c460c7cd12578..ca52fc00f30bbeeac84886033287e7b088ac9471 100644
--- a/src/com/android/settings/enterprise/ImePreferenceController.java
+++ b/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -20,8 +20,8 @@ import android.support.v7.preference.Preference;
 
 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 d58180428a9181d5d3c75efb37dc78037bc5fc48..7c34f2da267fcdef5f1f8bfde6fe542c4c24d7d2 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollBase.java
@@ -18,6 +18,7 @@ package com.android.settings.fingerprint;
 
 import android.annotation.Nullable;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -26,9 +27,10 @@ import android.view.View;
 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.SetupWizardUtils;
+import com.android.settings.core.InstrumentedActivity;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.setupwizardlib.GlifLayout;
 
 /**
@@ -56,6 +58,12 @@ public abstract class FingerprintEnrollBase extends InstrumentedActivity
         mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
     }
 
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent());
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index f6371877fc08a5172ca6a79a255e255b46403098..e85a38e8f986b959524c8f2b669fa26e6f59eafd 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -37,13 +37,14 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
+import android.widget.Button;
 import android.widget.ProgressBar;
 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.
@@ -99,6 +100,10 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
         mRepeatMessage = (TextView) findViewById(R.id.repeat_message);
         mErrorText = (TextView) findViewById(R.id.error_text);
         mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar);
+
+        Button skipButton = findViewById(R.id.skip_button);
+        skipButton.setOnClickListener(this);
+
         final LayerDrawable fingerprintDrawable = (LayerDrawable) mProgressBar.getBackground();
         mIconAnimationDrawable = (AnimatedVectorDrawable)
                 fingerprintDrawable.findDrawableByLayerId(R.id.fingerprint_animation);
@@ -212,6 +217,18 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
         super.onBackPressed();
     }
 
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.skip_button:
+                setResult(RESULT_SKIP);
+                finish();
+                break;
+            default:
+                super.onClick(v);
+        }
+    }
+
     private void animateProgress(int progress) {
         if (mProgressAnim != null) {
             mProgressAnim.cancel();
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index 5152d3121b0714662ee892b8868ecc1fcaeabbbf..1902a52b5e65f01c3e825b0c26a8f64a51c86c7e 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -20,12 +20,15 @@ import android.content.Intent;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.support.annotation.Nullable;
+import android.view.View;
+import android.widget.Button;
 
 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 +39,7 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
     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;
@@ -45,6 +49,9 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(getContentView());
+        Button skipButton = findViewById(R.id.skip_button);
+        skipButton.setOnClickListener(this);
+
         setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
         if (savedInstanceState != null) {
             mLaunchedConfirmLock = savedInstanceState.getBoolean(EXTRA_KEY_LAUNCHED_CONFIRM);
@@ -56,8 +63,12 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
         } 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 +78,9 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
     @Override
     protected void onStart() {
         super.onStart();
-        mAnimation.startAnimation();
+        if (mAnimation != null) {
+            mAnimation.startAnimation();
+        }
     }
 
     private void startLookingForFingerprint() {
@@ -102,13 +115,17 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
     @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
@@ -119,9 +136,15 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
     }
 
     @Override
-    protected void onNextButtonClick() {
-        mNextClicked = true;
-        proceedToEnrolling(true /* cancelEnrollment */);
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.skip_button:
+                setResult(RESULT_SKIP);
+                finish();
+                break;
+            default:
+                super.onClick(v);
+        }
     }
 
     private void proceedToEnrolling(boolean cancelEnrollment) {
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index 551564dea83e131fd4493d3158af378675bd5165..dd831219ad53022c0bfa68647e753218f18d339b 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -29,10 +29,10 @@ import android.widget.Button;
 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 cbfec0c200bb54d55835f527292db59fd58e2baf..9ab561d2c1b2fbf42f146f23fbf0c83853de0d48 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollSidecar.java
@@ -26,9 +26,10 @@ import android.os.Handler;
 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 d717bff1aafad6ffaa6f8ea470eda05fd2aa8ce8..a2ce9b296bfd45d6116572042bb57649ba5a9a9e 100644
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -46,8 +46,8 @@ import android.text.Annotation;
 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.EditText;
 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
@@ -262,14 +261,18 @@ public class FingerprintSettings extends SubSettings {
                         mHandler.postDelayed(mFingerprintLockoutReset,
                                 LOCKOUT_DURATION);
                     }
-                    // Fall through to show message
-                default:
-                    // Activity can be null on a screen rotation.
-                    final Activity activity = getActivity();
-                    if (activity != null) {
-                        Toast.makeText(activity, msg , Toast.LENGTH_SHORT);
-                    }
-                break;
+                    break;
+                case FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT:
+                    mInFingerprintLockout = true;
+                    break;
+            }
+
+            if (mInFingerprintLockout) {
+                // Activity can be null on a screen rotation.
+                final Activity activity = getActivity();
+                if (activity != null) {
+                    Toast.makeText(activity, msg , Toast.LENGTH_SHORT).show();
+                }
             }
             retryFingerprint(); // start again
         }
diff --git a/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java b/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..e1a4183d4801e1cc27bb62f8de1c91a53840dd31
--- /dev/null
+++ b/src/com/android/settings/fingerprint/FingerprintSuggestionActivity.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.fingerprint;
+
+import android.widget.Button;
+
+import com.android.settings.R;
+
+public class FingerprintSuggestionActivity extends SetupFingerprintEnrollIntroduction {
+
+    @Override
+    protected void initViews() {
+        super.initViews();
+
+        final Button cancelButton = findViewById(R.id.fingerprint_cancel_button);
+        cancelButton.setText(R.string.security_settings_fingerprint_enroll_introduction_cancel);
+    }
+
+    @Override
+    public void finish() {
+        // Always use RESULT_CANCELED because this action can be done multiple times
+        setResult(RESULT_CANCELED);
+        super.finish();
+    }
+}
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
index 5d0152c76c2bf71633e7904fb7afed5ef4523b5d..fbbf033aa3f430b240d5467b105d7fa2faf1b46d 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollEnrolling.java
@@ -17,7 +17,6 @@
 package com.android.settings.fingerprint;
 
 import android.content.Intent;
-import android.content.res.Resources;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.SetupWizardUtils;
@@ -31,12 +30,6 @@ public class SetupFingerprintEnrollEnrolling extends FingerprintEnrollEnrolling
         return intent;
     }
 
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.FINGERPRINT_ENROLLING_SETUP;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
index aff1028269875fdf99e656e4b0c87e970c217e24..f62b701240110bbea1ea2aa69f4fa9ff56d14c6a 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -17,13 +17,12 @@
 package com.android.settings.fingerprint;
 
 import android.content.Intent;
-import android.content.res.Resources;
 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 {
 
@@ -43,12 +42,6 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso
         return intent;
     }
 
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.FINGERPRINT_FIND_SENSOR_SETUP;
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
index 92ea5cb4796bfea01ea45096d59fe8c5a34a7969..e81203fb7a6af3ec59d3180702086940c9f3cf44 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFinish.java
@@ -17,15 +17,13 @@
 package com.android.settings.fingerprint;
 
 import android.content.Intent;
-import android.content.res.Resources;
 import android.os.UserHandle;
-import android.view.View;
-import android.widget.TextView;
+import android.widget.Button;
 
 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 {
 
@@ -40,21 +38,11 @@ public class SetupFingerprintEnrollFinish extends FingerprintEnrollFinish {
         return intent;
     }
 
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
     @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);
+        Button nextButton = findViewById(R.id.next_button);
+        nextButton.setText(R.string.next_label);
     }
 
     @Override
diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
index 3951aff782616004941f9611a037ae7377ce4aa6..59907cf493be0771427d4b90fe1d288698dd3082 100644
--- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -16,9 +16,11 @@
 
 package com.android.settings.fingerprint;
 
+import android.app.Activity;
 import android.app.KeyguardManager;
+import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
-import android.content.res.Resources;
+import android.os.Bundle;
 import android.os.UserHandle;
 import android.widget.Button;
 import android.widget.TextView;
@@ -26,14 +28,39 @@ import android.widget.TextView;
 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.ChooseLockGenericFragment;
+import com.android.settings.password.SetupChooseLockGeneric;
+import com.android.settings.password.SetupSkipDialog;
 
 public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
+    private static final String KEY_LOCK_SCREEN_PRESENT = "wasLockScreenPresent";
+    private boolean mAlreadyHadLockScreenSetup = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (savedInstanceState == null) {
+            mAlreadyHadLockScreenSetup = isKeyguardSecure();
+        } else {
+            mAlreadyHadLockScreenSetup = savedInstanceState.getBoolean(
+                    KEY_LOCK_SCREEN_PRESENT, false);
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_LOCK_SCREEN_PRESENT, mAlreadyHadLockScreenSetup);
+    }
 
     @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;
     }
@@ -45,12 +72,6 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
         return intent;
     }
 
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
     @Override
     protected void initViews() {
         super.initViews();
@@ -70,31 +91,53 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == FINGERPRINT_FIND_SENSOR_REQUEST) {
-            if (data == null) {
-                data = new Intent();
-            }
-            LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
-            data.putExtra(SetupChooseLockGeneric.
-                    SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY,
-                    lockPatternUtils.getKeyguardStoredPasswordQuality(UserHandle.myUserId()));
+        // if lock was already present, do not return intent data since it must have been
+        // reported in previous attempts
+        if (requestCode == FINGERPRINT_FIND_SENSOR_REQUEST && isKeyguardSecure()
+                && !mAlreadyHadLockScreenSetup) {
+            data = getMetricIntent(data);
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
 
+    private Intent getMetricIntent(Intent data) {
+        if (data == null) {
+            data = new Intent();
+        }
+        LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
+        data.putExtra(SetupChooseLockGeneric.
+                SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY,
+                lockPatternUtils.getKeyguardStoredPasswordQuality(UserHandle.myUserId()));
+        return data;
+    }
+
     @Override
     protected void onCancelButtonClick() {
-        KeyguardManager keyguardManager = getSystemService(KeyguardManager.class);
-        if (keyguardManager.isKeyguardSecure()) {
+        if (isKeyguardSecure()) {
             // If the keyguard is already set up securely (maybe the user added a backup screen
             // lock and skipped fingerprint), return RESULT_SKIP directly.
-            setResult(RESULT_SKIP);
+            setResult(RESULT_SKIP, mAlreadyHadLockScreenSetup ? null : getMetricIntent(null));
             finish();
         } else {
-            SetupSkipDialog dialog = SetupSkipDialog.newInstance(
-                    getIntent().getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false));
-            dialog.show(getFragmentManager());
+            setResult(SetupSkipDialog.RESULT_SKIP);
+            finish();
+        }
+    }
+
+    /**
+     * Propagate lock screen metrics if the user goes back from the fingerprint setup screen
+     * after having added lock screen to his device.
+     */
+    @Override
+    public void onBackPressed() {
+        if (!mAlreadyHadLockScreenSetup && isKeyguardSecure()) {
+            setResult(Activity.RESULT_CANCELED, getMetricIntent(null));
         }
+        super.onBackPressed();
+    }
+
+    private boolean isKeyguardSecure() {
+        return getSystemService(KeyguardManager.class).isKeyguardSecure();
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 42b049ae8287ce155c907ba2233df5959ee758cb..9a3787972a52e85c4e5ba4bbafde2ebdb7d16be7 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -17,9 +17,11 @@
 package com.android.settings.fuelgauge;
 
 import android.app.Activity;
+import android.app.LoaderManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.Loader;
 import android.content.pm.PackageManager;
 import android.os.BatteryStats;
 import android.os.Bundle;
@@ -28,6 +30,7 @@ import android.os.UserManager;
 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 +40,16 @@ import com.android.internal.util.ArrayUtils;
 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.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalyDialogFragment;
+import com.android.settings.fuelgauge.anomaly.AnomalyLoader;
+import com.android.settings.fuelgauge.anomaly.AnomalySummaryPreferenceController;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
 
@@ -55,10 +61,11 @@ import java.util.List;
  *
  * 1. Detail battery usage information for app(i.e. usage time, usage amount)
  * 2. Battery related controls for app(i.e uninstall, force stop)
- *
  */
 public class AdvancedPowerUsageDetail extends DashboardFragment implements
-        ButtonActionDialogFragment.AppButtonsDialogListener {
+        ButtonActionDialogFragment.AppButtonsDialogListener,
+        AnomalyDialogFragment.AnomalyDialogListener,
+        LoaderManager.LoaderCallbacks<List<Anomaly>> {
 
     public static final String TAG = "AdvancedPowerUsageDetail";
     public static final String EXTRA_UID = "extra_uid";
@@ -69,6 +76,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
     public static final String EXTRA_ICON_ID = "extra_icon_id";
     public static final String EXTRA_POWER_USAGE_PERCENT = "extra_power_usage_percent";
     public static final String EXTRA_POWER_USAGE_AMOUNT = "extra_power_usage_amount";
+    public static final String EXTRA_ANOMALY_LIST = "extra_anomaly_list";
 
     private static final String KEY_PREF_FOREGROUND = "app_usage_foreground";
     private static final String KEY_PREF_BACKGROUND = "app_usage_background";
@@ -78,6 +86,8 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
     private static final int REQUEST_UNINSTALL = 0;
     private static final int REQUEST_REMOVE_DEVICE_ADMIN = 1;
 
+    private static final int ANOMALY_LOADER = 0;
+
     @VisibleForTesting
     LayoutPreference mHeaderPreference;
     @VisibleForTesting
@@ -87,17 +97,25 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
 
-    private Preference mForegroundPreference;
-    private Preference mBackgroundPreference;
-    private Preference mPowerUsagePreference;
+    @VisibleForTesting
+    Preference mForegroundPreference;
+    @VisibleForTesting
+    Preference mBackgroundPreference;
+    @VisibleForTesting
+    Preference mPowerUsagePreference;
+    @VisibleForTesting
+    AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
     private AppButtonsPreferenceController mAppButtonsPreferenceController;
 
     private DevicePolicyManagerWrapper mDpm;
     private UserManager mUserManager;
     private PackageManager mPackageManager;
+    private List<Anomaly> mAnomalies;
+    private String mPackageName;
 
     public static void startBatteryDetailPage(SettingsActivity caller, PreferenceFragment fragment,
-            BatteryStatsHelper helper, int which, BatteryEntry entry, String usagePercent) {
+            BatteryStatsHelper helper, int which, BatteryEntry entry, String usagePercent,
+            List<Anomaly> anomalies) {
         // Initialize mStats if necessary.
         helper.getStats();
 
@@ -119,7 +137,9 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
             args.putString(EXTRA_PACKAGE_NAME, null);
         } else {
             // populate data for normal app
-            args.putString(EXTRA_PACKAGE_NAME, entry.defaultPackageName);
+            args.putString(EXTRA_PACKAGE_NAME, entry.defaultPackageName != null
+                    ? entry.defaultPackageName
+                    : sipper.mPackages[0]);
         }
 
         args.putInt(EXTRA_UID, sipper.getUid());
@@ -127,6 +147,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
         args.putLong(EXTRA_FOREGROUND_TIME, foregroundTimeMs);
         args.putString(EXTRA_POWER_USAGE_PERCENT, usagePercent);
         args.putInt(EXTRA_POWER_USAGE_AMOUNT, (int) sipper.totalPowerMah);
+        args.putParcelableList(EXTRA_ANOMALY_LIST, anomalies);
 
         caller.startPreferencePanelAsUser(fragment, AdvancedPowerUsageDetail.class.getName(), args,
                 R.string.battery_details_title, null,
@@ -159,14 +180,17 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
+        mPackageName = getArguments().getString(EXTRA_PACKAGE_NAME);
+        mAnomalySummaryPreferenceController = new AnomalySummaryPreferenceController(
+                (SettingsActivity) getActivity(), this, MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL);
         mForegroundPreference = findPreference(KEY_PREF_FOREGROUND);
         mBackgroundPreference = findPreference(KEY_PREF_BACKGROUND);
         mPowerUsagePreference = findPreference(KEY_PREF_POWER_USAGE);
         mHeaderPreference = (LayoutPreference) findPreference(KEY_PREF_HEADER);
 
-        final String packageName = getArguments().getString(EXTRA_PACKAGE_NAME);
-        if (packageName != null) {
-            mAppEntry = mState.getEntry(packageName, UserHandle.myUserId());
+        if (mPackageName != null) {
+            mAppEntry = mState.getEntry(mPackageName, UserHandle.myUserId());
+            initAnomalyInfo();
         }
     }
 
@@ -175,30 +199,29 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
         super.onResume();
 
         initHeader();
+        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(Utils.formatElapsedTime(context, foregroundTimeMs, false));
-        mBackgroundPreference.setSummary(Utils.formatElapsedTime(context, backgroundTimeMs, false));
-        mPowerUsagePreference.setSummary(
-                getString(R.string.battery_detail_power_percentage, usagePercent, powerMah));
+    @VisibleForTesting
+    void initAnomalyInfo() {
+        mAnomalies = getArguments().getParcelableArrayList(EXTRA_ANOMALY_LIST);
+        if (mAnomalies == null) {
+            getLoaderManager().initLoader(ANOMALY_LOADER, Bundle.EMPTY, this);
+        } else if (mAnomalies != null) {
+            mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalies);
+        }
     }
 
     @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 +246,34 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
         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 boolean onPreferenceTreeClick(Preference preference) {
+        if (TextUtils.equals(preference.getKey(), AnomalySummaryPreferenceController.ANOMALY_KEY)) {
+            mAnomalySummaryPreferenceController.onPreferenceTreeClick(preference);
+            return true;
+        }
+        return super.onPreferenceTreeClick(preference);
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.FUELGAUGE_POWER_USAGE_DETAIL;
@@ -235,7 +286,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.power_usage_detail_ia;
+        return R.xml.power_usage_detail;
     }
 
     @Override
@@ -270,4 +321,24 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
             mAppButtonsPreferenceController.handleDialogClick(id);
         }
     }
+
+    @Override
+    public void onAnomalyHandled(Anomaly anomaly) {
+        mAnomalySummaryPreferenceController.hideHighUsagePreference();
+    }
+
+    @Override
+    public Loader<List<Anomaly>> onCreateLoader(int id, Bundle args) {
+        return new AnomalyLoader(getContext(), mPackageName);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<List<Anomaly>> loader, List<Anomaly> data) {
+        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(data);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<List<Anomaly>> loader) {
+
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index 89f03b3533f635864f2369aa7aae8d9f6c0b4970..6b4c8a9270741e1a2dcdc009ad4cd2bb6d385547 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.Utils;
 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/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
index 9d373337c49ae78d0da1d082deeea3e6e91113e3..f7a2b9a58a6668e20c99f2a4a790a73892908958 100644
--- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
@@ -50,11 +50,7 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        String action = intent.getAction();
-        if (mBatteryListener != null && Intent.ACTION_BATTERY_CHANGED.equals(action)
-                && updateBatteryStatus(intent)) {
-            mBatteryListener.onBatteryChanged();
-        }
+        updateBatteryStatus(intent, false /* forceUpdate */);
     }
 
     public void setBatteryChangedListener(OnBatteryChangedListener lsn) {
@@ -62,26 +58,28 @@ public class BatteryBroadcastReceiver extends BroadcastReceiver {
     }
 
     public void register() {
-        mContext.registerReceiver(this,
+        final Intent intent = mContext.registerReceiver(this,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        updateBatteryStatus(intent, true /* forceUpdate */);
     }
 
     public void unRegister() {
         mContext.unregisterReceiver(this);
     }
 
-    private boolean updateBatteryStatus(Intent intent) {
-        if (intent != null) {
+    private void updateBatteryStatus(Intent intent, boolean forceUpdate) {
+        if (intent != null && mBatteryListener != null && Intent.ACTION_BATTERY_CHANGED.equals(
+                intent.getAction())) {
             String batteryLevel = Utils.getBatteryPercentage(intent);
             String batteryStatus = Utils.getBatteryStatus(
                     mContext.getResources(), intent);
-            if (!batteryLevel.equals(mBatteryLevel) || !batteryStatus.equals(mBatteryStatus)) {
+            if (forceUpdate || !batteryLevel.equals(mBatteryLevel) || !batteryStatus.equals(
+                    mBatteryStatus)) {
                 mBatteryLevel = batteryLevel;
                 mBatteryStatus = batteryStatus;
-                return true;
+                mBatteryListener.onBatteryChanged();
             }
         }
-        return false;
     }
 
 }
\ No newline at end of file
diff --git a/src/com/android/settings/fuelgauge/BatteryCellParser.java b/src/com/android/settings/fuelgauge/BatteryCellParser.java
index aaac024f0cb4bc1bb0946e8fe2632cbb815ec715..2b398778ca30ab108aad7908f233c24acf809104 100644
--- a/src/com/android/settings/fuelgauge/BatteryCellParser.java
+++ b/src/com/android/settings/fuelgauge/BatteryCellParser.java
@@ -19,7 +19,6 @@ import android.telephony.ServiceState;
 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 cd5d89bd19626b802c7bbafdc934d0d2b59c2bd3..d4f3fb20fd483e1a5d6fd668956eda41330e98b6 100644
--- a/src/com/android/settings/fuelgauge/BatteryFlagParser.java
+++ b/src/com/android/settings/fuelgauge/BatteryFlagParser.java
@@ -18,7 +18,6 @@ import android.os.BatteryStats.HistoryItem;
 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 04e2c7a2c12a2fa28711c4f160f09ede1d58fcaa..079ab292de2422dc83ceff19b543d524ce8f479c 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -17,54 +17,70 @@
 
 package com.android.settings.fuelgauge;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.BatteryManager;
 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;
+    TextView mBatteryPercentText;
+    @VisibleForTesting
+    TextView mSummary1;
     @VisibleForTesting
-    TextView mSummary;
+    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);
+        mBatteryPercentText = 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));
-        final int batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
-
-        mBatteryMeterView.setBatteryLevel(batteryLevel);
-        mTimeText.setText(Utils.formatPercentage(batteryLevel));
+        quickUpdateHeaderPreference();
     }
 
     @Override
@@ -77,15 +93,43 @@ public class BatteryHeaderPreferenceController extends PreferenceController {
         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));
+        mBatteryPercentText.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);
     }
+
+    public void quickUpdateHeaderPreference() {
+        Intent batteryBroadcast = mContext.registerReceiver(null,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        final int batteryLevel = Utils.getBatteryLevel(batteryBroadcast);
+        final boolean discharging =
+                batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
+
+        // Set battery level and charging status
+        mBatteryMeterView.setBatteryLevel(batteryLevel);
+        mBatteryMeterView.setCharging(!discharging);
+        mBatteryPercentText.setText(Utils.formatPercentage(batteryLevel));
+
+        // clear all the summaries
+        mSummary1.setText("");
+        mSummary2.setText("");
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 8588f7756a1086ef2e3641bf389cf97305bac258..e9a225056eac6c5e7ec6fed25018a71f9b89b19f 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -40,7 +40,6 @@ import android.util.TypedValue;
 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 @@ public class BatteryHistoryChart extends View {
 
         mMaxPercentLabelString = Utils.formatPercentage(100);
         mMinPercentLabelString = Utils.formatPercentage(0);
-        mInfo = BatteryInfo.getBatteryInfo(getContext(), mBatteryBroadcast, mStats,
-                elapsedRealtimeUs);
-        mDrainString = "";
-        mChargeDurationString = "";
-        setContentDescription(mInfo.chargeLabelString);
-
-        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;
+        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;
                     }
-                    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 @@ public class BatteryHistoryChart extends View {
         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 @@ public class BatteryHistoryChart extends View {
 
         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 7d3e1d1538a06eaf30c3f106be8a4c06abf71d5a..3661467887b290cc30ae5560454ccdd59ee9d971 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
@@ -20,7 +20,6 @@ import android.content.Intent;
 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.internal.os.BatteryStatsHelper;
 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 @@ public class BatteryHistoryDetail extends SettingsPreferenceFragment {
     }
 
     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 1f6030e547a4eb5eabb3021bfd318e79f97eb1ab..b944577f5fa2cedc1ab15f15cb1831c7a388a3f9 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -17,26 +17,28 @@
 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;
 import android.util.AttributeSet;
+import android.view.View;
 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
  * subsystem/app type.
  */
 public class BatteryHistoryPreference extends Preference {
+    private static final String TAG = "BatteryHistoryPreference";
 
+    private CharSequence mSummary;
+    private TextView mSummaryView;
+
+    @VisibleForTesting
+    boolean hideSummary;
     @VisibleForTesting
     BatteryInfo mBatteryInfo;
 
@@ -47,22 +49,47 @@ public class BatteryHistoryPreference extends Preference {
     }
 
     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);
+    }
+
+    public void setBottomSummary(CharSequence text) {
+        mSummary = text;
+        if (mSummaryView != null) {
+            mSummaryView.setVisibility(View.VISIBLE);
+            mSummaryView.setText(mSummary);
+        }
+        hideSummary = false;
+    }
+
+    public void hideBottomSummary() {
+        if (mSummaryView != null) {
+            mSummaryView.setVisibility(View.GONE);
+        }
+        hideSummary = true;
     }
 
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
         super.onBindViewHolder(view);
+        final long startTime = System.currentTimeMillis();
         if (mBatteryInfo == null) {
             return;
         }
 
         ((TextView) view.findViewById(R.id.charge)).setText(mBatteryInfo.batteryPercentString);
+        mSummaryView = (TextView) view.findViewById(R.id.bottom_summary);
+        if (mSummary != null) {
+            mSummaryView.setText(mSummary);
+        }
+        if (hideSummary) {
+            mSummaryView.setVisibility(View.GONE);
+        }
         UsageView usageView = (UsageView) view.findViewById(R.id.battery_usage);
         usageView.findViewById(R.id.label_group).setAlpha(.7f);
         mBatteryInfo.bindHistory(usageView);
+        BatteryUtils.logRuntime(TAG, "onBindViewHolder", startTime);
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..a0e56c134a3f61e51697c7681d0ecda19bfbb824
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -0,0 +1,374 @@
+/*
+ * 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.Utils;
+import com.android.settings.graph.UsageView;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.R;
+
+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 static final String LOG_TAG = "BatteryInfo";
+    private long timePeriod;
+
+    public interface Callback {
+        void onBatteryInfoLoaded(BatteryInfo info);
+    }
+
+    public void bindHistory(final UsageView view, BatteryDataParser... parsers) {
+        final Context context = view.getContext();
+        BatteryDataParser parser = new BatteryDataParser() {
+            SparseIntArray points = new SparseIntArray();
+            long startTime;
+            int lastTime = -1;
+            byte lastLevel;
+
+            @Override
+            public void onParsingStarted(long startTime, long endTime) {
+                this.startTime = startTime;
+                timePeriod = endTime - startTime;
+                view.clearPaths();
+                // Initially configure the graph for history only.
+                view.configureGraph((int) timePeriod, 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 projection if we have an estimate.
+                if (remainingTimeUs != 0) {
+                    PowerUsageFeatureProvider provider = FeatureFactory.getFactory(context)
+                            .getPowerUsageFeatureProvider(context);
+                    if (!mCharging && provider.isEnhancedBatteryPredictionEnabled(context)) {
+                        points = provider.getEnhancedBatteryPredictionCurve(context, startTime);
+                    } else {
+                        // Linear extrapolation.
+                        if (lastTime >= 0) {
+                            points.put(lastTime, lastLevel);
+                            points.put((int) (timePeriod +
+                                            BatteryUtils.convertUsToMs(remainingTimeUs)),
+                                    mCharging ? 100 : 0);
+                        }
+                    }
+                }
+
+                // If we have a projection, reconfigure the graph to show it.
+                if (points != null && points.size() > 0) {
+                    int maxTime = points.keyAt(points.size() - 1);
+                    view.configureGraph(maxTime, 100);
+                    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, parserList);
+        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) {
+        final long startTime = System.currentTimeMillis();
+        BatteryStatsHelper statsHelper = new BatteryStatsHelper(context, true);
+        statsHelper.create((Bundle) null);
+        BatteryUtils.logRuntime(LOG_TAG, "time to make batteryStatsHelper", startTime);
+        BatteryInfo.getBatteryInfo(context, callback, statsHelper, shortString);
+    }
+
+    public static void getBatteryInfo(final Context context, final Callback callback,
+            BatteryStatsHelper statsHelper, boolean shortString) {
+        final long startTime = System.currentTimeMillis();
+        BatteryStats stats = statsHelper.getStats();
+        BatteryUtils.logRuntime(LOG_TAG, "time for getStats", startTime);
+        getBatteryInfo(context, callback, stats, 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) {
+                final long startTime = System.currentTimeMillis();
+                PowerUsageFeatureProvider provider =
+                        FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);
+                final long elapsedRealtimeUs =
+                        BatteryUtils.convertMsToUs(SystemClock.elapsedRealtime());
+
+                Intent batteryBroadcast = context.registerReceiver(null,
+                        new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+                // 0 means we are discharging, anything else means charging
+                boolean discharging =
+                        batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
+
+                if (discharging && provider != null
+                        && provider.isEnhancedBatteryPredictionEnabled(context)) {
+                    final long prediction = provider.getEnhancedBatteryPrediction(context);
+                    BatteryUtils.logRuntime(LOG_TAG, "time for enhanced BatteryInfo", startTime);
+                    return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+                            elapsedRealtimeUs, shortString, BatteryUtils.convertMsToUs(prediction),
+                            true);
+                } else {
+                    long prediction = discharging
+                            ? stats.computeBatteryTimeRemaining(elapsedRealtimeUs) : 0;
+                    BatteryUtils.logRuntime(LOG_TAG, "time for regular BatteryInfo", startTime);
+                    return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+                            elapsedRealtimeUs, shortString, prediction, false);
+                }
+            }
+
+            @Override
+            protected void onPostExecute(BatteryInfo batteryInfo) {
+                final long startTime = System.currentTimeMillis();
+                callback.onBatteryInfoLoaded(batteryInfo);
+                BatteryUtils.logRuntime(LOG_TAG, "time for callback", startTime);
+            }
+        }.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) {
+        final long startTime = System.currentTimeMillis();
+        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();
+
+        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(chargeTime), 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 = info.batteryLevel == 100 ? info.batteryPercentString :
+                        resources.getString(R.string.power_charging, info.batteryPercentString,
+                                chargeStatusLabel);
+            }
+        }
+        BatteryUtils.logRuntime(LOG_TAG, "time for getBatteryInfo", startTime);
+        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, BatteryDataParser... parsers) {
+        long startWalltime = 0;
+        long endWalltime = 0;
+        long historyStart = 0;
+        long historyEnd = 0;
+        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()) {
+                    lastInteresting = pos;
+                    historyEnd = rec.time;
+                }
+            }
+        }
+        stats.finishIteratingHistoryLocked();
+        endWalltime = lastWallTime + historyEnd - lastRealtime;
+
+        int i = 0;
+        final int N = lastInteresting;
+
+        for (int j = 0; j < parsers.length; j++) {
+            parsers[j].onParsingStarted(startWalltime, endWalltime);
+        }
+        if (endWalltime > startWalltime && stats.startIteratingHistoryLocked()) {
+            final HistoryItem rec = new HistoryItem();
+            while (stats.getNextHistoryLocked(rec) && i < N) {
+                if (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 0000000000000000000000000000000000000000..ce22a8cf03f36db19d0561784ca4ee4cb342a4f3
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.BatteryManager;
+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;
+    private static final String LOG_TAG = "BatteryInfoLoader";
+
+    public BatteryInfoLoader(Context context, BatteryStatsHelper batteryStatsHelper) {
+        super(context);
+        mStatsHelper = batteryStatsHelper;
+    }
+
+    @Override
+    protected void onDiscardResult(BatteryInfo result) {
+
+    }
+
+    @Override
+    public BatteryInfo loadInBackground() {
+        final long startTime = System.currentTimeMillis();
+        Context context = getContext();
+        PowerUsageFeatureProvider powerUsageFeatureProvider =
+                FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);
+
+        // Stuff we always need to get BatteryInfo
+        Intent batteryBroadcast = context.registerReceiver(null,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        final long elapsedRealtimeUs = BatteryUtils.convertMsToUs(SystemClock.elapsedRealtime());
+        BatteryInfo batteryInfo;
+
+        // 0 means we are discharging, anything else means charging
+        boolean discharging = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
+        // Get enhanced prediction if available and discharging, otherwise use the old code
+        Cursor cursor = null;
+        if (discharging && powerUsageFeatureProvider != null &&
+                powerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(context)) {
+            final Uri queryUri = powerUsageFeatureProvider.getEnhancedBatteryPredictionUri();
+            cursor = context.getContentResolver().query(queryUri, null, null, null, null);
+        }
+        BatteryStats stats = mStatsHelper.getStats();
+        BatteryUtils.logRuntime(LOG_TAG, "BatteryInfoLoader post query", startTime);
+        if (cursor != null && cursor.moveToFirst()) {
+            long enhancedEstimate = powerUsageFeatureProvider.getTimeRemainingEstimate(cursor);
+            batteryInfo = BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+                    elapsedRealtimeUs, false /* shortString */,
+                    BatteryUtils.convertMsToUs(enhancedEstimate), true /* basedOnUsage */);
+        } else {
+            batteryInfo = BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+                    elapsedRealtimeUs, false /* shortString */,
+                    discharging ? stats.computeBatteryTimeRemaining(elapsedRealtimeUs) : 0,
+                    false /* basedOnUsage */);
+        }
+        BatteryUtils.logRuntime(LOG_TAG, "BatteryInfoLoader.loadInBackground", startTime);
+        return batteryInfo;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index 09f7c7a1475b6ee203759c40f3fbecc5b2043fb4..353b3d7ab69ea4fa2b28e41a2b7e56455a11be8e 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -78,6 +78,11 @@ public class BatteryMeterView extends ImageView {
 
     public void setCharging(boolean charging) {
         mDrawable.setCharging(charging);
+        postInvalidate();
+    }
+
+    public boolean getCharging() {
+        return mDrawable.getCharging();
     }
 
     public static class BatteryMeterDrawable extends BatteryMeterDrawableBase {
diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java
index 34c9a269b8b5969b7b85c574effff4cd7a34f6ff..bb7e678fbebd92bbc88a1fd0534738bc470276e0 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverController.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverController.java
@@ -15,39 +15,31 @@
  */
 package com.android.settings.fuelgauge;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
 import android.database.ContentObserver;
-import android.os.BatteryManager;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.provider.Settings;
 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.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 static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGING;
+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 BatterySaverController extends PreferenceController implements
-        Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop {
+        Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop,
+        BatterySaverReceiver.BatterySaverListener {
     private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
-    private static final String TAG = "BatterySaverController";
-    private static final boolean DEBUG = false;
 
-    private final BatteryStateChangeReceiver mBatteryStateChangeReceiver;
+    private final BatterySaverReceiver mBatteryStateChangeReceiver;
     private final PowerManager mPowerManager;
     private MasterSwitchPreference mBatterySaverPref;
 
@@ -56,7 +48,8 @@ public class BatterySaverController extends PreferenceController implements
 
         lifecycle.addObserver(this);
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
-        mBatteryStateChangeReceiver = new BatteryStateChangeReceiver();
+        mBatteryStateChangeReceiver = new BatterySaverReceiver(context);
+        mBatteryStateChangeReceiver.setBatterySaverListener(this);
     }
 
     @Override
@@ -137,40 +130,14 @@ public class BatterySaverController extends PreferenceController implements
         }
     };
 
-    private final class BatteryStateChangeReceiver extends BroadcastReceiver {
-        private boolean mRegistered;
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (DEBUG) {
-                Log.d(TAG, "Received " + intent.getAction());
-            }
-            final String action = intent.getAction();
-            if (action.equals(ACTION_POWER_SAVE_MODE_CHANGING)) {
-                mBatterySaverPref.setChecked(mPowerManager.isPowerSaveMode());
-                updateSummary();
-            } else if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
-                final int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
-                // disable BSM switch if phone is plugged in or at 100% while plugged in
-                final boolean enabled = !(status == BatteryManager.BATTERY_STATUS_CHARGING
-                        || status == BatteryManager.BATTERY_STATUS_FULL);
-
-                mBatterySaverPref.setSwitchEnabled(enabled);
-            }
-        }
-
-        public void setListening(boolean listening) {
-            if (listening && !mRegistered) {
-                final IntentFilter ifilter = new IntentFilter();
-                ifilter.addAction(Intent.ACTION_BATTERY_CHANGED);
-                ifilter.addAction(ACTION_POWER_SAVE_MODE_CHANGING);
-                mContext.registerReceiver(this, ifilter);
-                mRegistered = true;
-            } else if (!listening && mRegistered) {
-                mContext.unregisterReceiver(this);
-                mRegistered = false;
-            }
-        }
+    @Override
+    public void onPowerSaveModeChanged() {
+        mBatterySaverPref.setChecked(mPowerManager.isPowerSaveMode());
+        updateSummary();
+    }
 
+    @Override
+    public void onBatteryChanged(boolean pluggedIn) {
+        mBatterySaverPref.setSwitchEnabled(!pluggedIn);
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatterySaverReceiver.java b/src/com/android/settings/fuelgauge/BatterySaverReceiver.java
new file mode 100644
index 0000000000000000000000000000000000000000..22544389cf44c27e6d005afad8d813f521e52d77
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatterySaverReceiver.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.fuelgauge;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.BatteryManager;
+import android.os.PowerManager;
+import android.util.Log;
+
+public class BatterySaverReceiver extends BroadcastReceiver {
+    private static final String TAG = "BatterySaverReceiver";
+    private static final boolean DEBUG = false;
+    private boolean mRegistered;
+    private Context mContext;
+    private BatterySaverListener mBatterySaverListener;
+
+    public BatterySaverReceiver(Context context) {
+        mContext = context;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (DEBUG) Log.d(TAG, "Received " + intent.getAction());
+        String action = intent.getAction();
+        if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGING.equals(action)) {
+            if (mBatterySaverListener != null) {
+                mBatterySaverListener.onPowerSaveModeChanged();
+            }
+        } else if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
+            // disable BSM switch if phone is plugged in
+            if (mBatterySaverListener != null) {
+                final boolean pluggedIn = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0;
+                mBatterySaverListener.onBatteryChanged(pluggedIn);
+            }
+        }
+    }
+
+    public void setListening(boolean listening) {
+        if (listening && !mRegistered) {
+            final IntentFilter ifilter = new IntentFilter();
+            ifilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGING);
+            ifilter.addAction(Intent.ACTION_BATTERY_CHANGED);
+            mContext.registerReceiver(this, ifilter);
+            mRegistered = true;
+        } else if (!listening && mRegistered) {
+            mContext.unregisterReceiver(this);
+            mRegistered = false;
+        }
+    }
+
+    public void setBatterySaverListener(BatterySaverListener lsn) {
+        mBatterySaverListener = lsn;
+    }
+
+    interface BatterySaverListener {
+        void onPowerSaveModeChanged();
+        void onBatteryChanged(boolean pluggedIn);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
index 6b7ddf95696745552e8324d879134860f0198886..88dab4943552aa851f48df6769ac9bb42dfbac07 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverSettings.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverSettings.java
@@ -16,20 +16,17 @@
 
 package com.android.settings.fuelgauge;
 
-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.database.ContentObserver;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.BatteryManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.provider.Settings.Global;
+import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.widget.Switch;
 
@@ -43,10 +40,8 @@ import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.notification.SettingPref;
 import com.android.settings.widget.SwitchBar;
 
-import static android.os.PowerManager.ACTION_POWER_SAVE_MODE_CHANGING;
-
 public class BatterySaverSettings extends SettingsPreferenceFragment
-        implements SwitchBar.OnSwitchChangeListener {
+        implements SwitchBar.OnSwitchChangeListener, BatterySaverReceiver.BatterySaverListener {
     private static final String TAG = "BatterySaverSettings";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
     private static final String KEY_TURN_ON_AUTOMATICALLY = "turn_on_automatically";
@@ -54,15 +49,16 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
 
     private final Handler mHandler = new Handler();
     private final SettingsObserver mSettingsObserver = new SettingsObserver(mHandler);
-    private final Receiver mReceiver = new Receiver();
 
+    @VisibleForTesting
+    SwitchBar mSwitchBar;
     private Context mContext;
     private boolean mCreated;
     private SettingPref mTriggerPref;
-    private SwitchBar mSwitchBar;
     private Switch mSwitch;
     private boolean mValidListener;
     private PowerManager mPowerManager;
+    private BatterySaverReceiver mReceiver;
 
     @Override
     public int getMetricsCategory() {
@@ -101,6 +97,8 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
         mTriggerPref.init(this);
 
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        mReceiver = new BatterySaverReceiver(mContext);
+        mReceiver.setBatterySaverListener(this);
     }
 
     @Override
@@ -187,37 +185,14 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
         }
     };
 
-    private final class Receiver extends BroadcastReceiver {
-
-        private boolean mRegistered;
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (DEBUG) Log.d(TAG, "Received " + intent.getAction());
-            String action = intent.getAction();
-            if (action.equals(ACTION_POWER_SAVE_MODE_CHANGING)) {
-                mHandler.post(mUpdateSwitch);
-            } else if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
-                final int status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
-                // disable BSM switch if phone is plugged in or at 100% while plugged in
-                mSwitchBar.setEnabled(
-                        !(status == BatteryManager.BATTERY_STATUS_CHARGING
-                                || status == BatteryManager.BATTERY_STATUS_FULL));
-            }
-        }
-        public void setListening(boolean listening) {
-            if (listening && !mRegistered) {
-                final IntentFilter ifilter = new IntentFilter();
-                ifilter.addAction(ACTION_POWER_SAVE_MODE_CHANGING);
-                ifilter.addAction(Intent.ACTION_BATTERY_CHANGED);
-                mContext.registerReceiver(this, ifilter);
-                mRegistered = true;
-            } else if (!listening && mRegistered) {
-                mContext.unregisterReceiver(this);
-                mRegistered = false;
-            }
-        }
+    @Override
+    public void onPowerSaveModeChanged() {
+        mHandler.post(mUpdateSwitch);
+    }
 
+    @Override
+    public void onBatteryChanged(boolean pluggedIn) {
+        mSwitchBar.setEnabled(!pluggedIn);
     }
 
     private final class SettingsObserver extends ContentObserver {
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
index b99519b64bfe5bf74f90c55da309e28f20a4829f..b81f2823b888d4c192d247e696ee4523d505da51 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
@@ -31,19 +31,22 @@ import com.android.settings.utils.AsyncLoader;
 public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
     @VisibleForTesting
     UserManager mUserManager;
-    private Bundle mBundle;
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
 
-    public BatteryStatsHelperLoader(Context context, Bundle bundle) {
+    public BatteryStatsHelperLoader(Context context) {
         super(context);
-        mBundle = bundle;
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mBatteryUtils = BatteryUtils.getInstance(context);
     }
 
     @Override
     public BatteryStatsHelper loadInBackground() {
-        final BatteryStatsHelper statsHelper = new BatteryStatsHelper(getContext(), true);
+        Context context = getContext();
+        final BatteryStatsHelper statsHelper = new BatteryStatsHelper(context,
+                true /* collectBatteryBroadcast */);
+        mBatteryUtils.initBatteryStatsHelper(statsHelper, null /* bundle */, mUserManager);
 
-        initBatteryStatsHelper(statsHelper);
         return statsHelper;
     }
 
@@ -52,9 +55,4 @@ public class BatteryStatsHelperLoader extends AsyncLoader<BatteryStatsHelper> {
 
     }
 
-    @VisibleForTesting
-    void initBatteryStatsHelper(BatteryStatsHelper statsHelper) {
-        statsHelper.create(mBundle);
-        statsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, mUserManager.getUserProfiles());
-    }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 9a4db1ecd66f1536006eadb07d4ddbf69bab99ad..a041543aba2abfc2a826a69a45641d7026357d7b 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -15,12 +15,18 @@
  */
 package com.android.settings.fuelgauge;
 
+import android.app.AppOpsManager;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.BatteryStats;
+import android.os.Bundle;
+import android.os.Build;
 import android.os.SystemClock;
+import android.os.UserManager;
 import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
 import android.support.annotation.VisibleForTesting;
 import android.text.format.DateUtils;
 import android.util.Log;
@@ -28,6 +34,9 @@ import android.util.SparseLongArray;
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
+import com.android.internal.util.ArrayUtils;
+import com.android.settings.R;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
 import com.android.settings.overlay.FeatureFactory;
 
 import java.lang.annotation.Retention;
@@ -40,6 +49,9 @@ import java.util.List;
  * Utils for battery operation
  */
 public class BatteryUtils {
+    public static final int UID_NULL = -1;
+    public static final int SDK_NULL = -1;
+
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({StatusType.FOREGROUND,
             StatusType.BACKGROUND,
@@ -58,6 +70,7 @@ public class BatteryUtils {
     private static BatteryUtils sInstance;
 
     private PackageManager mPackageManager;
+    private AppOpsManager mAppOpsManager;
     @VisibleForTesting
     PowerUsageFeatureProvider mPowerUsageFeatureProvider;
 
@@ -71,6 +84,7 @@ public class BatteryUtils {
     @VisibleForTesting
     BatteryUtils(Context context) {
         mPackageManager = context.getPackageManager();
+        mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
         mPowerUsageFeatureProvider = FeatureFactory.getFactory(
                 context).getPowerUsageFeatureProvider(context);
     }
@@ -116,7 +130,10 @@ public class BatteryUtils {
         }
         Log.v(TAG, "foreground time(us): " + timeUs);
 
-        return convertUsToMs(timeUs);
+        // Return the min value of STATE_TOP time and foreground activity time, since both of these
+        // time have some errors.
+        return convertUsToMs(
+                Math.min(timeUs, getForegroundActivityTotalTimeUs(uid, rawRealTimeUs)));
     }
 
     /**
@@ -138,7 +155,8 @@ public class BatteryUtils {
                         && sipper.drainType != BatterySipper.DrainType.SCREEN
                         && sipper.drainType != BatterySipper.DrainType.UNACCOUNTED
                         && sipper.drainType != BatterySipper.DrainType.BLUETOOTH
-                        && sipper.drainType != BatterySipper.DrainType.WIFI) {
+                        && sipper.drainType != BatterySipper.DrainType.WIFI
+                        && sipper.drainType != BatterySipper.DrainType.IDLE) {
                     // Don't add it if it is overcounted, unaccounted, wifi, bluetooth, or screen
                     proportionalSmearPowerMah += sipper.totalPowerMah;
                 }
@@ -160,13 +178,13 @@ public class BatteryUtils {
      */
     @VisibleForTesting
     void smearScreenBatterySipper(List<BatterySipper> sippers, BatterySipper screenSipper) {
-        final long rawRealtimeMs = SystemClock.elapsedRealtime();
         long totalActivityTimeMs = 0;
         final SparseLongArray activityTimeArray = new SparseLongArray();
         for (int i = 0, size = sippers.size(); i < size; i++) {
             final BatteryStats.Uid uid = sippers.get(i).uidObj;
             if (uid != null) {
-                final long timeMs = getForegroundActivityTotalTimeMs(uid, rawRealtimeMs);
+                final long timeMs = getProcessTimeMs(StatusType.FOREGROUND, uid,
+                        BatteryStats.STATS_SINCE_CHARGED);
                 activityTimeArray.put(uid.getUid(), timeMs);
                 totalActivityTimeMs += timeMs;
             }
@@ -220,9 +238,70 @@ public class BatteryUtils {
         return (powerUsageMah / (totalPowerMah - hiddenPowerMah)) * dischargeAmount;
     }
 
+    /**
+     * Calculate the whole running time in the state {@code statsType}
+     *
+     * @param batteryStatsHelper utility class that contains the data
+     * @param statsType          state that we want to calculate the time for
+     * @return the running time in millis
+     */
+    public long calculateRunningTimeBasedOnStatsType(BatteryStatsHelper batteryStatsHelper,
+            int statsType) {
+        final long elapsedRealtimeUs = 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];
+    }
+
+    /**
+     * Find the targetSdkVersion for package with name {@code packageName}
+     *
+     * @return the targetSdkVersion, or {@link #SDK_NULL} if {@code packageName} doesn't exist
+     */
+    public int getTargetSdkVersion(final String packageName) {
+        try {
+            ApplicationInfo info = mPackageManager.getApplicationInfo(packageName,
+                    PackageManager.GET_META_DATA);
+
+            return info.targetSdkVersion;
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Cannot find package: " + packageName, e);
+        }
+
+        return SDK_NULL;
+    }
+
+    /**
+     * Check whether background restriction is enabled
+     */
+    public boolean isBackgroundRestrictionEnabled(final int targetSdkVersion, final int uid,
+            final String packageName) {
+        if (targetSdkVersion >= Build.VERSION_CODES.O) {
+            return true;
+        }
+        final int mode = mAppOpsManager
+                .checkOpNoThrow(AppOpsManager.OP_RUN_IN_BACKGROUND, uid, packageName);
+        return mode == AppOpsManager.MODE_IGNORED || mode == AppOpsManager.MODE_ERRORED;
+    }
+
     /**
      * Sort the {@code usageList} based on {@link BatterySipper#totalPowerMah}
-     * @param usageList
      */
     public void sortUsageList(List<BatterySipper> usageList) {
         Collections.sort(usageList, new Comparator<BatterySipper>() {
@@ -246,23 +325,64 @@ public class BatteryUtils {
 
     }
 
-    private long convertUsToMs(long timeUs) {
+    public static void logRuntime(String tag, String message, long startTime) {
+        Log.d(tag, message + ": " + (System.currentTimeMillis() - startTime) + "ms");
+    }
+
+    /**
+     * 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;
+        }
+    }
+
+    @StringRes
+    public int getSummaryResIdFromAnomalyType(@Anomaly.AnomalyType int type) {
+        switch (type) {
+            case Anomaly.AnomalyType.WAKE_LOCK:
+                return R.string.battery_abnormal_wakelock_summary;
+            case Anomaly.AnomalyType.WAKEUP_ALARM:
+                return R.string.battery_abnormal_wakeup_alarm_summary;
+            case Anomaly.AnomalyType.BLUETOOTH_SCAN:
+                return R.string.battery_abnormal_location_summary;
+            default:
+                throw new IllegalArgumentException("Incorrect anomaly type: " + type);
+        }
+    }
+
+    public static long convertUsToMs(long timeUs) {
         return timeUs / 1000;
     }
 
-    private long convertMsToUs(long timeMs) {
+    public static long convertMsToUs(long timeMs) {
         return timeMs * 1000;
     }
 
+    public void initBatteryStatsHelper(BatteryStatsHelper statsHelper, Bundle bundle,
+            UserManager userManager) {
+        statsHelper.create(bundle);
+        statsHelper.clearStats();
+        statsHelper.refreshStats(BatteryStats.STATS_SINCE_CHARGED, userManager.getUserProfiles());
+    }
+
     private boolean isDataCorrupted() {
-        return mPackageManager == null;
+        return mPackageManager == null || mAppOpsManager == null;
     }
 
     @VisibleForTesting
-    long getForegroundActivityTotalTimeMs(BatteryStats.Uid uid, long rawRealtimeMs) {
+    long getForegroundActivityTotalTimeUs(BatteryStats.Uid uid, long rawRealtimeUs) {
         final BatteryStats.Timer timer = uid.getForegroundActivityTimer();
         if (timer != null) {
-            return timer.getTotalTimeLocked(rawRealtimeMs, BatteryStats.STATS_SINCE_CHARGED);
+            return timer.getTotalTimeLocked(rawRealtimeUs, BatteryStats.STATS_SINCE_CHARGED);
         }
 
         return 0;
diff --git a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f4758a40b7e173d8c06096bfd18cea54493983e
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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
+        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 b124c8150b0b291c020118a0b0e61ea5ce29fc79..322c908ecc53781f4eec9bf09b58b985ebf1c48d 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -21,9 +21,11 @@ import android.graphics.drawable.ColorDrawable;
 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;
+
 import com.android.settings.R;
 import com.android.settings.TintablePreference;
 import com.android.settings.Utils;
@@ -41,6 +43,7 @@ public class PowerGaugePreference extends TintablePreference {
     private BatteryEntry mInfo;
     private CharSequence mContentDescription;
     private CharSequence mProgress;
+    private boolean mShowAnomalyIcon;
 
     public PowerGaugePreference(Context context, Drawable icon, CharSequence contentDescription,
             BatteryEntry info) {
@@ -63,6 +66,7 @@ public class PowerGaugePreference extends TintablePreference {
         mInfo = info;
         mContentDescription = contentDescription;
         mIconSize = context.getResources().getDimensionPixelSize(R.dimen.app_icon_size);
+        mShowAnomalyIcon = false;
     }
 
     public void setContentDescription(String name) {
@@ -88,6 +92,15 @@ public class PowerGaugePreference extends TintablePreference {
         return mProgress;
     }
 
+    public void shouldShowAnomalyIcon(boolean showAnomalyIcon) {
+        mShowAnomalyIcon = showAnomalyIcon;
+        notifyChanged();
+    }
+
+    public boolean showAnomalyIcon() {
+        return mShowAnomalyIcon;
+    }
+
     BatteryEntry getInfo() {
         return mInfo;
     }
@@ -98,7 +111,14 @@ public class PowerGaugePreference extends TintablePreference {
         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/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index 0940e19d4803fe3057f1b7017d4f188e26d684bd..712b9ad8e1976d296c2926e13268062b9f54dfd0 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -15,7 +15,10 @@ package com.android.settings.fuelgauge;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.os.BatteryManager;
 import android.os.BatteryStats;
 import android.os.Bundle;
 import android.os.Handler;
@@ -69,9 +72,9 @@ public class PowerUsageAdvanced extends PowerUsageBase {
             UsageType.UNACCOUNTED,
             UsageType.OVERCOUNTED};
 
+    @VisibleForTesting BatteryHistoryPreference mHistPref;
+    @VisibleForTesting PreferenceGroup mUsageListGroup;
     private BatteryUtils mBatteryUtils;
-    private BatteryHistoryPreference mHistPref;
-    private PreferenceGroup mUsageListGroup;
     private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
     private PackageManager mPackageManager;
     private UserManager mUserManager;
@@ -164,13 +167,27 @@ public class PowerUsageAdvanced extends PowerUsageBase {
 
     @Override
     protected void refreshUi() {
+        final long startTime = System.currentTimeMillis();
         final Context context = getContext();
         if (context == null) {
             return;
         }
         updatePreference(mHistPref);
         refreshPowerUsageDataList(mStatsHelper, mUsageListGroup);
+
+        Intent batteryIntent =
+                context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        final boolean plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) != 0;
+
+        if (mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(context) && !plugged) {
+            mHistPref.setBottomSummary(
+                    mPowerUsageFeatureProvider.getAdvancedUsageScreenInfoString());
+        } else {
+            mHistPref.hideBottomSummary();
+        }
+
         BatteryEntry.startRequestQueue();
+        BatteryUtils.logRuntime(TAG, "refreshUI", startTime);
     }
 
     @VisibleForTesting
@@ -311,7 +328,8 @@ public class PowerUsageAdvanced extends PowerUsageBase {
 
         return usageType == UsageType.CELL
                 || usageType == UsageType.BLUETOOTH
-                || usageType == UsageType.WIFI;
+                || usageType == UsageType.WIFI
+                || usageType == UsageType.APP;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
new file mode 100644
index 0000000000000000000000000000000000000000..ef7110e69afe8754084d4f20d4a73e65caab80a4
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
+    @VisibleForTesting
+    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);
+        mBatteryUtils = BatteryUtils.getInstance(context);
+    }
+
+    @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() {
+        mAbnormalListGroup.removeAll();
+        for (int i = 0, size = mAnomalies.size(); i < size; i++) {
+            final Anomaly anomaly = mAnomalies.get(i);
+            Preference pref = new AnomalyPreference(getPrefContext(), anomaly);
+            pref.setSummary(mBatteryUtils.getSummaryResIdFromAnomalyType(anomaly.type));
+            Drawable icon = getBadgedIcon(anomaly.packageName, UserHandle.getUserId(anomaly.uid));
+            if (icon != null) {
+                pref.setIcon(icon);
+            }
+
+            mAbnormalListGroup.addPreference(pref);
+        }
+    }
+
+    @Override
+    public void onAnomalyHandled(Anomaly anomaly) {
+        mAnomalies.remove(anomaly);
+        refreshUi();
+    }
+
+    @VisibleForTesting
+    Drawable getBadgedIcon(String packageName, int userId) {
+        try {
+            final ApplicationInfo appInfo = mPackageManager.getApplicationInfo(packageName,
+                    PackageManager.GET_META_DATA);
+            return mIconDrawableFactory.getBadgedIcon(appInfo, userId);
+        } catch (PackageManager.NameNotFoundException e) {
+            return mPackageManager.getDefaultActivityIcon();
+        }
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java
index 060abddb18596b2a32def44ec474bc684322758e..88edb7a3c45c06b0d6e5fdc1106da68511db2d5b 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -37,6 +37,7 @@ public abstract class PowerUsageBase extends DashboardFragment
     // +1 to allow ordering for PowerUsageSummary.
     @VisibleForTesting
     static final int MENU_STATS_REFRESH = Menu.FIRST + 1;
+    private static final String TAG = "PowerUsageBase";
 
     protected BatteryStatsHelper mStatsHelper;
     protected UserManager mUm;
@@ -82,19 +83,6 @@ public abstract class PowerUsageBase extends DashboardFragment
         mBatteryBroadcastReceiver.unRegister();
     }
 
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (getActivity().isChangingConfigurations()) {
-            mStatsHelper.storeState();
-        }
-    }
-
     protected void restartBatteryStatsLoader() {
         getLoaderManager().restartLoader(0, Bundle.EMPTY, this);
     }
@@ -102,13 +90,15 @@ public abstract class PowerUsageBase extends DashboardFragment
     protected abstract void refreshUi();
 
     protected void updatePreference(BatteryHistoryPreference historyPref) {
+        final long startTime = System.currentTimeMillis();
         historyPref.setStats(mStatsHelper);
+        BatteryUtils.logRuntime(TAG, "updatePreference", startTime);
     }
 
     @Override
     public Loader<BatteryStatsHelper> onCreateLoader(int id,
             Bundle args) {
-        return new BatteryStatsHelperLoader(getContext(), args);
+        return new BatteryStatsHelperLoader(getContext());
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index 7cb6c000ea62d8a1b8c9749937112578fb4d0525..6d7e1e8dac3f802609184c05e008d0bf760aaf57 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -16,7 +16,12 @@
 
 package com.android.settings.fuelgauge;
 
+import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.SparseIntArray;
+
 import com.android.internal.os.BatterySipper;
 
 /**
@@ -57,4 +62,57 @@ public interface PowerUsageFeatureProvider {
      * Check whether the toggle for power accounting is enabled
      */
     boolean isPowerAccountingToggleEnabled();
+
+    /**
+     * Returns an improved prediction for battery time remaining.
+     */
+    long getEnhancedBatteryPrediction(Context context);
+
+    /**
+     * Returns an improved projection curve for future battery level.
+     * @param zeroTime timestamps (array keys) are shifted by this amount
+     */
+    SparseIntArray getEnhancedBatteryPredictionCurve(Context context, long zeroTime);
+
+    /**
+     * 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);
+
+    /**
+     * 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);
+
+    /**
+     * Returns the string to show in the advanced usage battery page when enhanced estimates are
+     * enabled. This string notifies users that the estimate is using enhanced prediction.
+     */
+    String getAdvancedUsageScreenInfoString();
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index be38855e02434161b4fc6ef645501e368a9defc9..08143645ef7b71b9520086b74728223321d028d7 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -19,7 +19,11 @@ package com.android.settings.fuelgauge;
 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 android.util.SparseIntArray;
+
 import com.android.internal.os.BatterySipper;
 import com.android.internal.util.ArrayUtils;
 
@@ -84,4 +88,49 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
     public boolean isPowerAccountingToggleEnabled() {
         return true;
     }
+
+    @Override
+    public long getEnhancedBatteryPrediction(Context context) {
+        return -1;
+    }
+
+    @Override
+    public SparseIntArray getEnhancedBatteryPredictionCurve(Context context, long zeroTime) {
+        return null;
+    }
+
+    @Override
+    public boolean isEnhancedBatteryPredictionEnabled(Context context) {
+        return false;
+    }
+
+    @Override
+    public Uri getEnhancedBatteryPredictionUri() {
+        return null;
+    }
+
+    @Override
+    public long getTimeRemainingEstimate(Cursor cursor) {
+        return 0;
+    }
+
+    @Override
+    public String getEnhancedEstimateDebugString(String timeRemaining) {
+        return null;
+    }
+
+    @Override
+    public boolean isEstimateDebugEnabled() {
+        return false;
+    }
+
+    @Override
+    public String getOldEstimateDebugString(String timeRemaining) {
+        return null;
+    }
+
+    @Override
+    public String getAdvancedUsageScreenInfoString() {
+        return null;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 4a4d4de9db232e425714e86beb110aa62cb994a6..86c3a32d5fe42ebd0091672e0ab43e04c8e8d63e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -17,17 +17,17 @@
 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;
 import android.os.Bundle;
 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 +35,18 @@ import android.support.v7.preference.Preference;
 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.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatterySipper.DrainType;
@@ -55,13 +60,17 @@ import com.android.settings.applications.ManageApplications;
 import com.android.settings.core.PreferenceController;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.display.AmbientDisplayPreferenceController;
 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.AnomalyDetectionPolicy;
+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;
@@ -71,7 +80,8 @@ import java.util.List;
  * 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";
 
@@ -88,8 +98,14 @@ public class PowerUsageSummary extends PowerUsageBase {
 
     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_AMBIENT_DISPLAY = "ambient_display_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 +114,7 @@ public class PowerUsageSummary extends PowerUsageBase {
     @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 +126,125 @@ public class PowerUsageSummary extends PowerUsageBase {
     PowerUsageFeatureProvider mPowerFeatureProvider;
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
+    @VisibleForTesting
+    LayoutPreference mBatteryLayoutPref;
 
-    private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
-    private LayoutPreference mBatteryLayoutPref;
-    private PreferenceGroup mAppListGroup;
+    /**
+     * SparseArray that maps uid to {@link Anomaly}, so we could find {@link Anomaly} by uid
+     */
+    @VisibleForTesting
+    SparseArray<List<Anomaly>> mAnomalySparseArray;
+    @VisibleForTesting
+    PreferenceGroup mAppListGroup;
+    @VisibleForTesting
+    BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
+    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);
+                    refreshAnomalyIcon();
+                }
+
+                @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(),
+                                    BatteryUtils.convertUsToMs(oldInfo.remainingTimeUs))));
+
+                    // for this one we can just set the string directly
+                    summary2.setText(mPowerFeatureProvider.getEnhancedEstimateDebugString(
+                            Formatter.formatShortElapsedTime(getContext(),
+                                    BatteryUtils.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);
+
         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 +275,9 @@ public class PowerUsageSummary extends PowerUsageBase {
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
+        if (mAnomalySummaryPreferenceController.onPreferenceTreeClick(preference)) {
+            return true;
+        }
         if (KEY_BATTERY_HEADER.equals(preference.getKey())) {
             performBatteryHeaderClick();
             return true;
@@ -173,7 +287,8 @@ public class PowerUsageSummary extends PowerUsageBase {
         PowerGaugePreference pgp = (PowerGaugePreference) preference;
         BatteryEntry entry = pgp.getInfo();
         AdvancedPowerUsageDetail.startBatteryDetailPage((SettingsActivity) getActivity(),
-                this, mStatsHelper, mStatsType, entry, pgp.getPercent());
+                this, mStatsHelper, mStatsType, entry, pgp.getPercent(),
+                mAnomalySparseArray.get(entry.sipper.getUid()));
         return super.onPreferenceTreeClick(preference);
     }
 
@@ -190,12 +305,17 @@ public class PowerUsageSummary extends PowerUsageBase {
     @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));
         controllers.add(new BatterySaverController(context, getLifecycle()));
         controllers.add(new BatteryPercentagePreferenceController(context));
+        controllers.add(new AmbientDisplayPreferenceController(
+                context,
+                new AmbientDisplayConfiguration(context),
+                KEY_AMBIENT_DISPLAY));
         return controllers;
     }
 
@@ -252,8 +372,7 @@ public class PowerUsageSummary extends PowerUsageBase {
                         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);
@@ -263,7 +382,7 @@ public class PowerUsageSummary extends PowerUsageBase {
                 item.setTitle(mShowAllApps ? R.string.hide_extra_apps : R.string.show_all_apps);
                 metricsFeatureProvider.action(context,
                         MetricsEvent.ACTION_SETTINGS_MENU_BATTERY_APPS_TOGGLE, mShowAllApps);
-                restartBatteryStatsLoader();
+                restartBatteryStatsLoader(false /* clearHeader */);
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -289,11 +408,7 @@ public class PowerUsageSummary extends PowerUsageBase {
     }
 
     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 +523,10 @@ public class PowerUsageSummary extends PowerUsageBase {
             return;
         }
 
-        cacheRemoveAllPrefs(mAppListGroup);
-        mAppListGroup.setOrderingAsAdded(false);
-        boolean addedSome = false;
-
-        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;
+        restartAnomalyDetectionIfPossible();
 
+        // reload BatteryInfo and updateUI
+        restartBatteryInfoLoader();
         final long lastFullChargeTime = mBatteryUtils.calculateLastFullChargeTime(mStatsHelper,
                 System.currentTimeMillis());
         updateScreenPreference();
@@ -440,6 +538,27 @@ public class PowerUsageSummary extends PowerUsageBase {
                 : 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());
@@ -458,31 +577,8 @@ public class PowerUsageSummary extends PowerUsageBase {
                 if (((int) (percentOfTotal + .5)) < 1) {
                     continue;
                 }
-                if (sipper.drainType == BatterySipper.DrainType.OVERCOUNTED) {
-                    // Don't show over-counted unless it is at least 2/3 the size of
-                    // the largest real entry, and its percent of total is more significant
-                    if (sipper.totalPowerMah < ((mStatsHelper.getMaxRealPower() * 2) / 3)) {
-                        continue;
-                    }
-                    if (percentOfTotal < 10) {
-                        continue;
-                    }
-                    if ("user".equals(Build.TYPE)) {
-                        continue;
-                    }
-                }
-                if (sipper.drainType == BatterySipper.DrainType.UNACCOUNTED) {
-                    // Don't show over-counted unless it is at least 1/2 the size of
-                    // the largest real entry, and its percent of total is more significant
-                    if (sipper.totalPowerMah < (mStatsHelper.getMaxRealPower() / 2)) {
-                        continue;
-                    }
-                    if (percentOfTotal < 5) {
-                        continue;
-                    }
-                    if ("user".equals(Build.TYPE)) {
-                        continue;
-                    }
+                if (shouldHideSipper(sipper)) {
+                    continue;
                 }
                 final UserHandle userHandle = new UserHandle(UserHandle.getUserId(sipper.getUid()));
                 final BatteryEntry entry = new BatteryEntry(getActivity(), mHandler, mUm, sipper);
@@ -505,6 +601,7 @@ public class PowerUsageSummary extends PowerUsageBase {
                 pref.setTitle(entry.getLabel());
                 pref.setOrder(i + 1);
                 pref.setPercent(percentOfTotal);
+                pref.shouldShowAnomalyIcon(false);
                 if (sipper.usageTimeMs == 0 && sipper.drainType == DrainType.APP) {
                     sipper.usageTimeMs = mBatteryUtils.getProcessTimeMs(
                             BatteryUtils.StatusType.FOREGROUND, sipper.uidObj, mStatsType);
@@ -531,6 +628,37 @@ public class PowerUsageSummary extends PowerUsageBase {
         BatteryEntry.startRequestQueue();
     }
 
+    @VisibleForTesting
+    boolean shouldHideSipper(BatterySipper sipper) {
+        // Don't show over-counted and unaccounted in any condition
+        return sipper.drainType == BatterySipper.DrainType.OVERCOUNTED
+                || sipper.drainType == BatterySipper.DrainType.UNACCOUNTED;
+    }
+
+    @VisibleForTesting
+    void refreshAnomalyIcon() {
+        for (int i = 0, size = mAnomalySparseArray.size(); i < size; i++) {
+            final String key = extractKeyFromUid(mAnomalySparseArray.keyAt(i));
+            final PowerGaugePreference pref = (PowerGaugePreference) mAppListGroup.findPreference(
+                    key);
+            if (pref != null) {
+                pref.shouldShowAnomalyIcon(true);
+            }
+        }
+    }
+
+    @VisibleForTesting
+    void restartAnomalyDetectionIfPossible() {
+        if (getAnomalyDetectionPolicy().isAnomalyDetectionEnabled()) {
+            getLoaderManager().restartLoader(ANOMALY_LOADER, Bundle.EMPTY, mAnomalyLoaderCallbacks);
+        }
+    }
+
+    @VisibleForTesting
+    AnomalyDetectionPolicy getAnomalyDetectionPolicy() {
+        return new AnomalyDetectionPolicy(getContext());
+    }
+
     @VisibleForTesting
     BatterySipper findBatterySipperByType(List<BatterySipper> usageList, DrainType type) {
         for (int i = 0, size = usageList.size(); i < size; i++) {
@@ -560,11 +688,14 @@ public class PowerUsageSummary extends PowerUsageBase {
     }
 
     @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
@@ -581,15 +712,18 @@ public class PowerUsageSummary extends PowerUsageBase {
         if (usageTimeMs >= DateUtils.MINUTE_IN_MILLIS) {
             final CharSequence timeSequence = Utils.formatElapsedTime(getContext(), usageTimeMs,
                     false);
-            preference.setSummary(mBatteryUtils.shouldHideSipper(sipper) ? timeSequence :
-                    TextUtils.expandTemplate(getText(R.string.battery_screen_usage), timeSequence));
+            preference.setSummary(
+                    (sipper.drainType != DrainType.APP || mBatteryUtils.shouldHideSipper(sipper))
+                            ? timeSequence
+                            : TextUtils.expandTemplate(getText(R.string.battery_screen_usage),
+                                    timeSequence));
         }
     }
 
     @VisibleForTesting
     String extractKeyFromSipper(BatterySipper sipper) {
         if (sipper.uidObj != null) {
-            return Integer.toString(sipper.getUid());
+            return extractKeyFromUid(sipper.getUid());
         } else if (sipper.drainType != DrainType.APP) {
             return sipper.drainType.toString();
         } else if (sipper.getPackages() != null) {
@@ -600,6 +734,11 @@ public class PowerUsageSummary extends PowerUsageBase {
         }
     }
 
+    @VisibleForTesting
+    String extractKeyFromUid(int uid) {
+        return Integer.toString(uid);
+    }
+
     @VisibleForTesting
     void setBatteryLayoutPreference(LayoutPreference layoutPreference) {
         mBatteryLayoutPref = layoutPreference;
@@ -612,6 +751,32 @@ public class PowerUsageSummary extends PowerUsageBase {
                 .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() {
+        getLoaderManager().restartLoader(BATTERY_INFO_LOADER, Bundle.EMPTY,
+                mBatteryInfoLoaderCallbacks);
+        if (mPowerFeatureProvider.isEstimateDebugEnabled()) {
+            // Unfortunately setting a long click listener on a view means it will no
+            // longer pass the regular click event to the parent, so we have to register
+            // a regular click listener as well.
+            View header = mBatteryLayoutPref.findViewById(R.id.summary1);
+            header.setOnLongClickListener(this);
+            header.setOnClickListener(this);
+        }
+    }
+
     private static List<BatterySipper> getFakeStats() {
         ArrayList<BatterySipper> stats = new ArrayList<>();
         float use = 5;
@@ -678,6 +843,35 @@ public class PowerUsageSummary extends PowerUsageBase {
         }
     };
 
+    @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();
+    }
+
+    @Override
+    protected void restartBatteryStatsLoader() {
+        restartBatteryStatsLoader(true /* clearHeader */);
+    }
+
+    void restartBatteryStatsLoader(boolean clearHeader) {
+        super.restartBatteryStatsLoader();
+        if (clearHeader) {
+            mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
+        }
+    }
+
     private static class SummaryProvider implements SummaryLoader.SummaryProvider {
         private final Context mContext;
         private final SummaryLoader mLoader;
@@ -691,7 +885,7 @@ public class PowerUsageSummary extends PowerUsageBase {
                 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 +913,13 @@ public class PowerUsageSummary extends PowerUsageBase {
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    List<String> niks = new ArrayList<>();
+                    List<String> niks = super.getNonIndexableKeys(context);
+                    niks.add(KEY_HIGH_USAGE);
+                    niks.add(KEY_BATTERY_SAVER_SUMMARY);
                     // Duplicates in display
                     niks.add(KEY_AUTO_BRIGHTNESS);
                     niks.add(KEY_SCREEN_TIMEOUT);
-                    niks.add(KEY_BATTERY_SAVER_SUMMARY);
+                    niks.add(KEY_AMBIENT_DISPLAY);
                     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 0000000000000000000000000000000000000000..b070b26ae00d85dce733c3c333959a4c16cb3829
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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,
+            AnomalyType.BLUETOOTH_SCAN})
+    public @interface AnomalyType {
+        int WAKE_LOCK = 0;
+        int WAKEUP_ALARM = 1;
+        int BLUETOOTH_SCAN = 2;
+    }
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({AnomalyActionType.FORCE_STOP,
+            AnomalyActionType.BACKGROUND_CHECK,
+            AnomalyActionType.LOCATION_CHECK,
+            AnomalyActionType.STOP_AND_BACKGROUND_CHECK})
+    public @interface AnomalyActionType {
+        int FORCE_STOP = 0;
+        int BACKGROUND_CHECK = 1;
+        int LOCATION_CHECK = 2;
+        int STOP_AND_BACKGROUND_CHECK = 3;
+    }
+
+    @AnomalyType
+    public static final int[] ANOMALY_TYPE_LIST = {
+            AnomalyType.WAKE_LOCK,
+            AnomalyType.WAKEUP_ALARM,
+            AnomalyType.BLUETOOTH_SCAN};
+
+    /**
+     * Type of this this anomaly
+     */
+    public final int type;
+    public final int uid;
+    public final int targetSdkVersion;
+    public final long wakelockTimeMs;
+    public final long bluetoothScanningTimeMs;
+    public final int wakeupAlarmCount;
+    /**
+     * {@code true} if background restriction is enabled
+     *
+     * @see android.app.AppOpsManager.OP_RUN_IN_BACKGROUND
+     */
+    public final boolean backgroundRestrictionEnabled;
+    /**
+     * 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;
+        targetSdkVersion = builder.mTargetSdkVersion;
+        backgroundRestrictionEnabled = builder.mBgRestrictionEnabled;
+        bluetoothScanningTimeMs = builder.mBluetoothScanningTimeMs;
+        wakeupAlarmCount = builder.mWakeupAlarmCount;
+    }
+
+    private Anomaly(Parcel in) {
+        type = in.readInt();
+        uid = in.readInt();
+        displayName = in.readCharSequence();
+        packageName = in.readString();
+        wakelockTimeMs = in.readLong();
+        targetSdkVersion = in.readInt();
+        backgroundRestrictionEnabled = in.readBoolean();
+        wakeupAlarmCount = in.readInt();
+        bluetoothScanningTimeMs = 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);
+        dest.writeInt(targetSdkVersion);
+        dest.writeBoolean(backgroundRestrictionEnabled);
+        dest.writeInt(wakeupAlarmCount);
+        dest.writeLong(bluetoothScanningTimeMs);
+    }
+
+    @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)
+                && targetSdkVersion == other.targetSdkVersion
+                && backgroundRestrictionEnabled == other.backgroundRestrictionEnabled
+                && wakeupAlarmCount == other.wakeupAlarmCount
+                && bluetoothScanningTimeMs == other.bluetoothScanningTimeMs;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, uid, displayName, packageName, wakelockTimeMs, targetSdkVersion,
+                backgroundRestrictionEnabled, wakeupAlarmCount, bluetoothScanningTimeMs);
+    }
+
+    @Override
+    public String toString() {
+        return "type=" + toAnomalyTypeText(type) + " uid=" + uid + " package=" + packageName +
+                " displayName=" + displayName + " wakelockTimeMs=" + wakelockTimeMs +
+                " wakeupAlarmCount=" + wakeupAlarmCount + " bluetoothTimeMs="
+                + bluetoothScanningTimeMs;
+    }
+
+    private String toAnomalyTypeText(@AnomalyType int type) {
+        switch (type) {
+            case AnomalyType.WAKEUP_ALARM:
+                return "wakeupAlarm";
+            case AnomalyType.WAKE_LOCK:
+                return "wakelock";
+            case AnomalyType.BLUETOOTH_SCAN:
+                return "unoptimizedBluetoothScan";
+        }
+
+        return "";
+    }
+
+    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 int mTargetSdkVersion;
+        private CharSequence mDisplayName;
+        private String mPackageName;
+        private long mWakeLockTimeMs;
+        private boolean mBgRestrictionEnabled;
+        private int mWakeupAlarmCount;
+        private long mBluetoothScanningTimeMs;
+
+        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 Builder setTargetSdkVersion(int targetSdkVersion) {
+            mTargetSdkVersion = targetSdkVersion;
+            return this;
+        }
+
+        public Builder setBackgroundRestrictionEnabled(boolean bgRestrictionEnabled) {
+            mBgRestrictionEnabled = bgRestrictionEnabled;
+            return this;
+        }
+
+        public Builder setWakeupAlarmCount(int wakeupAlarmCount) {
+            mWakeupAlarmCount = wakeupAlarmCount;
+            return this;
+        }
+
+        public Builder setBluetoothScanningTimeMs(long bluetoothScanningTimeMs) {
+            mBluetoothScanningTimeMs = bluetoothScanningTimeMs;
+            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 0000000000000000000000000000000000000000..0c401b500f51ebdf15c6cda6aacc50888c268677
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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_BLUETOOTH_SCAN_DETECTION_ENABLED = "bluetooth_scan_enabled";
+    @VisibleForTesting
+    static final String KEY_WAKELOCK_THRESHOLD = "wakelock_threshold";
+    @VisibleForTesting
+    static final String KEY_WAKEUP_ALARM_THRESHOLD = "wakeup_alarm_threshold";
+    @VisibleForTesting
+    static final String KEY_BLUETOOTH_SCAN_THRESHOLD = "bluetooth_scan_threshold";
+
+    /**
+     * {@code true} if general anomaly detection is enabled
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_ANOMALY_DETECTION_ENABLED
+     */
+    final boolean anomalyDetectionEnabled;
+
+    /**
+     * {@code true} if wakelock anomaly detection is enabled
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_WAKELOCK_DETECTION_ENABLED
+     */
+    final boolean wakeLockDetectionEnabled;
+
+    /**
+     * {@code true} if wakeup alarm detection is enabled
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_WAKEUP_ALARM_DETECTION_ENABLED
+     */
+    final boolean wakeupAlarmDetectionEnabled;
+
+    /**
+     * {@code true} if bluetooth scanning detection is enabled
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_BLUETOOTH_SCAN_THRESHOLD
+     */
+    final boolean bluetoothScanDetectionEnabled;
+
+    /**
+     * 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;
+
+    /**
+     * Threshold for bluetooth unoptimized scanning time in milli seconds
+     *
+     * @see Settings.Global#ANOMALY_DETECTION_CONSTANTS
+     * @see #KEY_BLUETOOTH_SCAN_THRESHOLD
+     */
+    public final long bluetoothScanThreshold;
+
+    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,
+                false);
+        bluetoothScanDetectionEnabled = mParserWrapper.getBoolean(
+                KEY_BLUETOOTH_SCAN_DETECTION_ENABLED, true);
+        wakeLockThreshold = mParserWrapper.getLong(KEY_WAKELOCK_THRESHOLD,
+                DateUtils.HOUR_IN_MILLIS);
+        wakeupAlarmThreshold = mParserWrapper.getLong(KEY_WAKEUP_ALARM_THRESHOLD, 60);
+        bluetoothScanThreshold = mParserWrapper.getLong(KEY_BLUETOOTH_SCAN_THRESHOLD,
+                30 * DateUtils.MINUTE_IN_MILLIS);
+    }
+
+    public boolean isAnomalyDetectionEnabled() {
+        return anomalyDetectionEnabled;
+    }
+
+    public boolean isAnomalyDetectorEnabled(@Anomaly.AnomalyType int type) {
+        switch (type) {
+            case Anomaly.AnomalyType.WAKE_LOCK:
+                return wakeLockDetectionEnabled;
+            case Anomaly.AnomalyType.WAKEUP_ALARM:
+                return wakeupAlarmDetectionEnabled;
+            case Anomaly.AnomalyType.BLUETOOTH_SCAN:
+                return bluetoothScanDetectionEnabled;
+            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 0000000000000000000000000000000000000000..69d03b94c1bf341120874fe199556b71a9b0fd61
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.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 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;
+    @VisibleForTesting
+    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);
+        initAnomalyUtils();
+    }
+
+    @VisibleForTesting
+    void initAnomalyUtils() {
+        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);
+        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);
+        switch (anomalyAction.getActionType()) {
+            case Anomaly.AnomalyActionType.FORCE_STOP:
+                return new AlertDialog.Builder(context)
+                        .setTitle(R.string.dialog_stop_title)
+                        .setMessage(getString(mAnomaly.type == Anomaly.AnomalyType.WAKE_LOCK
+                                ? R.string.dialog_stop_message
+                                : R.string.dialog_stop_message_wakeup_alarm, mAnomaly.displayName))
+                        .setPositiveButton(R.string.dialog_stop_ok, this)
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            case Anomaly.AnomalyActionType.STOP_AND_BACKGROUND_CHECK:
+                return new AlertDialog.Builder(context)
+                        .setTitle(R.string.dialog_background_check_title)
+                        .setMessage(getString(R.string.dialog_background_check_message,
+                                mAnomaly.displayName))
+                        .setPositiveButton(R.string.dialog_background_check_ok, this)
+                        .setNegativeButton(R.string.dlg_cancel, null)
+                        .create();
+            case Anomaly.AnomalyActionType.LOCATION_CHECK:
+                return new AlertDialog.Builder(context)
+                        .setTitle(R.string.dialog_location_title)
+                        .setMessage(getString(R.string.dialog_location_message,
+                                mAnomaly.displayName))
+                        .setPositiveButton(R.string.dialog_location_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 0000000000000000000000000000000000000000..596eaf5980e79dfc449a732fba8521de1330858e
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.util.Log;
+
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.internal.util.ArrayUtils;
+import com.android.settings.utils.AsyncLoader;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+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 String TAG = "AnomalyLoader";
+
+    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());
+        }
+
+        return mAnomalyUtils.detectAnomalies(mBatteryStatsHelper, mPolicy, mPackageName);
+    }
+
+    @VisibleForTesting
+    List<Anomaly> generateFakeData() {
+        final List<Anomaly> anomalies = new ArrayList<>();
+        final Context context = getContext();
+        final String packageName = "com.android.settings";
+        final CharSequence displayName = "Settings";
+        try {
+            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());
+            anomalies.add(new Anomaly.Builder()
+                    .setUid(uid)
+                    .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
+                    .setPackageName(packageName)
+                    .setDisplayName(displayName)
+                    .build());
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Cannot find package by name: " + packageName, e);
+        }
+        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 0000000000000000000000000000000000000000..9884fbd56b154fd3784b3146bbb636c76aed99bd
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java
@@ -0,0 +1,27 @@
+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;
+
+        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 0000000000000000000000000000000000000000..59c8b2c68384533bf60367cfe0db55e15c57672d
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.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.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.BatteryUtils;
+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";
+
+    public 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;
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
+    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;
+        mBatteryUtils = BatteryUtils.getInstance(activity.getApplicationContext());
+        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 title = context.getResources().getQuantityString(
+                    R.plurals.power_high_usage_title, count, mAnomalies.get(0).displayName);
+            final String summary = count > 1 ?
+                    context.getString(R.string.battery_abnormal_apps_summary, count)
+                    : context.getString(
+                            mBatteryUtils.getSummaryResIdFromAnomalyType(mAnomalies.get(0).type));
+
+            mAnomalyPreference.setTitle(title);
+            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 0000000000000000000000000000000000000000..491a3b4860716f1e62ec3faeb74772af11c3931e
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.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.os.Build;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+import com.android.settings.fuelgauge.anomaly.action.ForceStopAction;
+import com.android.settings.fuelgauge.anomaly.action.LocationCheckAction;
+import com.android.settings.fuelgauge.anomaly.action.StopAndBackgroundCheckAction;
+import com.android.settings.fuelgauge.anomaly.checker.AnomalyDetector;
+import com.android.settings.fuelgauge.anomaly.checker.BluetoothScanAnomalyDetector;
+import com.android.settings.fuelgauge.anomaly.checker.WakeLockAnomalyDetector;
+import com.android.settings.fuelgauge.anomaly.checker.WakeupAlarmAnomalyDetector;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 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}
+     *
+     * @return corresponding {@link AnomalyAction}, or null if cannot find it.
+     */
+    public AnomalyAction getAnomalyAction(Anomaly anomaly) {
+        switch (anomaly.type) {
+            case Anomaly.AnomalyType.WAKE_LOCK:
+                return new ForceStopAction(mContext);
+            case Anomaly.AnomalyType.WAKEUP_ALARM:
+                if (anomaly.targetSdkVersion >= Build.VERSION_CODES.O
+                        || (anomaly.targetSdkVersion < Build.VERSION_CODES.O
+                                && anomaly.backgroundRestrictionEnabled)) {
+                    return new ForceStopAction(mContext);
+                } else {
+                    return new StopAndBackgroundCheckAction(mContext);
+                }
+            case Anomaly.AnomalyType.BLUETOOTH_SCAN:
+                return new LocationCheckAction(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);
+            case Anomaly.AnomalyType.BLUETOOTH_SCAN:
+                return new BluetoothScanAnomalyDetector(mContext);
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * Detect whether application with {@code targetPackageName} has anomaly. When
+     * {@code targetPackageName} is null, start detection among all the applications.
+     *
+     * @param batteryStatsHelper contains battery stats, used to detect anomaly
+     * @param policy             contains configuration about anomaly check
+     * @param targetPackageName  represents the app need to be detected
+     * @return the list of anomalies
+     */
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper,
+            AnomalyDetectionPolicy policy, String targetPackageName) {
+        final List<Anomaly> anomalies = new ArrayList<>();
+        for (@Anomaly.AnomalyType int type : Anomaly.ANOMALY_TYPE_LIST) {
+            if (policy.isAnomalyDetectorEnabled(type)) {
+                anomalies.addAll(getAnomalyDetector(type).detectAnomalies(
+                        batteryStatsHelper, targetPackageName));
+            }
+        }
+
+        return anomalies;
+    }
+
+}
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 0000000000000000000000000000000000000000..4a9c2a92b45f1d88c3d60ebdf3d9a25224d4ec4b
--- /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 0000000000000000000000000000000000000000..f7240341e6fb30baf0c006c2a7c5d3bd1427906e
--- /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 0000000000000000000000000000000000000000..87212e7b6ca5c147e6770953fd958c64cce70691
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/action/AnomalyAction.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.action;
+
+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;
+
+/**
+ * Abstract class for anomaly action, which is triggered if we need to handle the anomaly
+ */
+public abstract class AnomalyAction {
+    protected Context mContext;
+    protected int mActionMetricKey;
+
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+
+    public AnomalyAction(Context context) {
+        mContext = context;
+        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+    }
+
+    /**
+     * handle the action when user clicks positive button
+     *
+     * @param anomaly    about the app that we need to handle
+     * @param contextMetricsKey key for the page that invokes the action
+     * @see com.android.internal.logging.nano.MetricsProto
+     */
+    public void handlePositiveAction(Anomaly anomaly, int contextMetricsKey) {
+        mMetricsFeatureProvider.action(mContext, mActionMetricKey, anomaly.packageName,
+                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, contextMetricsKey));
+    }
+
+    /**
+     * Check whether the action is active for {@code anomaly}
+     *
+     * @param anomaly about the app that we need to handle
+     * @return {@code true} if action is active, otherwise return {@code false}
+     */
+    public abstract boolean isActionActive(Anomaly anomaly);
+
+    public abstract 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 0000000000000000000000000000000000000000..aa3fc39f4428b9f88b1519ef64dd19d2ad229b2f
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.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.fuelgauge.anomaly.action;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.os.Build;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+/**
+ * Background check action for anomaly app, which means to stop app running in the background
+ */
+public class BackgroundCheckAction extends AnomalyAction {
+
+    private AppOpsManager mAppOpsManager;
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
+
+    public BackgroundCheckAction(Context context) {
+        super(context);
+        mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+        mActionMetricKey = MetricsProto.MetricsEvent.ACTION_APP_BACKGROUND_CHECK;
+        mBatteryUtils = BatteryUtils.getInstance(context);
+    }
+
+    @Override
+    public void handlePositiveAction(Anomaly anomaly, int contextMetricsKey) {
+        super.handlePositiveAction(anomaly, contextMetricsKey);
+        if (anomaly.targetSdkVersion < Build.VERSION_CODES.O) {
+            mAppOpsManager.setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, anomaly.uid,
+                    anomaly.packageName,
+                    AppOpsManager.MODE_IGNORED);
+        }
+    }
+
+    @Override
+    public boolean isActionActive(Anomaly anomaly) {
+        return !mBatteryUtils.isBackgroundRestrictionEnabled(anomaly.targetSdkVersion, anomaly.uid,
+                anomaly.packageName);
+    }
+
+    @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 0000000000000000000000000000000000000000..fb7306a175c4920cc4ccea444ef9f4b87f7852a1
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/action/ForceStopAction.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.anomaly.action;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.util.Log;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+/**
+ * Force stop action for anomaly app, which means to stop the app which causes anomaly
+ */
+public class ForceStopAction extends AnomalyAction {
+    private static final String TAG = "ForceStopAction";
+
+    private ActivityManager mActivityManager;
+    private PackageManager mPackageManager;
+
+    public ForceStopAction(Context context) {
+        super(context);
+        mActivityManager = (ActivityManager) context.getSystemService(
+                Context.ACTIVITY_SERVICE);
+        mPackageManager = context.getPackageManager();
+        mActionMetricKey = MetricsProto.MetricsEvent.ACTION_APP_FORCE_STOP;
+    }
+
+    @Override
+    public void handlePositiveAction(Anomaly anomaly, int contextMetricsKey) {
+        super.handlePositiveAction(anomaly, contextMetricsKey);
+
+        mActivityManager.forceStopPackage(anomaly.packageName);
+    }
+
+    @Override
+    public boolean isActionActive(Anomaly anomaly) {
+        try {
+            ApplicationInfo info = mPackageManager.getApplicationInfo(anomaly.packageName,
+                    PackageManager.GET_META_DATA);
+            return (info.flags & ApplicationInfo.FLAG_STOPPED) == 0;
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Cannot find info for app: " + anomaly.packageName);
+        }
+        return false;
+    }
+
+    @Override
+    public int getActionType() {
+        return Anomaly.AnomalyActionType.FORCE_STOP;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java
new file mode 100644
index 0000000000000000000000000000000000000000..b0e34fa9e0fae5c5ce45ab3873d8d5b7a20b1ad4
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.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.fuelgauge.anomaly.action;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.permission.RuntimePermissionPresenter;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.content.PermissionChecker;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+/**
+ * Location action for anomaly app, which means to turn off location permission for this app
+ */
+public class LocationCheckAction extends AnomalyAction {
+
+    private static final String TAG = "LocationCheckAction";
+
+    private final RuntimePermissionPresenter mRuntimePermissionPresenter;
+
+    public LocationCheckAction(Context context) {
+        this(context, RuntimePermissionPresenter.getInstance(context));
+    }
+
+    @VisibleForTesting
+    LocationCheckAction(Context context, RuntimePermissionPresenter runtimePermissionPresenter) {
+        super(context);
+        mRuntimePermissionPresenter = runtimePermissionPresenter;
+        mActionMetricKey = MetricsProto.MetricsEvent.ACTION_APP_LOCATION_CHECK;
+    }
+
+    @Override
+    public void handlePositiveAction(Anomaly anomaly, int contextMetricsKey) {
+        super.handlePositiveAction(anomaly, contextMetricsKey);
+        mRuntimePermissionPresenter.revokeRuntimePermission(anomaly.packageName,
+                Manifest.permission_group.LOCATION);
+    }
+
+    @Override
+    public boolean isActionActive(Anomaly anomaly) {
+        return isPermissionGranted(anomaly, Manifest.permission.ACCESS_COARSE_LOCATION)
+                || isPermissionGranted(anomaly, Manifest.permission.ACCESS_FINE_LOCATION);
+    }
+
+    @Override
+    public int getActionType() {
+        return Anomaly.AnomalyActionType.LOCATION_CHECK;
+    }
+
+    private boolean isPermissionGranted(Anomaly anomaly, String permission) {
+        return PermissionChecker.checkPermission(mContext, permission, -1, anomaly.uid,
+                anomaly.packageName) == PermissionChecker.PERMISSION_GRANTED;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java
new file mode 100644
index 0000000000000000000000000000000000000000..dba221a35f23904c11b4f16b547cb18549704f4a
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.content.Context;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+/**
+ * Force stop and background check action for anomaly app, this action will
+ * 1. Force stop the app
+ * 2. Turn on background check
+ */
+public class StopAndBackgroundCheckAction extends AnomalyAction {
+    @VisibleForTesting
+    ForceStopAction mForceStopAction;
+    @VisibleForTesting
+    BackgroundCheckAction mBackgroundCheckAction;
+
+    public StopAndBackgroundCheckAction(Context context) {
+        this(context, new ForceStopAction(context), new BackgroundCheckAction(context));
+    }
+
+    @VisibleForTesting
+    StopAndBackgroundCheckAction(Context context, ForceStopAction forceStopAction,
+            BackgroundCheckAction backgroundCheckAction) {
+        super(context);
+        mForceStopAction = forceStopAction;
+        mBackgroundCheckAction = backgroundCheckAction;
+    }
+
+    @Override
+    public void handlePositiveAction(Anomaly anomaly, int metricsKey) {
+        mForceStopAction.handlePositiveAction(anomaly, metricsKey);
+        mBackgroundCheckAction.handlePositiveAction(anomaly, metricsKey);
+    }
+
+    @Override
+    public boolean isActionActive(Anomaly anomaly) {
+        return mForceStopAction.isActionActive(anomaly)
+                && mBackgroundCheckAction.isActionActive(anomaly);
+    }
+
+    @Override
+    public int getActionType() {
+        return Anomaly.AnomalyActionType.STOP_AND_BACKGROUND_CHECK;
+    }
+}
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 0000000000000000000000000000000000000000..1921bef4e12fecaa7286446c47c2e3a7f3d6da9c
--- /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/BluetoothScanAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java
new file mode 100644
index 0000000000000000000000000000000000000000..9fb4496c9c8ed622f739a99953a221ce6c749521
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.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.fuelgauge.anomaly.checker;
+
+import android.content.Context;
+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 com.android.settings.fuelgauge.anomaly.AnomalyUtils;
+import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Check whether apps have unoptimized bluetooth scanning in the background
+ */
+public class BluetoothScanAnomalyDetector implements AnomalyDetector {
+    private static final String TAG = "BluetoothScanAnomalyDetector";
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
+    private long mBluetoothScanningThreshold;
+    private Context mContext;
+    private AnomalyUtils mAnomalyUtils;
+
+    public BluetoothScanAnomalyDetector(Context context) {
+        this(context, new AnomalyDetectionPolicy(context), AnomalyUtils.getInstance(context));
+    }
+
+    @VisibleForTesting
+    BluetoothScanAnomalyDetector(Context context, AnomalyDetectionPolicy policy,
+            AnomalyUtils anomalyUtils) {
+        mContext = context;
+        mBatteryUtils = BatteryUtils.getInstance(context);
+        mBluetoothScanningThreshold = policy.bluetoothScanThreshold;
+        mAnomalyUtils = anomalyUtils;
+    }
+
+    @Override
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper) {
+        // Detect all apps if targetPackageName is null
+        return detectAnomalies(batteryStatsHelper, null /* targetPackageName */);
+    }
+
+    @Override
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper,
+            String targetPackageName) {
+        final List<BatterySipper> batterySippers = batteryStatsHelper.getUsageList();
+        final List<Anomaly> anomalies = new ArrayList<>();
+        final int targetUid = mBatteryUtils.getPackageUid(targetPackageName);
+        final long elapsedRealtimeMs = SystemClock.elapsedRealtime();
+
+        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 long bluetoothTimeMs = getBluetoothUnoptimizedBgTimeMs(uid, elapsedRealtimeMs);
+            if (bluetoothTimeMs > mBluetoothScanningThreshold) {
+                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.BLUETOOTH_SCAN)
+                        .setDisplayName(displayName)
+                        .setPackageName(packageName)
+                        .setBluetoothScanningTimeMs(bluetoothTimeMs)
+                        .build();
+
+                if (mAnomalyUtils.getAnomalyAction(anomaly).isActionActive(anomaly)) {
+                    anomalies.add(anomaly);
+                }
+            }
+        }
+
+        return anomalies;
+    }
+
+    @VisibleForTesting
+    public long getBluetoothUnoptimizedBgTimeMs(BatteryStats.Uid uid, long elapsedRealtimeMs) {
+        BatteryStats.Timer timer = uid.getBluetoothUnoptimizedScanBackgroundTimer();
+
+        return timer != null ? timer.getTotalDurationMsLocked(elapsedRealtimeMs) : 0;
+    }
+
+}
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 0000000000000000000000000000000000000000..c2bcd9a446a4bd7a5f8aeb22a23b4a651028bf3b
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 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 com.android.settings.fuelgauge.anomaly.AnomalyUtils;
+
+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";
+    @VisibleForTesting
+    BatteryUtils mBatteryUtils;
+    @VisibleForTesting
+    long mWakeLockThresholdMs;
+    private PackageManager mPackageManager;
+    private Context mContext;
+    private AnomalyUtils mAnomalyUtils;
+
+    public WakeLockAnomalyDetector(Context context) {
+        this(context, new AnomalyDetectionPolicy(context), AnomalyUtils.getInstance(context));
+    }
+
+    @VisibleForTesting
+    WakeLockAnomalyDetector(Context context, AnomalyDetectionPolicy policy,
+            AnomalyUtils anomalyUtils) {
+        mContext = context;
+        mPackageManager = context.getPackageManager();
+        mBatteryUtils = BatteryUtils.getInstance(context);
+        mAnomalyUtils = anomalyUtils;
+        mWakeLockThresholdMs = policy.wakeLockThreshold;
+    }
+
+    @Override
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper) {
+        // Detect all apps if targetPackageName is null
+        return detectAnomalies(batteryStatsHelper, null /* targetPackageName */);
+    }
+
+    @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 long currentDurationMs = getCurrentDurationMs(uid, rawRealtime);
+            final long backgroundDurationMs = getBackgroundTotalDurationMs(uid, rawRealtime);
+
+            if (backgroundDurationMs > mWakeLockThresholdMs && currentDurationMs != 0) {
+                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)
+                        .setWakeLockTimeMs(backgroundDurationMs)
+                        .build();
+
+                if (mAnomalyUtils.getAnomalyAction(anomaly).isActionActive(anomaly)) {
+                    anomalies.add(anomaly);
+                }
+            }
+        }
+        return anomalies;
+    }
+
+    @VisibleForTesting
+    long getCurrentDurationMs(BatteryStats.Uid uid, long elapsedRealtimeMs) {
+        BatteryStats.Timer timer = uid.getAggregatedPartialWakelockTimer();
+
+        return timer != null ? timer.getCurrentDurationMsLocked(elapsedRealtimeMs) : 0;
+    }
+
+    @VisibleForTesting
+    long getBackgroundTotalDurationMs(BatteryStats.Uid uid, long elapsedRealtimeMs) {
+        BatteryStats.Timer timer = uid.getAggregatedPartialWakelockTimer();
+        BatteryStats.Timer subTimer = timer != null ? timer.getSubTimer() : null;
+
+        return subTimer != null ? subTimer.getTotalDurationMsLocked(elapsedRealtimeMs) : 0;
+    }
+}
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 0000000000000000000000000000000000000000..8823a177092464a22edf1554abc5ff404d4c27aa
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.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.fuelgauge.anomaly.checker;
+
+import android.content.Context;
+import android.os.BatteryStats;
+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 com.android.settings.fuelgauge.anomaly.AnomalyUtils;
+import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+
+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;
+    private AnomalyUtils mAnomalyUtils;
+
+    public WakeupAlarmAnomalyDetector(Context context) {
+        this(context, new AnomalyDetectionPolicy(context), AnomalyUtils.getInstance(context));
+    }
+
+    @VisibleForTesting
+    WakeupAlarmAnomalyDetector(Context context, AnomalyDetectionPolicy policy,
+            AnomalyUtils anomalyUtils) {
+        mContext = context;
+        mBatteryUtils = BatteryUtils.getInstance(context);
+        mAnomalyUtils = anomalyUtils;
+        mWakeupAlarmThreshold = policy.wakeupAlarmThreshold;
+    }
+
+    @Override
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper) {
+        // Detect all apps if targetPackageName is null
+        return detectAnomalies(batteryStatsHelper, null /* targetPackageName */);
+    }
+
+    @Override
+    public List<Anomaly> detectAnomalies(BatteryStatsHelper batteryStatsHelper,
+            String targetPackageName) {
+        final List<BatterySipper> batterySippers = batteryStatsHelper.getUsageList();
+        final List<Anomaly> anomalies = new ArrayList<>();
+        final double totalRunningHours = mBatteryUtils.calculateRunningTimeBasedOnStatsType(
+                batteryStatsHelper, BatteryStats.STATS_SINCE_CHARGED)
+                / (double) DateUtils.HOUR_IN_MILLIS;
+        final int targetUid = mBatteryUtils.getPackageUid(targetPackageName);
+
+        if (totalRunningHours >= 1) {
+            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 wakeupAlarmCount = (int) (getWakeupAlarmCountFromUid(uid)
+                        / totalRunningHours);
+                if (wakeupAlarmCount > mWakeupAlarmThreshold) {
+                    final String packageName = mBatteryUtils.getPackageName(uid.getUid());
+                    final CharSequence displayName = Utils.getApplicationLabel(mContext,
+                            packageName);
+                    final int targetSdkVersion = mBatteryUtils.getTargetSdkVersion(packageName);
+
+                    Anomaly anomaly = new Anomaly.Builder()
+                            .setUid(uid.getUid())
+                            .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                            .setDisplayName(displayName)
+                            .setPackageName(packageName)
+                            .setTargetSdkVersion(targetSdkVersion)
+                            .setBackgroundRestrictionEnabled(
+                                    mBatteryUtils.isBackgroundRestrictionEnabled(targetSdkVersion,
+                                            uid.getUid(), packageName))
+                            .setWakeupAlarmCount(wakeupAlarmCount)
+                            .build();
+
+                    if (mAnomalyUtils.getAnomalyAction(anomaly).isActionActive(anomaly)) {
+                        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/AssistGestureFeatureProvider.java b/src/com/android/settings/gestures/AssistGestureFeatureProvider.java
index f06f6c1542257f2208251912d9b07f3f17e6e0de..447562d00ab70fcd52206e90f6073754ef7ba9e1 100644
--- a/src/com/android/settings/gestures/AssistGestureFeatureProvider.java
+++ b/src/com/android/settings/gestures/AssistGestureFeatureProvider.java
@@ -18,10 +18,21 @@ package com.android.settings.gestures;
 
 import android.content.Context;
 
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.List;
+
 /** Feature provider for the assist gesture. */
 public interface AssistGestureFeatureProvider {
 
     /** Returns true if the assist gesture is supported. */
     boolean isSupported(Context context);
 
+    /** Returns true if the sensor is available. */
+    boolean isSensorAvailable(Context context);
+
+    /** Returns a list of additional preference controllers */
+    List<PreferenceController> getControllers(Context context, Lifecycle lifecycle);
+
 }
diff --git a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java
index b17d892206ea0e2cf58ce6070ceafdd79ea49b5b..450986249c4b06815cf13c93059446aa760a41b1 100644
--- a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java
+++ b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java
@@ -18,6 +18,13 @@ package com.android.settings.gestures;
 
 import android.content.Context;
 
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.ArrayList;
+import java.util.List;
+
 public class AssistGestureFeatureProviderImpl implements AssistGestureFeatureProvider {
 
     @Override
@@ -25,4 +32,14 @@ public class AssistGestureFeatureProviderImpl implements AssistGestureFeaturePro
         return false;
     }
 
+    @Override
+    public boolean isSensorAvailable(Context context) {
+        return false;
+    }
+
+    @Override
+    public List<PreferenceController> getControllers(Context context, Lifecycle lifecycle) {
+        return new ArrayList<>();
+    }
+
 }
diff --git a/src/com/android/settings/gestures/AssistGesturePreferenceController.java b/src/com/android/settings/gestures/AssistGesturePreferenceController.java
index c85851152739687f0eda55fe83ad678245d6ed88..b91f230facf3fafd92844eaf826698802704de59 100644
--- a/src/com/android/settings/gestures/AssistGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGesturePreferenceController.java
@@ -17,50 +17,73 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
-import android.net.Uri;
+import android.content.Intent;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.preference.TwoStatePreference;
 
-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.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.events.OnResume;
 
-import java.util.Arrays;
-import java.util.List;
+import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
 
 public class AssistGesturePreferenceController extends GesturePreferenceController
-        implements OnPause, OnResume {
+        implements OnResume {
+
+    private final int ON = 1;
+    private final int OFF = 0;
 
     private static final String PREF_KEY_VIDEO = "gesture_assist_video";
     private final String mAssistGesturePrefKey;
 
+    private final String SECURE_KEY = ASSIST_GESTURE_ENABLED;
+
     private final AssistGestureFeatureProvider mFeatureProvider;
-    private final SettingObserver mSettingObserver;
     private boolean mWasAvailable;
 
     private PreferenceScreen mScreen;
     private Preference mPreference;
 
-    public AssistGesturePreferenceController(Context context, Lifecycle lifecycle, String key) {
+    @VisibleForTesting
+    boolean mAssistOnly;
+
+    public AssistGesturePreferenceController(Context context, Lifecycle lifecycle, String key,
+            boolean assistOnly) {
         super(context, lifecycle);
         mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider();
-        mSettingObserver = new SettingObserver();
         mWasAvailable = isAvailable();
         mAssistGesturePrefKey = key;
+        mAssistOnly = assistOnly;
     }
 
     @Override
     public boolean isAvailable() {
-        return mFeatureProvider.isSupported(mContext);
+        if (mAssistOnly) {
+            return mFeatureProvider.isSupported(mContext);
+        } else {
+            return mFeatureProvider.isSensorAvailable(mContext);
+        }
     }
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
         mScreen = screen;
         mPreference = screen.findPreference(getPreferenceKey());
+        if (!mFeatureProvider.isSensorAvailable(mContext)) {
+            removePreference(mScreen, getPreferenceKey());
+            return;
+        }
+        if (!mFeatureProvider.isSupported(mContext)) {
+            mScreen.removePreference(mPreference);
+            return;
+        }
         // Call super last or AbstractPreferenceController might remove the preference from the
         // screen (if !isAvailable()) before we can save a reference to it.
         super.displayPreference(screen);
@@ -68,7 +91,14 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
 
     @Override
     public void onResume() {
-        mSettingObserver.register(mContext.getContentResolver(), true /* register */);
+        // This check must be done in case the user disables Assistant while still on the settings
+        // page. This check is slightly different than isAvailable() in some cases due to this
+        // setting being in multiple places that require different behavior
+        if (mScreen != null && !mFeatureProvider.isSupported(mContext)) {
+            mScreen.removePreference(mPreference);
+            mWasAvailable = false;
+            return;
+        }
         if (mWasAvailable != isAvailable()) {
             // Only update the preference visibility if the availability has changed -- otherwise
             // the preference may be incorrectly added to screens with collapsed sections.
@@ -77,17 +107,12 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
         }
     }
 
-    @Override
-    public void onPause() {
-        mSettingObserver.register(mContext.getContentResolver(), false /* register */);
-    }
-
     private void updatePreference() {
         if (mPreference == null) {
             return;
         }
 
-        if (isAvailable()) {
+        if (mFeatureProvider.isSupported(mContext)) {
             if (mScreen.findPreference(getPreferenceKey()) == null) {
                 mScreen.addPreference(mPreference);
             }
@@ -96,11 +121,33 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
         }
     }
 
+    @Override
+    public void updateState(Preference preference) {
+        boolean isEnabled = isSwitchPrefEnabled() && mFeatureProvider.isSupported(mContext);
+
+        if (!mAssistOnly) {
+            boolean assistGestureSilenceEnabled = Settings.Secure.getInt(
+                    mContext.getContentResolver(),
+                    Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1) != 0;
+            isEnabled = isEnabled || assistGestureSilenceEnabled;
+        }
+
+        if (preference != null) {
+            if (preference instanceof TwoStatePreference) {
+                ((TwoStatePreference) preference).setChecked(isSwitchPrefEnabled());
+            } else {
+                preference.setSummary(isEnabled
+                        ? R.string.gesture_setting_on
+                        : R.string.gesture_setting_off);
+            }
+        }
+    }
+
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean enabled = (boolean) newValue;
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ASSIST_GESTURE_ENABLED, enabled ? 1 : 0);
+        Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, enabled ? ON : OFF);
+        updateState(preference);
         return true;
     }
 
@@ -117,26 +164,17 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
     @Override
     protected boolean isSwitchPrefEnabled() {
         final int assistGestureEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
+                SECURE_KEY, ON);
         return assistGestureEnabled != 0;
     }
 
-    class SettingObserver extends AssistSettingObserver {
-
-        private final Uri ASSIST_GESTURE_ENABLED_URI =
-                Settings.Secure.getUriFor(Settings.Secure.ASSIST_GESTURE_ENABLED);
-
-        @Override
-        protected List<Uri> getSettingUris() {
-            return Arrays.asList(ASSIST_GESTURE_ENABLED_URI);
-        }
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                AssistGestureSettings.class.getName(), mAssistGesturePrefKey,
+                mContext.getString(R.string.display_settings));
 
-        @Override
-        public void onSettingChange() {
-            if (mWasAvailable != isAvailable()) {
-                updatePreference();
-                mWasAvailable = isAvailable();
-            }
-        }
+        return new InlineSwitchPayload(SECURE_KEY, ResultPayload.SettingsSource.SECURE,
+                ON /* onValue */, intent, isAvailable(), ON /* defaultValue */);
     }
 }
diff --git a/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java
deleted file mode 100644
index 5334e62e8b40c1f05e3726d528063da68f53b1c0..0000000000000000000000000000000000000000
--- a/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceController.java
+++ /dev/null
@@ -1,151 +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.gestures;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.android.settings.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;
-
-public class AssistGestureSensitivityPreferenceController extends PreferenceController
-        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnPause, OnResume {
-
-    private static final String PREF_KEY_ASSIST_GESTURE_SENSITIVITY = "gesture_assist_sensitivity";
-
-    private final AssistGestureFeatureProvider mFeatureProvider;
-    private final SettingObserver mSettingObserver;
-
-    private PreferenceScreen mScreen;
-    private SeekBarPreference mPreference;
-
-    public AssistGestureSensitivityPreferenceController(Context context, Lifecycle lifecycle) {
-        super(context);
-        mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider();
-        mSettingObserver = new SettingObserver();
-
-        if (lifecycle != null) {
-            lifecycle.addObserver(this);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        mSettingObserver.register(mContext.getContentResolver(), true /* register */);
-        updatePreference();
-    }
-
-    @Override
-    public void onPause() {
-        mSettingObserver.register(mContext.getContentResolver(), false /* register */);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        // The sensitivity control is contingent on the assist gesture being supported and the
-        // gesture being enabled.
-        final int gestureEnabled = Settings.Secure.getInt(
-                mContext.getContentResolver(),
-                Settings.Secure.ASSIST_GESTURE_ENABLED,
-                1);
-        return (gestureEnabled == 1) && mFeatureProvider.isSupported(mContext);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        mScreen = screen;
-        mPreference = (SeekBarPreference) screen.findPreference(getPreferenceKey());
-        // Call super last or AbstractPreferenceController might remove the preference from the
-        // screen (if !isAvailable()) before we can save a reference to it.
-        super.displayPreference(screen);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        super.updateState(preference);
-        updatePreference();
-    }
-
-    private void updatePreference() {
-        if (mPreference == null) {
-            return;
-        }
-
-        if (isAvailable()) {
-            if (mScreen.findPreference(getPreferenceKey()) == null) {
-                mScreen.addPreference(mPreference);
-            }
-        } else {
-            mScreen.removePreference(mPreference);
-        }
-
-        final int sensitivity = Settings.Secure.getInt(
-                mContext.getContentResolver(),
-                Settings.Secure.ASSIST_GESTURE_SENSITIVITY,
-                mPreference.getProgress());
-        mPreference.setProgress(sensitivity);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final int sensitivity = (int) newValue;
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ASSIST_GESTURE_SENSITIVITY, sensitivity);
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return PREF_KEY_ASSIST_GESTURE_SENSITIVITY;
-    }
-
-    class SettingObserver extends ContentObserver {
-
-        private final Uri ASSIST_GESTURE_ENABLED_URI =
-                Settings.Secure.getUriFor(Settings.Secure.ASSIST_GESTURE_ENABLED);
-        private final Uri ASSIST_GESTURE_SENSITIVITY_URI =
-                Settings.Secure.getUriFor(Settings.Secure.ASSIST_GESTURE_SENSITIVITY);
-
-        public SettingObserver() {
-            super(null /* handler */);
-        }
-
-        public void register(ContentResolver cr, boolean register) {
-            if (register) {
-                cr.registerContentObserver(ASSIST_GESTURE_ENABLED_URI, false, this);
-                cr.registerContentObserver(ASSIST_GESTURE_SENSITIVITY_URI, false, this);
-            } else {
-                cr.unregisterContentObserver(this);
-            }
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            updatePreference();
-        }
-    }
-}
diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java
index 0c4f2785f81259e6433a1ebe0db99d71fedc0bd7..dd0a99102546f3f8ec42945a001bd15a4209dc8e 100644
--- a/src/com/android/settings/gestures/AssistGestureSettings.java
+++ b/src/com/android/settings/gestures/AssistGestureSettings.java
@@ -22,9 +22,10 @@ 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.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;
@@ -38,7 +39,7 @@ public class AssistGestureSettings extends DashboardFragment {
 
     @Override
     public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.VIEW_UNKNOWN;
+        return MetricsProto.MetricsEvent.SETTINGS_ASSIST_GESTURE;
     }
 
     @Override
@@ -59,8 +60,11 @@ public class AssistGestureSettings extends DashboardFragment {
     private static List<PreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST));
-        controllers.add(new AssistGestureSensitivityPreferenceController(context, lifecycle));
+        controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST,
+                false /* assistOnly */));
+        controllers.addAll(FeatureFactory.getFactory(context).getAssistGestureFeatureProvider()
+                .getControllers(context, lifecycle));
+
         return controllers;
     }
 
diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
index ba1d0f6d03466b786153d721ec2776ae56a27788..970b6a70e8872ce03c04e3d868f1af7be07fb40d 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java
@@ -17,25 +17,47 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.R;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
 
 public class DoubleTapPowerPreferenceController extends GesturePreferenceController {
 
+    private final int ON = 0;
+    private final int OFF = 1;
+
     private static final String PREF_KEY_VIDEO = "gesture_double_tap_power_video";
     private final String mDoubleTapPowerKey;
 
+    private final String SECURE_KEY = CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+
     public DoubleTapPowerPreferenceController(Context context, Lifecycle lifecycle, String key) {
         super(context, lifecycle);
         mDoubleTapPowerKey = key;
     }
 
+    public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
+        return !isGestureAvailable(context)
+                || prefs.getBoolean(DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
+    }
+
+    private static boolean isGestureAvailable(Context context) {
+        return context.getResources()
+                .getBoolean(com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+    }
+
     @Override
     public boolean isAvailable() {
-        return mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled);
+        return isGestureAvailable(mContext);
     }
 
     @Override
@@ -51,15 +73,24 @@ public class DoubleTapPowerPreferenceController extends GesturePreferenceControl
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         boolean enabled = (boolean) newValue;
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, enabled ? 0 : 1);
+        Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, enabled ? ON : OFF);
         return true;
     }
 
     @Override
     protected boolean isSwitchPrefEnabled() {
         final int cameraDisabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, 0);
+                SECURE_KEY, ON);
         return cameraDisabled == 0;
     }
+
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                DoubleTapPowerSettings.class.getName(), mDoubleTapPowerKey,
+                mContext.getString(R.string.display_settings));
+
+        return new InlineSwitchPayload(SECURE_KEY, ResultPayload.SettingsSource.SECURE,
+                ON /* onValue */, intent, isAvailable(), ON /* defaultValue */);
+    }
 }
diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
index a880c32db363c336d2cba6e82995a3d5831510f1..4efe3be52f6b3199f75e1d80d08ba349c5ed4061 100644
--- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java
@@ -17,14 +17,17 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 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.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+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;
@@ -35,6 +38,18 @@ public class DoubleTapPowerSettings extends DashboardFragment {
     private static final String TAG = "DoubleTapPower";
     private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power";
 
+    public static final String PREF_KEY_SUGGESTION_COMPLETE =
+            "pref_double_tap_power_suggestion_complete";
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
+                .getSuggestionFeatureProvider(context);
+        SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
+        prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TAP_POWER;
diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
index 5f8dfb4d8c0b6db941b07f9f1229b4867bdfd0cb..9ec06aeca213fe01e67f25ce45c145946353d983 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
@@ -18,17 +18,30 @@ package com.android.settings.gestures;
 
 import android.annotation.UserIdInt;
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.R;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import static android.provider.Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP;
 
 public class DoubleTapScreenPreferenceController extends GesturePreferenceController {
 
+    private final int ON = 1;
+    private final int OFF = 0;
+
     private static final String PREF_KEY_VIDEO = "gesture_double_tap_screen_video";
     private final String mDoubleTapScreenPrefKey;
 
+    private final String SECURE_KEY = DOZE_PULSE_ON_DOUBLE_TAP;
+
     private final AmbientDisplayConfiguration mAmbientConfig;
     @UserIdInt
     private final int mUserId;
@@ -41,6 +54,12 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
         mDoubleTapScreenPrefKey = key;
     }
 
+    public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
+        AmbientDisplayConfiguration ambientConfig = new AmbientDisplayConfiguration(context);
+        return !ambientConfig.pulseOnDoubleTapAvailable()
+                || prefs.getBoolean(DoubleTapScreenSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
+    }
+
     @Override
     public boolean isAvailable() {
         return mAmbientConfig.pulseOnDoubleTapAvailable();
@@ -54,8 +73,7 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean enabled = (boolean) newValue;
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, enabled ? 1 : 0);
+        Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, enabled ? ON : OFF);
         return true;
     }
 
@@ -68,4 +86,14 @@ public class DoubleTapScreenPreferenceController extends GesturePreferenceContro
     protected boolean isSwitchPrefEnabled() {
         return mAmbientConfig.pulseOnDoubleTapEnabled(mUserId);
     }
-}
+
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                DoubleTapScreenSettings.class.getName(), mDoubleTapScreenPrefKey,
+                mContext.getString(R.string.display_settings));
+
+        return new InlineSwitchPayload(SECURE_KEY, ResultPayload.SettingsSource.SECURE,
+                ON /* onValue */, intent, isAvailable(), ON /* defaultValue */);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
index 0804e7b2bda7361255a9944cc5e9b4adc2095457..0cc0365d9f4bb6707802c9f7a3a553a74e89ccb2 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 
@@ -24,9 +25,11 @@ 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.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+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;
@@ -37,6 +40,18 @@ public class DoubleTapScreenSettings extends DashboardFragment {
     private static final String TAG = "DoubleTapScreen";
     private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen";
 
+    public static final String PREF_KEY_SUGGESTION_COMPLETE =
+            "pref_double_tap_screen_suggestion_complete";
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
+                .getSuggestionFeatureProvider(context);
+        SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
+        prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TAP_SCREEN;
@@ -52,6 +67,11 @@ public class DoubleTapScreenSettings extends DashboardFragment {
         return R.xml.double_tap_screen_settings;
     }
 
+    @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 cf5cfabada1e51eccfe76b0e889e62e0184e52b2..e5fb9a0fc8306f7a80f347a685134944be7d6b00 100644
--- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
+++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java
@@ -17,14 +17,17 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 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.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+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;
@@ -35,6 +38,18 @@ public class DoubleTwistGestureSettings extends DashboardFragment {
     private static final String TAG = "DoubleTwistGesture";
     private static final String KEY_DOUBLE_TWIST = "gesture_double_twist";
 
+    public static final String PREF_KEY_SUGGESTION_COMPLETE =
+            "pref_double_twist_suggestion_complete";
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
+                .getSuggestionFeatureProvider(context);
+        SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
+        prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.SETTINGS_GESTURE_DOUBLE_TWIST;
diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
index 12f28d212308b0e643632cca5225c4149f1f8678..922f74b907bc347f11d400b3bac9495aa0ea2731 100644
--- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
@@ -29,10 +30,13 @@ import android.text.TextUtils;
 
 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 {
 
+    private final int ON = 1;
+    private final int OFF = 0;
+
     private static final String PREF_KEY_VIDEO = "gesture_double_twist_video";
     private final String mDoubleTwistPrefKey;
     private final UserManager mUserManager;
@@ -43,10 +47,30 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
     }
 
+    public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
+        return !isGestureAvailable(context)
+                || prefs.getBoolean(DoubleTwistGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
+    }
+
+    public static boolean isGestureAvailable(Context context) {
+        final Resources resources = context.getResources();
+        final String name = resources.getString(R.string.gesture_double_twist_sensor_name);
+        final String vendor = resources.getString(R.string.gesture_double_twist_sensor_vendor);
+        if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(vendor)) {
+            final SensorManager sensorManager =
+                    (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+            for (Sensor s : sensorManager.getSensorList(Sensor.TYPE_ALL)) {
+                if (name.equals(s.getName()) && vendor.equals(s.getVendor())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     @Override
     public boolean isAvailable() {
-        return hasSensor(R.string.gesture_double_twist_sensor_name,
-                R.string.gesture_double_twist_sensor_vendor);
+        return isGestureAvailable(mContext);
     }
 
     @Override
@@ -61,42 +85,31 @@ public class DoubleTwistPreferenceController extends GesturePreferenceController
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final int enabled = (boolean) newValue ? 1 : 0;
-        Settings.Secure.putInt(mContext.getContentResolver(),
+        final int enabled = (boolean) newValue ? ON : OFF;
+        setDoubleTwistPreference(mContext, mUserManager, enabled);
+        return true;
+    }
+
+    public static void setDoubleTwistPreference(Context context, UserManager userManager,
+            int enabled) {
+        Settings.Secure.putInt(context.getContentResolver(),
                 Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, enabled);
-        final int managedProfileUserId = getManagedProfileUserId();
+        final int managedProfileUserId = getManagedProfileId(userManager);
         if (managedProfileUserId != UserHandle.USER_NULL) {
-            Settings.Secure.putIntForUser(mContext.getContentResolver(),
+            Settings.Secure.putIntForUser(context.getContentResolver(),
                 Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, enabled, managedProfileUserId);
         }
-        return true;
     }
 
     @Override
     protected boolean isSwitchPrefEnabled() {
         final int doubleTwistEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
+                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, ON);
         return doubleTwistEnabled != 0;
     }
 
     @VisibleForTesting
-    int getManagedProfileUserId() {
-        return Utils.getManagedProfileId(mUserManager, UserHandle.myUserId());
-    }
-
-    private boolean hasSensor(int nameResId, int vendorResId) {
-        final Resources resources = mContext.getResources();
-        final String name = resources.getString(nameResId);
-        final String vendor = resources.getString(vendorResId);
-        if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(vendor)) {
-            final SensorManager sensorManager =
-                    (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
-            for (Sensor s : sensorManager.getSensorList(Sensor.TYPE_ALL)) {
-                if (name.equals(s.getName()) && vendor.equals(s.getVendor())) {
-                    return true;
-                }
-            }
-        }
-        return false;
+    public static int getManagedProfileId(UserManager userManager) {
+        return Utils.getManagedProfileId(userManager, UserHandle.myUserId());
     }
 }
diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java
index ebfccb5a842a6dd55100a1e83e45eb79b20e88f2..a5df9499fe3f703076d04f89e61d914c745af0a9 100644
--- a/src/com/android/settings/gestures/GesturePreferenceController.java
+++ b/src/com/android/settings/gestures/GesturePreferenceController.java
@@ -23,11 +23,11 @@ import android.support.v7.preference.TwoStatePreference;
 
 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 {
@@ -61,6 +61,8 @@ public abstract class GesturePreferenceController extends PreferenceController
                         ? R.string.gesture_setting_on
                         : R.string.gesture_setting_off);
             }
+            // Different meanings of "Enabled" for the Preference and Controller.
+            preference.setEnabled(canHandleClicks());
         }
     }
 
@@ -81,4 +83,8 @@ public abstract class GesturePreferenceController extends PreferenceController
     protected abstract String getVideoPrefKey();
 
     protected abstract boolean isSwitchPrefEnabled();
+
+    protected boolean canHandleClicks() {
+        return true;
+    }
 }
diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
index c0e6009a56db8272958380dc1588523fd7cb5290..e64c0cf43f149861d570d6315a3304137e5a6c45 100644
--- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
@@ -18,17 +18,30 @@ package com.android.settings.gestures;
 
 import android.annotation.UserIdInt;
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
 import com.android.internal.hardware.AmbientDisplayConfiguration;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.R;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import static android.provider.Settings.Secure.DOZE_PULSE_ON_PICK_UP;
 
 public class PickupGesturePreferenceController extends GesturePreferenceController {
 
-    private static final String PREF_VIDEO_KEY = "gesture_pick_up_video";
+    private final int ON = 1;
+    private final int OFF = 0;
+
+    private static final String PREF_KEY_VIDEO = "gesture_pick_up_video";
     private final String mPickUpPrefKey;
 
+    private final String SECURE_KEY = DOZE_PULSE_ON_PICK_UP;
+
     private final AmbientDisplayConfiguration mAmbientConfig;
     @UserIdInt
     private final int mUserId;
@@ -41,6 +54,12 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
         mPickUpPrefKey = key;
     }
 
+    public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
+        AmbientDisplayConfiguration ambientConfig = new AmbientDisplayConfiguration(context);
+        return !ambientConfig.pulseOnPickupAvailable()
+                || prefs.getBoolean(PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
+    }
+
     @Override
     public boolean isAvailable() {
         return mAmbientConfig.pulseOnPickupAvailable();
@@ -48,7 +67,7 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
 
     @Override
     protected String getVideoPrefKey() {
-        return PREF_VIDEO_KEY;
+        return PREF_KEY_VIDEO;
     }
 
     @Override
@@ -65,7 +84,22 @@ public class PickupGesturePreferenceController extends GesturePreferenceControll
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean enabled = (boolean) newValue;
         Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.DOZE_PULSE_ON_PICK_UP, enabled ? 1 : 0);
+                SECURE_KEY, enabled ? ON : OFF);
         return true;
     }
+
+    @Override
+    public boolean canHandleClicks() {
+        return mAmbientConfig.pulseOnPickupCanBeModified(mUserId);
+    }
+
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                PickupGestureSettings.class.getName(), mPickUpPrefKey,
+                mContext.getString(R.string.display_settings));
+
+        return new InlineSwitchPayload(SECURE_KEY, ResultPayload.SettingsSource.SECURE,
+                ON /* onValue */, intent, isAvailable(), ON /* defaultValue */);
+    }
 }
diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java
index 874f690cd1ce08e1f2b266b9a75f4ba699d1f95a..7cc264c181d4579652c9a8e28329e9112d5283d7 100644
--- a/src/com/android/settings/gestures/PickupGestureSettings.java
+++ b/src/com/android/settings/gestures/PickupGestureSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.UserHandle;
 import android.provider.SearchIndexableResource;
 
@@ -24,9 +25,11 @@ 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.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+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;
@@ -37,6 +40,18 @@ public class PickupGestureSettings extends DashboardFragment {
     private static final String TAG = "PickupGestureSettings";
     private static final String KEY_PICK_UP = "gesture_pick_up";
 
+    public static final String PREF_KEY_SUGGESTION_COMPLETE =
+            "pref_pickup_gesture_suggestion_complete";
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
+                .getSuggestionFeatureProvider(context);
+        SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
+        prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.SETTINGS_GESTURE_PICKUP;
@@ -52,6 +67,11 @@ public class PickupGestureSettings extends DashboardFragment {
         return R.xml.pick_up_gesture_settings;
     }
 
+    @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 2a62674f8132d178d646f4eee6616c5b53d7c595..6f334a512f9f69563a858a5b3ef6d11fb93e8ebd 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java
@@ -17,22 +17,42 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.Utils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
 
 public class SwipeToNotificationPreferenceController extends GesturePreferenceController {
 
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
     private static final String PREF_KEY_VIDEO = "gesture_swipe_down_fingerprint_video";
     private final String mSwipeDownFingerPrefKey;
 
+    private static final String SECURE_KEY = SYSTEM_NAVIGATION_KEYS_ENABLED;
+
     public SwipeToNotificationPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
         super(context, lifecycle);
         mSwipeDownFingerPrefKey = key;
     }
 
+    public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
+        return !isGestureAvailable(context)
+                || prefs.getBoolean(SwipeToNotificationSettings.PREF_KEY_SUGGESTION_COMPLETE,
+                        false);
+    }
+
+    private static boolean isGestureAvailable(Context context) {
+        return Utils.hasFingerprintHardware(context) && context.getResources()
+                .getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys);
+    }
+
     @Override
     public String getPreferenceKey() {
         return mSwipeDownFingerPrefKey;
@@ -45,21 +65,30 @@ public class SwipeToNotificationPreferenceController extends GesturePreferenceCo
 
     @Override
     public boolean isAvailable() {
-        return mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_supportSystemNavigationKeys);
+        return SwipeToNotificationPreferenceController.isAvailable(mContext);
     }
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, (boolean) newValue ? 1 : 0);
+        setSwipeToNotification(mContext, (boolean) newValue);
         return true;
     }
 
     @Override
     protected boolean isSwitchPrefEnabled() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0)
-                == 1;
+        return isSwipeToNotificationOn(mContext);
+    }
+
+    public static boolean isSwipeToNotificationOn(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(), SECURE_KEY, OFF) == ON;
+    }
+
+    public static boolean setSwipeToNotification(Context context, boolean isEnabled) {
+        return Settings.Secure.putInt(
+                context.getContentResolver(), SECURE_KEY, isEnabled ? ON : OFF);
+    }
+
+    public static boolean isAvailable(Context context) {
+        return isGestureAvailable(context);
     }
 }
diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
index f19565ae53e82323dfadf1f0e8403b28291d773e..05a1202a05d8590e222be40f4d38fdae76c50668 100644
--- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java
+++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java
@@ -17,14 +17,17 @@
 package com.android.settings.gestures;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 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.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+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;
@@ -36,6 +39,18 @@ public class SwipeToNotificationSettings extends DashboardFragment {
 
     private static final String KEY = "gesture_swipe_down_fingerprint";
 
+    public static final String PREF_KEY_SUGGESTION_COMPLETE =
+            "pref_swipe_to_notification_suggestion_complete";
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
+                .getSuggestionFeatureProvider(context);
+        SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
+        prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.SETTINGS_GESTURE_SWIPE_TO_NOTIFICATION;
diff --git a/src/com/android/settings/graph/BottomLabelLayout.java b/src/com/android/settings/graph/BottomLabelLayout.java
new file mode 100644
index 0000000000000000000000000000000000000000..45fab38bc3bc9e8467b1750ff5a279c4c82cb663
--- /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 0000000000000000000000000000000000000000..a39cb43e27bde199d11a9384af2084a5985e2244
--- /dev/null
+++ b/src/com/android/settings/graph/UsageGraph.java
@@ -0,0 +1,309 @@
+/*
+ * 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.support.annotation.VisibleForTesting;
+import android.util.AttributeSet;
+import android.util.SparseIntArray;
+import android.util.TypedValue;
+import android.view.View;
+
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settingslib.R;
+
+public class UsageGraph extends View {
+
+    private static final int PATH_DELIM = -1;
+    public static final String LOG_TAG = "UsageGraph";
+
+    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) {
+        final long startTime = System.currentTimeMillis();
+        mMaxX = maxX;
+        mMaxY = maxY;
+        calculateLocalPaths();
+        postInvalidate();
+        BatteryUtils.logRuntime(LOG_TAG, "setMax", startTime);
+    }
+
+    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) {
+        final long startTime = System.currentTimeMillis();
+        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();
+        BatteryUtils.logRuntime(LOG_TAG, "addPathAndUpdate", startTime);
+    }
+
+    void setAccentColor(int color) {
+        mAccentColor = color;
+        mLinePaint.setColor(mAccentColor);
+        updateGradient();
+        postInvalidate();
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        final long startTime = System.currentTimeMillis();
+        super.onSizeChanged(w, h, oldw, oldh);
+        updateGradient();
+        calculateLocalPaths();
+        BatteryUtils.logRuntime(LOG_TAG, "onSizeChanged", startTime);
+    }
+
+    private void calculateLocalPaths() {
+        calculateLocalPaths(mPaths, mLocalPaths);
+        calculateLocalPaths(mProjectedPaths, mLocalProjectedPaths);
+    }
+
+    @VisibleForTesting
+    void calculateLocalPaths(SparseIntArray paths, SparseIntArray localPaths) {
+        final long startTime = System.currentTimeMillis();
+        if (getWidth() == 0) {
+            return;
+        }
+        localPaths.clear();
+        // Store the local coordinates of the most recent point.
+        int lx = 0;
+        int ly = PATH_DELIM;
+        boolean skippedLastPoint = false;
+        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 && skippedLastPoint) {
+                    // Add back skipped point to complete the path.
+                    localPaths.put(lx, ly);
+                }
+                skippedLastPoint = false;
+                localPaths.put(lx + 1, PATH_DELIM);
+            } else {
+                lx = getX(x);
+                ly = getY(y);
+                // Skip this point if it is not far enough from the last one added.
+                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)) {
+                        skippedLastPoint = true;
+                        continue;
+                    }
+                }
+                skippedLastPoint = false;
+                localPaths.put(lx, ly);
+            }
+        }
+        BatteryUtils.logRuntime(LOG_TAG, "calculateLocalPaths", startTime);
+    }
+
+    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) {
+        final long startTime = System.currentTimeMillis();
+        // 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 && mLocalProjectedPaths.size() == 0) {
+            return;
+        }
+
+        drawLinePath(canvas, mLocalProjectedPaths, mDottedPaint);
+        drawFilledPath(canvas, mLocalPaths, mFillPaint);
+        drawLinePath(canvas, mLocalPaths, mLinePaint);
+        BatteryUtils.logRuntime(LOG_TAG, "onDraw", startTime);
+    }
+
+    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 0000000000000000000000000000000000000000..38eb027fc9a26b976df0f2c29da31f35eca62cb0
--- /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 f8232b8d8118104e5124fc483e2b57562f19e950..40efb07b85f7c89acd2915dface0bd8f97984c7f 100644
--- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
@@ -26,9 +26,9 @@ import android.text.TextUtils;
 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 aa9f5ad7780e75844b8964a4f98a4f2b13e001c2..03d8221dcbbb985d0122e20e22203d3a0090b0de 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
@@ -22,11 +22,11 @@ import android.support.v7.preference.Preference;
 
 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 1c4d642fdeb99fc7e12c8d0f2f364a88d6fa46fa..cca6cbe6c5059a0a6b4483c293fb0b716c093cf5 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -16,7 +16,9 @@
 
 package com.android.settings.language;
 
+import android.app.Activity;
 import android.content.ComponentName;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
@@ -35,9 +37,9 @@ import com.android.internal.logging.nano.MetricsProto;
 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.DoubleTapPowerPreferenceController;
 import com.android.settings.gestures.DoubleTapScreenPreferenceController;
@@ -48,7 +50,9 @@ import com.android.settings.inputmethod.GameControllerPreferenceController;
 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;
@@ -82,6 +86,20 @@ public class LanguageAndInputSettings extends DashboardFragment {
     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
@@ -118,7 +136,8 @@ public class LanguageAndInputSettings extends DashboardFragment {
 
         controllers.add(gameControllerPreferenceController);
         // Gestures
-        controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST));
+        controllers.add(new AssistGesturePreferenceController(context, lifecycle, KEY_ASSIST,
+                false /* assistOnly */));
         controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle,
                 KEY_SWIPE_DOWN));
         controllers.add(new DoubleTwistPreferenceController(context, lifecycle, KEY_DOUBLE_TWIST));
@@ -141,32 +160,54 @@ public class LanguageAndInputSettings extends DashboardFragment {
 
         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) {
+            final ContentResolver contentResolver = mContext.getContentResolver();
             if (listening) {
-                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 (mFeatureProvider.isSensorAvailable(mContext)) {
+                    final boolean assistGestureEnabled = Settings.Secure.getInt(
+                            contentResolver, Settings.Secure.ASSIST_GESTURE_ENABLED, 1) != 0;
+                    final boolean assistGestureSilenceEnabled = Settings.Secure.getInt(
+                            contentResolver, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,
+                            1) != 0;
+                    String summary;
+                    if (mFeatureProvider.isSupported(mContext) && assistGestureEnabled) {
+                        summary = mContext.getString(
+                                R.string.language_input_gesture_summary_on_with_assist);
+                    } else if (assistGestureSilenceEnabled) {
+                        summary = mContext.getString(
+                                R.string.language_input_gesture_summary_on_non_assist);
+                    } else {
+                        summary = mContext.getString(R.string.language_input_gesture_summary_off);
+                    }
+                    mSummaryLoader.setSummary(this, summary);
+                } else {
+                    final String flattenComponent = Settings.Secure.getString(
+                            contentResolver, Settings.Secure.DEFAULT_INPUT_METHOD);
+                    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 766ee472bf1669310811c0851f70ab38b99f9300..bd7aea1eb9696669c60da9885edf27330824205c 100644
--- a/src/com/android/settings/location/LocationPreferenceController.java
+++ b/src/com/android/settings/location/LocationPreferenceController.java
@@ -15,20 +15,49 @@
  */
 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.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineListPayload;
+import com.android.settings.search.ResultPayload;
+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
@@ -37,6 +66,21 @@ public class LocationPreferenceController extends PreferenceController {
         mPreference = screen.findPreference(KEY_LOCATION);
     }
 
+    @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 +102,10 @@ public class LocationPreferenceController extends PreferenceController {
 
     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);
     }
@@ -80,4 +124,14 @@ public class LocationPreferenceController extends PreferenceController {
         return 0;
     }
 
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                LocationSettings.class.getName(), KEY_LOCATION,
+                mContext.getString(R.string.location_settings_title));
+
+        return new InlineListPayload(Secure.LOCATION_MODE,
+                ResultPayload.SettingsSource.SECURE, intent, isAvailable(),
+                Secure.LOCATION_MODE_HIGH_ACCURACY + 1, Secure.LOCATION_MODE_OFF);
+    }
 }
diff --git a/src/com/android/settings/location/LocationSettingsBase.java b/src/com/android/settings/location/LocationSettingsBase.java
index 69fbd5c8597b3be05f4e63dc78e9b1ceb0d22bbe..741d607a3b3b7327d7859644752402c047a42f78 100644
--- a/src/com/android/settings/location/LocationSettingsBase.java
+++ b/src/com/android/settings/location/LocationSettingsBase.java
@@ -85,13 +85,23 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment {
     /** Called when location mode has changed. */
     public abstract void onModeChanged(int mode, boolean restricted);
 
-    private boolean isRestricted() {
-        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+    public static boolean isRestricted(Context context) {
+        final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
         return um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
     }
 
+    public static boolean updateLocationMode(Context context, int oldMode, int newMode) {
+        Intent intent = new Intent(MODE_CHANGING_ACTION);
+        intent.putExtra(CURRENT_MODE_KEY, oldMode);
+        intent.putExtra(NEW_MODE_KEY, newMode);
+        context.sendBroadcast(intent, android.Manifest.permission.WRITE_SECURE_SETTINGS);
+        return Settings.Secure.putInt(context.getContentResolver(), Settings.Secure.LOCATION_MODE,
+                newMode);
+    }
+
     public void setLocationMode(int mode) {
-        if (isRestricted()) {
+        Context context = getActivity();
+        if (isRestricted(context)) {
             // Location toggling disabled by user restriction. Read the current location mode to
             // update the location master switch.
             if (Log.isLoggable(TAG, Log.INFO)) {
@@ -104,11 +114,8 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment {
             }
             return;
         }
-        Intent intent = new Intent(MODE_CHANGING_ACTION);
-        intent.putExtra(CURRENT_MODE_KEY, mCurrentMode);
-        intent.putExtra(NEW_MODE_KEY, mode);
-        getActivity().sendBroadcast(intent, android.Manifest.permission.WRITE_SECURE_SETTINGS);
-        Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCATION_MODE, mode);
+
+        updateLocationMode(context, mCurrentMode, mode);
         refreshLocationMode();
     }
 
@@ -120,7 +127,7 @@ public abstract class LocationSettingsBase extends SettingsPreferenceFragment {
             if (Log.isLoggable(TAG, Log.INFO)) {
                 Log.i(TAG, "Location mode has been changed");
             }
-            onModeChanged(mode, isRestricted());
+            onModeChanged(mode, isRestricted(getActivity()));
         }
     }
 }
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index a25c5f84dcfa5f32932818a4e1ef6dd8f555ba47..05c428a6b82464677b4b66d06bed7ad5f8cd19ce 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -29,10 +29,10 @@ import com.android.internal.telephony.TelephonyProperties;
 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 {
@@ -45,7 +45,6 @@ public class AirplaneModePreferenceController extends PreferenceController
 
     private final Fragment mFragment;
     private final MetricsFeatureProvider mMetricsFeatureProvider;
-    private final PackageManager mPackageManager;
     private AirplaneModeEnabler mAirplaneModeEnabler;
     private SwitchPreference mAirplaneModePreference;
 
@@ -53,7 +52,6 @@ public class AirplaneModePreferenceController extends PreferenceController
     public AirplaneModePreferenceController(Context context, Fragment hostFragment) {
         super(context);
         mFragment = hostFragment;
-        mPackageManager = context.getPackageManager();
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
     }
 
@@ -88,7 +86,11 @@ public class AirplaneModePreferenceController extends PreferenceController
 
     @Override
     public boolean isAvailable() {
-        return !mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEVISION);
+        return isAvailable(mContext);
+    }
+
+    public static boolean isAvailable(Context context) {
+        return !context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION);
     }
 
     @Override
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index c7abf905cd9102e4599dc5402fc8efbe24a5fdc3..5922045bbb844abeb7df8386c2b596854190e740 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -26,24 +26,23 @@ import android.telephony.TelephonyManager;
 
 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;
-import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
 
 public class MobileNetworkPreferenceController extends PreferenceController implements
         LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
 
-    private final UserManager mUserManager;
     private final boolean mIsSecondaryUser;
     private final TelephonyManager mTelephonyManager;
+    private final UserManager mUserManager;
     private Preference mPreference;
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     PhoneStateListener mPhoneStateListener;
 
     public MobileNetworkPreferenceController(Context context) {
@@ -55,9 +54,16 @@ public class MobileNetworkPreferenceController extends PreferenceController impl
 
     @Override
     public boolean isAvailable() {
-        return !mIsSecondaryUser
-                && !Utils.isWifiOnly(mContext)
-                && !hasBaseUserRestriction(mContext, DISALLOW_CONFIG_MOBILE_NETWORKS, myUserId());
+        return !isUserRestricted() && !Utils.isWifiOnly(mContext);
+    }
+
+    public boolean isUserRestricted() {
+        final RestrictedLockUtilsWrapper wrapper = new RestrictedLockUtilsWrapper();
+        return mIsSecondaryUser ||
+                wrapper.hasBaseUserRestriction(
+                        mContext,
+                        DISALLOW_CONFIG_MOBILE_NETWORKS,
+                        myUserId());
     }
 
     @Override
diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index 9d0878f8cd066098faa50e8ef23aa19731c7e70b..da4902dd8c5ae3f4fc6c9387da6a81ffe44cc160 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -32,9 +32,9 @@ import android.util.Log;
 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 a28a726469583d8bc3da508f462d545c6302531d..35de1bb60db0f84f56b552fc92b60516a1f11df2 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 android.view.MenuInflater;
 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;
@@ -67,6 +69,11 @@ public class NetworkDashboardFragment extends DashboardFragment implements
         mNetworkResetController = new NetworkResetActionMenuController(context);
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_network_dashboard;
+    }
+
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
@@ -133,6 +140,66 @@ public class NetworkDashboardFragment extends DashboardFragment implements
         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 @@ public class NetworkDashboardFragment extends DashboardFragment implements
 
                 @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/RestrictedLockUtilsWrapper.java b/src/com/android/settings/network/RestrictedLockUtilsWrapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..de5b80851d354ca15f178c5cd4863bb0cf7ab562
--- /dev/null
+++ b/src/com/android/settings/network/RestrictedLockUtilsWrapper.java
@@ -0,0 +1,15 @@
+package com.android.settings.network;
+
+import android.content.Context;
+import com.android.settingslib.RestrictedLockUtils;
+
+/**
+ * Wrapper class needed to be able to test classes which use RestrictedLockUtils methods.
+ * Unfortunately there is no way to deal with this until robolectric is updated due to the fact
+ * that it is a static method and it uses new API's.
+ */
+public class RestrictedLockUtilsWrapper {
+    public boolean hasBaseUserRestriction(Context context, String userRestriction, int userId) {
+        return RestrictedLockUtils.hasBaseUserRestriction(context, userRestriction, userId);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index fab700b09393a8cd72f7949c6326a80551037c78..933bc8a33a59ccb579690f8a7c917f30f1f766c2 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -25,6 +25,7 @@ import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
 import android.provider.Settings;
@@ -35,20 +36,22 @@ import android.support.v7.preference.PreferenceScreen;
 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.OnCreate;
+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;
 
 import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
+
 import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
 import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
 
 public class TetherPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnResume, OnPause, OnDestroy {
+        implements LifecycleObserver, OnCreate, OnResume, OnPause, OnDestroy {
 
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
 
@@ -56,7 +59,8 @@ public class TetherPreferenceController extends PreferenceController
     private final AtomicReference<BluetoothPan> mBluetoothPan;
     private final ConnectivityManager mConnectivityManager;
     private final BluetoothAdapter mBluetoothAdapter;
-    private final BluetoothProfile.ServiceListener mBtProfileServiceListener =
+    @VisibleForTesting
+    final BluetoothProfile.ServiceListener mBtProfileServiceListener =
             new android.bluetooth.BluetoothProfile.ServiceListener() {
                 public void onServiceConnected(int profile, BluetoothProfile proxy) {
                     mBluetoothPan.set((BluetoothPan) proxy);
@@ -84,18 +88,13 @@ public class TetherPreferenceController extends PreferenceController
     public TetherPreferenceController(Context context, Lifecycle lifecycle) {
         super(context);
         mBluetoothPan = new AtomicReference<>();
-        mAdminDisallowedTetherConfig = checkIfRestrictionEnforced(
-                context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null;
+        mAdminDisallowedTetherConfig = isTetherConfigDisallowed(context);
         mConnectivityManager =
                 (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
         if (lifecycle != null) {
             lifecycle.addObserver(this);
         }
-        if (mBluetoothAdapter != null) {
-            mBluetoothAdapter.getProfileProxy(context, mBtProfileServiceListener,
-                    BluetoothProfile.PAN);
-        }
     }
 
     @Override
@@ -130,6 +129,14 @@ public class TetherPreferenceController extends PreferenceController
         return KEY_TETHER_SETTINGS;
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        if (mBluetoothAdapter != null) {
+            mBluetoothAdapter.getProfileProxy(mContext, mBtProfileServiceListener,
+                    BluetoothProfile.PAN);
+        }
+    }
+
     @Override
     public void onResume() {
         if (mAirplaneModeObserver == null) {
@@ -139,7 +146,7 @@ public class TetherPreferenceController extends PreferenceController
             mTetherReceiver = new TetherBroadcastReceiver();
         }
         mContext.registerReceiver(
-            mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
+                mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
         mContext.getContentResolver()
                 .registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver);
     }
@@ -162,6 +169,11 @@ public class TetherPreferenceController extends PreferenceController
         }
     }
 
+    public static boolean isTetherConfigDisallowed(Context context) {
+        return checkIfRestrictionEnforced(
+                context, DISALLOW_CONFIG_TETHERING, UserHandle.myUserId()) != null;
+    }
+
     @VisibleForTesting
     void updateSummary() {
         if (mPreference == null) {
diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index 72b361a563087810075fac2fc16644c2a4fe3a15..a62be76d90ef8996ebfd64f5a9e0b378220d87fd 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.LegacyVpnInfo;
 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/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java
index 5bda1ad361fb9a118e67634f540570e4c6dd41e0..14ee779bed452476c67f8e794ffff1e454e61bb3 100644
--- a/src/com/android/settings/nfc/NfcEnabler.java
+++ b/src/com/android/settings/nfc/NfcEnabler.java
@@ -98,6 +98,7 @@ public class NfcEnabler implements Preference.OnPreferenceChangeListener {
         // Turn NFC on/off
 
         final boolean desiredState = (Boolean) value;
+        mSwitch.setChecked(desiredState);
         mSwitch.setEnabled(false);
 
         if (desiredState) {
diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java
index 072d454ff580e8ffeedbad8be3ed664822e012a9..239377d0ad4d91a7c5faadb1fb4318f979a6ff07 100644
--- a/src/com/android/settings/nfc/NfcPaymentPreference.java
+++ b/src/com/android/settings/nfc/NfcPaymentPreference.java
@@ -30,9 +30,9 @@ import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.RadioButton;
 
-import com.android.settings.CustomDialogPreference;
 import com.android.settings.R;
 import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+import com.android.settingslib.CustomDialogPreference;
 
 import java.util.List;
 
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index 7164b5b28238d0bbbafa74ba1b8bab4d2074b964..e5d47fb92d3801b0b45a2b5784f20ef19953394d 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.Preference;
 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;
 
@@ -66,10 +66,8 @@ public class NfcPreferenceController extends PreferenceController
         mBeamPreference = (RestrictedPreference) screen.findPreference(
                 KEY_ANDROID_BEAM_SETTINGS);
         mNfcEnabler = new NfcEnabler(mContext, mNfcPreference, mBeamPreference);
-        String toggleable = Settings.Global.getString(mContext.getContentResolver(),
-                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
         // Manually set dependencies for NFC when not toggleable.
-        if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_NFC)) {
+        if (!isToggleableInAirplaneMode(mContext)) {
             mAirplaneModeObserver = new AirplaneModeObserver();
             updateNfcPreference();
         }
@@ -133,6 +131,12 @@ public class NfcPreferenceController extends PreferenceController
         mBeamPreference.setEnabled(toggleable);
     }
 
+    public static boolean isToggleableInAirplaneMode(Context context) {
+        String toggleable = Settings.Global.getString(context.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
+        return toggleable != null && toggleable.contains(Settings.Global.RADIO_NFC);
+    }
+
     private final class AirplaneModeObserver extends ContentObserver {
         private final Uri AIRPLANE_MODE_URI =
                 Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);
diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java
index 6f8a1742a2233ae3ba8f2faa60afc53b6f9a9617..d914cd8ac29a9d16b1c2eb0ce0d9c647438980d3 100644
--- a/src/com/android/settings/nfc/PaymentSettings.java
+++ b/src/com/android/settings/nfc/PaymentSettings.java
@@ -33,14 +33,13 @@ import android.view.ViewGroup;
 
 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;
 
@@ -163,11 +162,13 @@ public class PaymentSettings extends SettingsPreferenceFragment implements Index
 
             @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 e9c4b57f8b01fe2a1e3761cd59d42f1cc5d6b855..cd1f6e39cd6f269295278a115bde80588ed29ea9 100644
--- a/src/com/android/settings/notification/AlarmVolumePreferenceController.java
+++ b/src/com/android/settings/notification/AlarmVolumePreferenceController.java
@@ -20,8 +20,8 @@ import android.content.Context;
 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 6b6b183de214e72bd17b8f6f0aec48c4ab58c8fa..5cac0bb4cf0514f82acf43f7e3111a2610de1b43 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.internal.logging.nano.MetricsProto.MetricsEvent;
 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 @@ public class AppNotificationSettings extends NotificationSettingsBase {
     }
 
     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_NONE,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE)
                 .done(activity, getPrefContext());
         pref.setKey(KEY_HEADER);
         getPreferenceScreen().addPreference(pref);
diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
index 225ede5974ea6e332a055fbeed8c07ecc828ebea..d77be7bd6479416fb5ddc09aa7a1e5b1f44866f8 100644
--- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -18,6 +18,7 @@ package com.android.settings.notification;
 
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Handler;
@@ -25,12 +26,15 @@ import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
-import android.util.Log;
 
+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.settings.search.DatabaseIndexingUtils;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
+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;
 
@@ -39,7 +43,8 @@ public class BadgingNotificationPreferenceController extends PreferenceControlle
 
     private static final String TAG = "BadgeNotifPrefContr";
     private static final String KEY_NOTIFICATION_BADGING = "notification_badging";
-    private static final int DEFAULT_VALUE = 1;
+    private static final int ON = 1;
+    private static final int OFF = 0;
 
     private SettingObserver mSettingObserver;
 
@@ -84,7 +89,7 @@ public class BadgingNotificationPreferenceController extends PreferenceControlle
     @Override
     public void updateState(Preference preference) {
         final boolean checked = Settings.Secure.getInt(mContext.getContentResolver(),
-                NOTIFICATION_BADGING, DEFAULT_VALUE) == 1;
+                NOTIFICATION_BADGING, ON) == ON;
         ((TwoStatePreference) preference).setChecked(checked);
     }
 
@@ -92,7 +97,7 @@ public class BadgingNotificationPreferenceController extends PreferenceControlle
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final boolean val = (Boolean) newValue;
         return Settings.Secure.putInt(mContext.getContentResolver(),
-                NOTIFICATION_BADGING, val ? 1 : 0);
+                NOTIFICATION_BADGING, val ? ON : OFF);
     }
 
     class SettingObserver extends ContentObserver {
@@ -123,4 +128,15 @@ public class BadgingNotificationPreferenceController extends PreferenceControlle
             }
         }
     }
+
+    @Override
+    public ResultPayload getResultPayload() {
+        final Intent intent = DatabaseIndexingUtils.buildSubsettingIntent(mContext,
+                ConfigureNotificationSettings.class.getName(), KEY_NOTIFICATION_BADGING,
+                mContext.getString(R.string.configure_notification_settings));
+
+        return new InlineSwitchPayload(Settings.Secure.NOTIFICATION_BADGING,
+                ResultPayload.SettingsSource.SECURE, ON /* onValue */, intent, isAvailable(),
+                ON /* defaultValue */);
+    }
 }
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index 3bd0557918947471c350478d48b64c53c0c3f3b0..6c052d5513a70313bb5a4e467ca78b63f2b7f0b9 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.AppHeader;
 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 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
     private NotificationSoundPreference mRingtone;
     private FooterPreference mFooter;
     private NotificationChannelGroup mChannelGroup;
-    private AppHeaderController mHeaderPref;
+    private EntityHeaderController mHeaderPref;
 
     @Override
     public int getMetricsCategory() {
@@ -134,21 +133,21 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
     }
 
     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);
     }
@@ -353,7 +352,9 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
         if (mRingtone != null) {
             mRingtone.onActivityResult(requestCode, resultCode, data);
         }
-        mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
+        if (mChannel != null) {
+            mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
+        }
     }
 
     boolean canPulseLight() {
diff --git a/src/com/android/settings/notification/ChargingSoundPreferenceController.java b/src/com/android/settings/notification/ChargingSoundPreferenceController.java
index 1114b4a662212f33b530bd9e116a5b3ba7bead35..55cba9677f03c8c311604a09428a89b09ad6df28 100644
--- a/src/com/android/settings/notification/ChargingSoundPreferenceController.java
+++ b/src/com/android/settings/notification/ChargingSoundPreferenceController.java
@@ -22,7 +22,7 @@ import android.content.Context;
 
 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 a06d0698e6063d0a3e84a8b047de5bad2b2e2272..26fc0a04ce62ef9aeaa5cfd2785dab5abceca007 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 @@ public class ConfigureNotificationSettings extends DashboardFragment {
         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 08e1a7d5d719e942b2887acbc29a4b999e64733c..e0ca2996834a62bf5c2244623f140646904a4183 100644
--- a/src/com/android/settings/notification/DialPadTonePreferenceController.java
+++ b/src/com/android/settings/notification/DialPadTonePreferenceController.java
@@ -23,7 +23,7 @@ import android.content.Context;
 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 20c20b46e362d33b6837080dc6e5a22db43a1b61..f7f13c58ff5640968f7cbd6d2e835a086fec91d6 100644
--- a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
+++ b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java
@@ -24,7 +24,7 @@ import android.content.res.Resources;
 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 ee277f047adcd813526327e0ae92a6d242cc54eb..476fd6a990ea30f56e6d8b74196774e7a8dbaae6 100644
--- a/src/com/android/settings/notification/DockingSoundPreferenceController.java
+++ b/src/com/android/settings/notification/DockingSoundPreferenceController.java
@@ -22,7 +22,7 @@ import android.content.Context;
 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 bc21f44fd7117f3267fed9db47cbff6de48a45a1..a67ec8aac302d80119d4da5c730e57ea6490c6de 100644
--- a/src/com/android/settings/notification/EmergencyTonePreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyTonePreferenceController.java
@@ -25,7 +25,7 @@ import android.provider.Settings.Global;
 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 1f0c4a8738214b719fdd04ded54314708c401a8b..228e1857c2005ae6ff517ba983fe412132eb9910 100644
--- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -33,10 +33,10 @@ import com.android.internal.widget.LockPatternUtils;
 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 fb8dba55ae130d8a1994e5cf3b1b51acaa07ce28..4f167f8750de00ca02bbb62a0e6e1f1857908cc3 100644
--- a/src/com/android/settings/notification/MediaVolumePreferenceController.java
+++ b/src/com/android/settings/notification/MediaVolumePreferenceController.java
@@ -18,8 +18,8 @@ package com.android.settings.notification;
 
 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 c7b366ea69470b0333aee9347a5afba286702804..48ca207e339d710e541c04a140a662d02237698f 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.R;
 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 40448a432fde3990f07336d17cec7fcecd528aa1..5f888f8af65d07557f7f2ffe8edec401e2fb47a6 100644
--- a/src/com/android/settings/notification/NotificationVolumePreferenceController.java
+++ b/src/com/android/settings/notification/NotificationVolumePreferenceController.java
@@ -21,8 +21,8 @@ import android.media.AudioManager;
 
 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 3e37ab0fc0f1b4af14550529891aaa2820aaac38..d6db8ac9311e6fef44dc190248a9edebf4fe449b 100644
--- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
@@ -28,9 +28,9 @@ import android.support.v7.preference.TwoStatePreference;
 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/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index b2690629167ef8ce4fff4336b8b8ae66a6aefcd5..93c14c7429fa7a8c6fff230667bf1f6dbc0b221c 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -23,6 +23,7 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -41,6 +42,7 @@ import com.android.settings.RestrictedRadioButton;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.SetupRedactionInterstitial;
+import com.android.settings.SetupWizardUtils;
 import com.android.settings.Utils;
 import com.android.settingslib.RestrictedLockUtils;
 
@@ -53,6 +55,12 @@ public class RedactionInterstitial extends SettingsActivity {
         return modIntent;
     }
 
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent());
+        super.onApplyThemeResource(theme, resid, first);
+    }
+
     @Override
     protected boolean isValidFragment(String fragmentName) {
         return RedactionInterstitialFragment.class.getName().equals(fragmentName);
diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java
index a94d0861e2dcbfcfa0455a376ac670c923233654..8b7822507f9531a53e6cb6da5a2e3afdd7d45b17 100644
--- a/src/com/android/settings/notification/RingVolumePreferenceController.java
+++ b/src/com/android/settings/notification/RingVolumePreferenceController.java
@@ -33,8 +33,8 @@ import android.util.Log;
 
 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 f9905c056e623ac92a8c6d1c76f23076cf7890ef..b08b8f840900d5f069acef9b4041a0ec19c2c705 100644
--- a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
+++ b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java
@@ -22,7 +22,7 @@ import android.content.Context;
 
 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 64d65bb841199310ea0f9468427db3c3428f9168..413b4a2c0e2dab0183fddede4cf06f799f4986fb 100644
--- a/src/com/android/settings/notification/SettingPrefController.java
+++ b/src/com/android/settings/notification/SettingPrefController.java
@@ -28,10 +28,10 @@ import android.support.v7.preference.PreferenceScreen;
 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 ec7351a32096782cdfc08811f00fc2d3d1df6f8b..8bee301f258a0221c40026a46e70df3d2a6fb123 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -32,9 +32,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 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 4ca5ea002de201b8f185552a5d849fb51a396745..4e25507aef1192fe089a5858194d2daf699003f6 100644
--- a/src/com/android/settings/notification/TouchSoundPreferenceController.java
+++ b/src/com/android/settings/notification/TouchSoundPreferenceController.java
@@ -24,7 +24,7 @@ import android.media.AudioManager;
 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 544c3729949fe299f58cb1d7cd85ddc4313dbbd1..acb6b4d52c3dc5700e5c8ed1e0954ef432ba493b 100644
--- a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java
+++ b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java
@@ -22,7 +22,7 @@ import android.content.Context;
 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 2160f3d26033b728dc87c9e06b610c4e4041dffe..338b652ee412b140e4fec55b10974ec9bb7fe0b7 100644
--- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
+++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
@@ -28,9 +28,9 @@ import android.support.v7.preference.TwoStatePreference;
 
 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 b4fe6d8f8b9d6a9ec9af9d02bcc0dd31c122e4cd..89f1e2747b724fec793d61ab222f786faadc72fb 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.preference.SeekBarVolumizer;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -31,7 +32,7 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import com.android.settings.SeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 
 import java.util.Objects;
 
@@ -51,30 +52,38 @@ public class VolumeSeekBarPreference extends SeekBarPreference {
     private int mIconResId;
     private int mMuteIconResId;
     private boolean mStopped;
+    @VisibleForTesting
+    AudioManager mAudioManager;
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
             int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         setLayoutResource(R.layout.preference_volume_slider);
+        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
     }
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         setLayoutResource(R.layout.preference_volume_slider);
+        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
     }
 
     public VolumeSeekBarPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.preference_volume_slider);
+        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
     }
 
     public VolumeSeekBarPreference(Context context) {
         super(context);
         setLayoutResource(R.layout.preference_volume_slider);
+        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
     }
 
     public void setStream(int stream) {
         mStream = stream;
+        setMax(mAudioManager.getStreamMaxVolume(mStream));
+        setProgress(mAudioManager.getStreamVolume(mStream));
     }
 
     public void setCallback(Callback callback) {
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
index eeb9c282bb620106251b003fbd05ce7da97ab007..501cedcd8341ad58fc685c6323b5fb35e66571f4 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
@@ -19,11 +19,11 @@ package com.android.settings.notification;
 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 a80f5037ccd9adea5b5394d840cd08b8d47517f9..465a2ec3ae9daea66050c58acd5be9ccc7babf45 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.R;
 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/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 854857ada4507623a70ae337fd8e1a7ff4771b1f..e6b10c3c4e6e2557f34b6b89e4092d85ff9f2d36 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -45,6 +45,7 @@ import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
+import com.android.settingslib.TwoTargetPreference;
 
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
@@ -171,9 +172,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
                 ? getString(R.string.switch_off_text)
                 : getString(R.string.zen_mode_rule_summary_enabled_combination, mode);
 
-        return isSystemRule ? ruleState
-                : getString(R.string.zen_mode_rule_summary_provider_combination,
-                        providerLabel, ruleState);
+        return ruleState;
     }
 
     private static ManagedServiceSettings.Config getConditionProviderConfig() {
@@ -286,7 +285,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
         return R.string.help_uri_interruptions;
     }
 
-    private class ZenRulePreference extends Preference {
+    private class ZenRulePreference extends TwoTargetPreference {
         final CharSequence mName;
         final String mId;
         final boolean appExists;
@@ -306,11 +305,8 @@ public class ZenModeSettings extends ZenModeSettingsBase {
 
             try {
                 ApplicationInfo info = mPm.getApplicationInfo(rule.getOwner().getPackageName(), 0);
-                LoadIconTask task = new LoadIconTask(this);
-                task.execute(info);
                 setSummary(computeRuleSummary(rule, isSystemRule, info.loadLabel(mPm)));
             } catch (PackageManager.NameNotFoundException e) {
-                setIcon(R.drawable.ic_label);
                 appExists = false;
                 return;
             }
@@ -325,8 +321,11 @@ public class ZenModeSettings extends ZenModeSettingsBase {
             ComponentName settingsActivity = getSettingsActivity(si);
             setIntent(getRuleIntent(action, settingsActivity, mId));
             setSelectable(settingsActivity != null || isSystemRule);
+        }
 
-            setWidgetLayoutResource(R.layout.zen_rule_widget);
+        @Override
+        protected int getSecondTargetResId() {
+            return R.layout.zen_rule_widget;
         }
 
         @Override
@@ -347,29 +346,6 @@ public class ZenModeSettings extends ZenModeSettingsBase {
         };
     }
 
-    private class LoadIconTask extends AsyncTask<ApplicationInfo, Void, Drawable> {
-        private final WeakReference<Preference> prefReference;
-
-        public LoadIconTask(Preference pref) {
-            prefReference = new WeakReference<>(pref);
-        }
-
-        @Override
-        protected Drawable doInBackground(ApplicationInfo... params) {
-            return params[0].loadIcon(mPm);
-        }
-
-        @Override
-        protected void onPostExecute(Drawable icon) {
-            if (icon != null) {
-                final Preference pref = prefReference.get();
-                if (pref != null) {
-                    pref.setIcon(icon);
-                }
-            }
-        }
-    }
-
     public static class SummaryBuilder {
 
         private Context mContext;
@@ -380,10 +356,10 @@ public class ZenModeSettings extends ZenModeSettingsBase {
 
         String getPrioritySettingSummary(Policy policy) {
             String s = mContext.getString(R.string.zen_mode_alarms);
-            s = append(s, isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_REMINDERS),
+            s = prepend(s, isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_EVENTS),
+                    R.string.zen_mode_events);
+            s = prepend(s, isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_REMINDERS),
                 R.string.zen_mode_reminders);
-            s = append(s, isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_EVENTS),
-                R.string.zen_mode_events);
             if (isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_MESSAGES)) {
                 if (policy.priorityMessageSenders == Policy.PRIORITY_SENDERS_ANY) {
                     s = append(s, true, R.string.zen_mode_all_messages);
@@ -448,6 +424,15 @@ public class ZenModeSettings extends ZenModeSettingsBase {
             return s;
         }
 
+        @VisibleForTesting
+        String prepend(String s, boolean condition, int resId) {
+            if (condition) {
+                return mContext.getString(
+                        R.string.join_many_items_middle, mContext.getString(resId), s);
+            }
+            return s;
+        }
+
         private boolean isCategoryEnabled(Policy policy, int categoryType) {
             return (policy.priorityCategories & categoryType) != 0;
         }
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index e7d508838038f1f9f611b2405b133056c55d205f..4c4621abb35344e4d5d36157bbc9f32828d4cde4 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -22,6 +22,7 @@ import android.util.Log;
 
 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.fuelgauge.PowerUsageFeatureProvider;
 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 class FeatureFactory {
 
     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 b39a2a096df28dac877ba013037b843c876f3eee..d4ee912a5ee3adf4f7ca2b665bad22490f189ac6 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.ApplicationFeatureProvider;
 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.AssistGestureFeatureProvider;
 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 @@ public class FeatureFactoryImpl extends FeatureFactory {
     private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
     private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
     private UserFeatureProvider mUserFeatureProvider;
+    private BluetoothFeatureProvider mBluetoothFeatureProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -168,6 +171,14 @@ public class FeatureFactoryImpl extends FeatureFactory {
         return mUserFeatureProvider;
     }
 
+    @Override
+    public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
+        if (mBluetoothFeatureProvider == null) {
+            mBluetoothFeatureProvider = new BluetoothFeatureProviderImpl();
+        }
+        return mBluetoothFeatureProvider;
+    }
+
     @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         if (mAssistGestureFeatureProvider == null) {
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index 0f8d42475e5f881f8dde1760b431c4c6725441d1..55d5d0e9854c04c66ca48e8266a10f9ab52e5891 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -24,8 +24,8 @@ import android.app.Activity;
 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,11 +123,25 @@ public interface SupportFeatureProvider {
      * 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.
      */
@@ -153,4 +167,9 @@ public interface SupportFeatureProvider {
      * 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 49784f681302ecfa3e6a32d181a059234402072a..4d20bcfd246c7674dbfbf1c1bf63c69036fbb587 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.Fragment;
 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.UserHandle;
 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 android.widget.TextView;
 
 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 class ChooseLockGeneric extends SettingsActivity {
     }
 
     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 class ChooseLockGeneric extends SettingsActivity {
         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 @@ public class ChooseLockGeneric extends SettingsActivity {
         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 @@ public class ChooseLockGeneric extends SettingsActivity {
         private ManagedLockPasswordProvider mManagedPasswordProvider;
         private boolean mIsSetNewPassword = false;
         private UserManager mUserManager;
+        private ChooseLockGenericController mController;
 
         protected boolean mForFingerprint = false;
 
@@ -186,6 +209,7 @@ public class ChooseLockGeneric extends SettingsActivity {
                     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 @@ public class ChooseLockGeneric extends SettingsActivity {
                 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 @@ public class ChooseLockGeneric extends SettingsActivity {
                     finish();
                     return;
                 }
-                mRequirePassword = false; // device encryption not enabled or not device owner.
-                updateUnlockMethodAndFinish(quality, disabled);
+                updateUnlockMethodAndFinish(quality, disabled, false /* chooseLockSkipped */);
             }
         }
 
@@ -323,6 +346,15 @@ public class ChooseLockGeneric extends SettingsActivity {
                 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 @@ public class ChooseLockGeneric extends SettingsActivity {
             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 @@ public class ChooseLockGeneric extends SettingsActivity {
                 updateCurrentPreference();
                 updatePreferenceSummaryIfNeeded();
             } else {
-                updateUnlockMethodAndFinish(quality, false);
+                updateUnlockMethodAndFinish(quality, false, true /* chooseLockSkipped */);
             }
         }
 
@@ -390,33 +422,26 @@ public class ChooseLockGeneric extends SettingsActivity {
             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 @@ public class ChooseLockGeneric extends SettingsActivity {
             }
         }
 
+        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 @@ public class ChooseLockGeneric extends SettingsActivity {
             final int credentialOwner = UserManager.get(getContext())
                     .getCredentialOwnerProfile(mUserId);
             if (mLockPatternUtils.isLockScreenDisabled(credentialOwner)) {
-                return KEY_UNLOCK_SET_OFF;
-            }
-            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 ScreenLockType.NONE.preferenceKey;
             }
-            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 @@ public class ChooseLockGeneric extends SettingsActivity {
             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 @@ public class ChooseLockGeneric extends SettingsActivity {
                 return;
             }
 
-            CharSequence summary = getString(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(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);
+            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);
         }
 
-        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 getLockManagedPasswordIntent(String password) {
+            return mManagedPasswordProvider.createIntent(false, password);
         }
 
-        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 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 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 @@ public class ChooseLockGeneric extends SettingsActivity {
          *
          * @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 @@ public class ChooseLockGeneric extends SettingsActivity {
             }
         }
 
-        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 @@ public class ChooseLockGeneric extends SettingsActivity {
         }
 
         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 @@ public class ChooseLockGeneric extends SettingsActivity {
                         .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 0000000000000000000000000000000000000000..a6a1701821c882157d31cd74d04f05efb5c8ff62
--- /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 85%
rename from src/com/android/settings/ChooseLockPassword.java
rename to src/com/android/settings/password/ChooseLockPassword.java
index 351c2a204eb89a1c144d405602aeda5dbf496a78..84e150ae8d62000f9474ac963c95a1be8250ccb6 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,13 @@ import android.app.admin.DevicePolicyManager;
 import android.app.admin.PasswordMetrics;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.InsetDrawable;
+import android.content.res.Resources.Theme;
+import android.graphics.Insets;
+import android.graphics.Typeface;
 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,14 +44,13 @@ import android.text.Spannable;
 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;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
@@ -51,20 +59,19 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 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.SetupWizardUtils;
+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.settings.widget.ImeAwareEditText;
 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 +91,58 @@ public class ChooseLockPassword extends SettingsActivity {
         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;
+    @Override
+    protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent());
+        super.onApplyThemeResource(theme, resid, first);
     }
 
-    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;
-    }
+    public static class IntentBuilder {
 
-    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;
-    }
+        private final Intent mIntent;
 
-    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(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, 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 setPasswordQuality(int quality) {
+            mIntent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, quality);
+            return this;
+        }
+
+        public IntentBuilder setPasswordLengthRange(int min, int max) {
+            mIntent.putExtra(PASSWORD_MIN_KEY, min);
+            mIntent.putExtra(PASSWORD_MAX_KEY, max);
+            return this;
+        }
+
+        public IntentBuilder setUserId(int userId) {
+            mIntent.putExtra(Intent.EXTRA_USER_ID, userId);
+            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 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 +158,11 @@ public class ChooseLockPassword extends SettingsActivity {
     @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);
@@ -169,7 +180,7 @@ public class ChooseLockPassword extends SettingsActivity {
         private String mChosenPassword;
         private boolean mHasChallenge;
         private long mChallenge;
-        private EditText mPasswordEntry;
+        private ImeAwareEditText mPasswordEntry;
         private TextViewInputDisabler mPasswordEntryInputDisabler;
         private int mPasswordMinLength = LockPatternUtils.MIN_LOCK_PASSWORD_SIZE;
         private int mPasswordMaxLength = 16;
@@ -180,7 +191,7 @@ public class ChooseLockPassword extends SettingsActivity {
         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.
@@ -191,14 +202,15 @@ public class ChooseLockPassword extends SettingsActivity {
         private SaveAndFinishWorker mSaveAndFinishWorker;
         private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
-        private Stage mUiStage = Stage.Introduction;
+        protected Stage mUiStage = Stage.Introduction;
         private PasswordRequirementAdapter mPasswordRequirementAdapter;
+        private GlifLayout mLayout;
+        protected boolean mForFingerprint;
 
-        private TextView mHeaderText;
         private String mFirstPin;
         private RecyclerView mPasswordRestrictionView;
-        private boolean mIsAlphaMode;
-        private Button mCancelButton;
+        protected boolean mIsAlphaMode;
+        protected Button mCancelButton;
         private Button mNextButton;
 
         private TextChangedHandler mTextChangedHandler;
@@ -233,27 +245,49 @@ public class ChooseLockPassword extends SettingsActivity {
          */
         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_continue_label),
+                    R.string.lockpassword_choose_your_pin_header_for_fingerprint,
+                    R.string.next_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_continue_label);
+                    R.string.lockpassword_confirm_pins_dont_match,
+                    R.string.next_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 +305,8 @@ public class ChooseLockPassword extends SettingsActivity {
             }
             // 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,11 +336,29 @@ public class ChooseLockPassword extends SettingsActivity {
         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);
             mNextButton.setOnClickListener(this);
 
+            if (mForFingerprint) {
+                TextView fingerprintBackupMessage =
+                        view.findViewById(R.id.fingerprint_backup_message);
+                if (fingerprintBackupMessage != null) {
+                    fingerprintBackupMessage.setVisibility(View.VISIBLE);
+                    fingerprintBackupMessage
+                            .setText(R.string.setup_lock_settings_picker_fingerprint_message);
+                }
+                mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));
+            }
+
             mIsAlphaMode = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == mRequestedQuality
                     || DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC == mRequestedQuality
                     || DevicePolicyManager.PASSWORD_QUALITY_COMPLEX == mRequestedQuality;
@@ -312,18 +366,21 @@ public class ChooseLockPassword extends SettingsActivity {
             setupPasswordRequirementsView(view);
 
             mPasswordRestrictionView.setLayoutManager(new LinearLayoutManager(getActivity()));
-            mPasswordEntry = (EditText) view.findViewById(R.id.password_entry);
+            mPasswordEntry = view.findViewById(R.id.password_entry);
             mPasswordEntry.setOnEditorActionListener(this);
             mPasswordEntry.addTextChangedListener(this);
             mPasswordEntry.requestFocus();
             mPasswordEntryInputDisabler = new TextViewInputDisabler(mPasswordEntry);
 
             final Activity activity = getActivity();
-            mHeaderText = (TextView) view.findViewById(R.id.headerText);
 
             int currentType = mPasswordEntry.getInputType();
             mPasswordEntry.setInputType(mIsAlphaMode ? currentType
                     : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
+            // Can't set via XML since setInputType resets the fontFamily to null
+            mPasswordEntry.setTypeface(Typeface.create(
+                    getContext().getString(com.android.internal.R.string.config_headlineFontFamily),
+                    Typeface.NORMAL));
 
             Intent intent = getActivity().getIntent();
             final boolean confirmCredentials = intent.getBooleanExtra(
@@ -357,30 +414,11 @@ public class ChooseLockPassword extends SettingsActivity {
                         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);
             }
         }
 
@@ -451,6 +489,7 @@ public class ChooseLockPassword extends SettingsActivity {
                 mSaveAndFinishWorker.setListener(this);
             } else {
                 mPasswordEntry.requestFocus();
+                mPasswordEntry.scheduleShowSoftInput();
             }
         }
 
@@ -499,7 +538,7 @@ public class ChooseLockPassword extends SettingsActivity {
             // 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());
             }
         }
 
@@ -783,7 +822,7 @@ public class ChooseLockPassword extends SettingsActivity {
         /**
          * Update the hint based on current Stage and length of password entry
          */
-        private void updateUi() {
+        protected void updateUi() {
             final boolean canInput = mSaveAndFinishWorker == null;
             String password = mPasswordEntry.getText().toString();
             final int length = password.length();
@@ -798,8 +837,7 @@ public class ChooseLockPassword extends SettingsActivity {
             } 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 +846,11 @@ public class ChooseLockPassword extends SettingsActivity {
 
         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 91%
rename from src/com/android/settings/ChooseLockPattern.java
rename to src/com/android/settings/password/ChooseLockPattern.java
index 4afeae0240891673e2219e255635e76f02d3d64e..9d0072961d6a93574781876ed57999fb0a630d12 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+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.Theme;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -37,9 +38,15 @@ import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 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.SetupWizardUtils;
+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 +82,46 @@ public class ChooseLockPattern extends SettingsActivity {
         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;
+    @Override
+    protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
+        resid = SetupWizardUtils.getTheme(getIntent());
+        super.onApplyThemeResource(theme, resid, first);
     }
 
-    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 static class IntentBuilder {
+        private final Intent mIntent;
+
+        public IntentBuilder(Context context) {
+            mIntent = new Intent(context, ChooseLockPattern.class);
+            mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
+            mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
+        }
+
+        public IntentBuilder setUserId(int userId) {
+            mIntent.putExtra(Intent.EXTRA_USER_ID, userId);
+            return this;
+        }
 
-    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 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 +138,10 @@ public class ChooseLockPattern extends SettingsActivity {
     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);
     }
@@ -287,8 +313,8 @@ public class ChooseLockPattern extends SettingsActivity {
          * The states of the right button.
          */
         enum RightButtonMode {
-            Continue(R.string.lockpattern_continue_button_text, true),
-            ContinueDisabled(R.string.lockpattern_continue_button_text, false),
+            Continue(R.string.next_label, true),
+            ContinueDisabled(R.string.next_label, false),
             Confirm(R.string.lockpattern_confirm_button_text, true),
             ConfirmDisabled(R.string.lockpattern_confirm_button_text, false),
             Ok(android.R.string.ok, true);
@@ -374,6 +400,7 @@ public class ChooseLockPattern extends SettingsActivity {
         private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         private SaveAndFinishWorker mSaveAndFinishWorker;
         private int mUserId;
+        private boolean mForFingerprint;
 
         private static final String KEY_UI_STAGE = "uiStage";
         private static final String KEY_PATTERN_CHOICE = "chosenPattern";
@@ -403,6 +430,8 @@ public class ChooseLockPattern extends SettingsActivity {
                         false, 0, LockPatternUtils.stringToPattern(current), current, mUserId);
             }
             mHideDrawer = getActivity().getIntent().getBooleanExtra(EXTRA_HIDE_DRAWER, false);
+            mForFingerprint = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
         }
 
         @Override
@@ -411,6 +440,9 @@ public class ChooseLockPattern extends SettingsActivity {
             final GlifLayout layout = (GlifLayout) inflater.inflate(
                     R.layout.choose_lock_pattern, container, false);
             layout.setHeaderText(getActivity().getTitle());
+            if (mForFingerprint) {
+                layout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));
+            }
             return layout;
         }
 
@@ -442,7 +474,7 @@ public class ChooseLockPattern extends SettingsActivity {
             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 87%
rename from src/com/android/settings/ChooseLockSettingsHelper.java
rename to src/com/android/settings/password/ChooseLockSettingsHelper.java
index 6f0c453698be5d2263b8a769bf89cdd7799bea18..b5a838f0b77de56baf9fdf22ce0845ab3d055d10 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java
@@ -14,11 +14,12 @@
  * 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.Intent;
 import android.content.IntentSender;
@@ -26,11 +27,14 @@ import android.os.UserManager;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.setupwizardlib.util.WizardManagerHelper;
 
 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 +81,7 @@ public final class ChooseLockSettingsHelper {
      * @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 +204,21 @@ public final class ChooseLockSettingsHelper {
             @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 +228,7 @@ public final class ChooseLockSettingsHelper {
                         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 +240,7 @@ public final class ChooseLockSettingsHelper {
                         returnCredentials || hasChallenge
                                 ? ConfirmLockPassword.InternalActivity.class
                                 : ConfirmLockPassword.class, returnCredentials, external,
-                                hasChallenge, challenge, userId);
+                                hasChallenge, challenge, userId, alternateButton);
                 break;
         }
         return launched;
@@ -230,7 +249,7 @@ public final class ChooseLockSettingsHelper {
     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 +264,7 @@ public final class ChooseLockSettingsHelper {
         // 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);
@@ -257,8 +277,10 @@ public final class ChooseLockSettingsHelper {
             }
         } else {
             if (mFragment != null) {
+                copyInternalExtras(mFragment.getActivity().getIntent(), intent);
                 mFragment.startActivityForResult(intent, request);
             } else {
+                copyInternalExtras(mActivity.getIntent(), intent);
                 mActivity.startActivityForResult(intent, request);
             }
         }
@@ -283,4 +305,11 @@ public final class ChooseLockSettingsHelper {
             outIntent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
         }
     }
+
+    private void copyInternalExtras(Intent inIntent, Intent outIntent) {
+        String theme = inIntent.getStringExtra(WizardManagerHelper.EXTRA_THEME);
+        if (theme != null) {
+            outIntent.putExtra(WizardManagerHelper.EXTRA_THEME, theme);
+        }
+    }
 }
diff --git a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..13dc99656621634ee5ec585c3e595c6052bd6170
--- /dev/null
+++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 ScreenLockAdapter mAdapter;
+    private ChooseLockGenericController mController;
+
+    public static ChooseLockTypeDialogFragment newInstance(int userId) {
+        Bundle args = new Bundle();
+        args.putInt(ARG_USER_ID, userId);
+        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 */);
+        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 22f1e5247902a6222d590b27d9b65ca495577529..65d72f11bbc98c388a07450524dbdba93b8c7a99 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.os.UserManager;
 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 @@ public class ConfirmDeviceCredentialActivity extends Activity {
         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 @@ public class ConfirmDeviceCredentialActivity extends Activity {
         // 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 95%
rename from src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
rename to src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 489dbbe9ec3f57982df3ae5f64868f0812019a1f..2b2b38f231d8f0b396083ee2624b7aa3875480c0 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,11 @@ import android.view.MenuItem;
 import android.view.WindowManager;
 import android.widget.LinearLayout;
 
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.SetupWizardUtils;
+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 +57,7 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
             setTheme(R.style.Theme_ConfirmDeviceCredentialsDark);
             mConfirmCredentialTheme = ConfirmCredentialTheme.DARK;
         } else {
-            setTheme(R.style.SetupWizardTheme_Light);
+            setTheme(SetupWizardUtils.getTheme(getIntent()));
             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 2c97e1a78e383e6978bdc5d9525d61d87f8f142e..64f3a6fd04c6d882212fe057caad869493a15371 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.Dialog;
 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.Bundle;
 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.ImageView;
 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 abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
     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 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
     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 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
                 (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 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
     }
 
     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 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
     // 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 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
                 mFingerprintHelper.stopListening();
             }
         }
-        if (isProfileChallenge()) {
-            updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                    mEffectiveUserId));
-        }
+        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
     }
 
     protected void setAccessibilityTitle(CharSequence supplementalText) {
@@ -242,9 +265,8 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
             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 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
         }
     }
 
-    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 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
     }
 
     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 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends OptionsMenuFra
             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 89%
rename from src/com/android/settings/ConfirmLockPassword.java
rename to src/com/android/settings/password/ConfirmLockPassword.java
index 9a285f2a7bc380291ac4774898c3cb20d9d12ff9..853ab36b29719ea12f0b20f4cdff826ff98ce03c 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings;
+package com.android.settings.password;
 
 import android.app.Fragment;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -43,6 +44,8 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 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.settings.widget.ImeAwareEditText;
 import com.android.settingslib.animation.AppearAnimationUtils;
 import com.android.settingslib.animation.DisappearAnimationUtils;
 
@@ -51,15 +54,16 @@ import java.util.ArrayList;
 public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
 
     // The index of the array is isStrongAuth << 2 + isProfile << 1 + isAlpha.
+    // TODO(b/36511626): add back special strings for strong auth.
     private static final int[] DETAIL_TEXTS = new int[] {
         R.string.lockpassword_confirm_your_pin_generic,
         R.string.lockpassword_confirm_your_password_generic,
         R.string.lockpassword_confirm_your_pin_generic_profile,
         R.string.lockpassword_confirm_your_password_generic_profile,
-        R.string.lockpassword_strong_auth_required_reason_restart_device_pin,
-        R.string.lockpassword_strong_auth_required_reason_restart_device_password,
-        R.string.lockpassword_strong_auth_required_reason_restart_work_pin,
-        R.string.lockpassword_strong_auth_required_reason_restart_work_password,
+        R.string.lockpassword_confirm_your_pin_generic,
+        R.string.lockpassword_confirm_your_password_generic,
+        R.string.lockpassword_confirm_your_pin_generic_profile,
+        R.string.lockpassword_confirm_your_password_generic_profile,
     };
 
     public static class InternalActivity extends ConfirmLockPassword {
@@ -92,7 +96,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
             CredentialCheckResultTracker.Listener {
         private static final long ERROR_MESSAGE_TIMEOUT = 3000;
         private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";
-        private TextView mPasswordEntry;
+        private ImeAwareEditText mPasswordEntry;
         private TextViewInputDisabler mPasswordEntryInputDisabler;
         private AsyncTask<?, ?, ?> mPendingLockCheck;
         private CredentialCheckResultTracker mCredentialCheckResultTracker;
@@ -131,11 +135,16 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                     container,
                     false);
 
-            mPasswordEntry = (TextView) view.findViewById(R.id.password_entry);
+            mPasswordEntry = (ImeAwareEditText) 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
@@ -164,6 +173,10 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
             int currentType = mPasswordEntry.getInputType();
             mPasswordEntry.setInputType(mIsAlpha ? currentType
                     : (InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_VARIATION_PASSWORD));
+            // Can't set via XML since setInputType resets the fontFamily to null
+            mPasswordEntry.setTypeface(Typeface.create(
+                    getContext().getString(com.android.internal.R.string.config_headlineFontFamily),
+                    Typeface.NORMAL));
             mAppearAnimationUtils = new AppearAnimationUtils(getContext(),
                     220, 2f /* translationScale */, 1f /* delayScale*/,
                     AnimationUtils.loadInterpolator(getContext(),
@@ -191,7 +204,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
         }
 
         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 +218,20 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
         }
 
         @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 +296,8 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
             } else {
                 resetState();
                 mErrorTextView.setText("");
-                if (isProfileChallenge()) {
-                    updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                            mEffectiveUserId));
-                }
+                updateErrorMessage(
+                        mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
             }
             mCredentialCheckResultTracker.setListener(this);
         }
@@ -295,7 +317,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
             mPasswordEntry.setEnabled(true);
             mPasswordEntryInputDisabler.setInputEnabled(true);
             if (shouldAutoShowSoftKeyboard()) {
-                mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);
+                mPasswordEntry.scheduleShowSoftInput();
             }
         }
 
@@ -438,7 +460,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
             mPasswordEntryInputDisabler.setInputEnabled(true);
             if (matched) {
                 if (newResult) {
-                    reportSuccessfullAttempt();
+                    reportSuccessfulAttempt();
                 }
                 startDisappearAnimation(intent);
                 checkForPendingIntent();
@@ -487,10 +509,8 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
                 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 56d92f1fcf60fb66908696b61b0010734abf9230..0c0025ec60cb488ba490186293733c2598527fd2 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.LockPatternChecker;
 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 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                 // 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,15 +243,11 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
         }
 
         private int getDefaultDetails() {
-            boolean isStrongAuthRequired = isFingerprintDisallowedByStrongAuth();
+            // TODO(b/36511626): add back special strings for strong auth.
             if (UserManager.get(getActivity()).isManagedProfile(mEffectiveUserId)) {
-                return isStrongAuthRequired
-                        ? R.string.lockpassword_strong_auth_required_reason_restart_work_pattern
-                        : R.string.lockpassword_confirm_your_pattern_generic_profile;
+                return R.string.lockpassword_confirm_your_pattern_generic_profile;
             } else {
-                return isStrongAuthRequired
-                        ? R.string.lockpassword_strong_auth_required_reason_restart_device_pattern
-                        : R.string.lockpassword_confirm_your_pattern_generic;
+                return R.string.lockpassword_confirm_your_pattern_generic;
             }
         }
 
@@ -297,10 +300,8 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                         mDetailsTextView.setText(getDefaultDetails());
                     }
                     mErrorTextView.setText("");
-                    if (isProfileChallenge()) {
-                        updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(
-                                mEffectiveUserId));
-                    }
+                    updateErrorMessage(
+                            mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
 
                     mLockPatternView.setEnabled(true);
                     mLockPatternView.enableInput();
@@ -495,7 +496,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
             mLockPatternView.setEnabled(true);
             if (matched) {
                 if (newResult) {
-                    reportSuccessfullAttempt();
+                    reportSuccessfulAttempt();
                 }
                 startDisappearAnimation(intent);
                 checkForPendingIntent();
@@ -522,8 +523,17 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
         }
 
         @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 cfd6f2984a6f36ece766218855c3a5519b1e827f..a17939c446c9829dec14265f1da4522334e47edd 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 b9725d706cbe59d8d11faff2d3fd5ae60b7bda54..09fe104986389137dc006dce6a38b798eba8638a 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 @@ import android.content.Intent;
  */
 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 @@ public class ManagedLockPasswordProvider {
      * 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 @@ public class ManagedLockPasswordProvider {
      * {@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 @@ public class ManagedLockPasswordProvider {
      * 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 b05d8b8a8713170cd54a76aaba22572acb4997d8..5fcd8a99f8a0bc968b0b404ac1d13c8d91e65910 100644
--- a/src/com/android/settings/password/PasswordRequirementAdapter.java
+++ b/src/com/android/settings/password/PasswordRequirementAdapter.java
@@ -23,12 +23,10 @@ import android.view.ViewGroup;
 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 7ce7a9064b7f4bfc572aa4716ce245345350b483..95980e93e8b69b1995fa9c02ae0e91d0c10dda49 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 0000000000000000000000000000000000000000..608c8f6576a4af91589fedf2ba0fc917b128521b
--- /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 4692609a9fd0f3339a3f457669a6a135d6066dbe..99f67cb13d5f30718e937c6f27b43d41c249bbe9 100644
--- a/src/com/android/settings/password/SetNewPasswordActivity.java
+++ b/src/com/android/settings/password/SetNewPasswordActivity.java
@@ -25,8 +25,6 @@ import android.content.Intent;
 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 9443541b49d25b0546249d7b6df806e26d7ee592..57aa8c17d1d1a4fed4963f29e700a8046b630c04 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -19,6 +19,7 @@ package com.android.settings.password;
 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 android.os.UserManager;
 
 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 2c8195d70758b57c230be77390d3dde4fe321bba..179bd797cb7802e126cb93dcbab49c34c33acb34 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,8 +31,10 @@ import android.view.ViewGroup;
 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;
 import com.android.setupwizardlib.GlifPreferenceLayout;
 
@@ -108,20 +110,16 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
 
         @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 +170,17 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
         }
 
         @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);
-            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);
+        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 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 0000000000000000000000000000000000000000..2988f52b7b74c69a28892176157315efef5fc57f
--- /dev/null
+++ b/src/com/android/settings/password/SetupChooseLockPassword.java
@@ -0,0 +1,199 @@
+/*
+ * 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.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.util.Log;
+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.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 {
+
+    private static final String TAG = "SetupChooseLockPassword";
+
+    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);
+    }
+
+    public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment
+            implements OnLockTypeSelectedListener {
+
+        @VisibleForTesting
+        static final int REQUEST_SCREEN_LOCK_OPTIONS = 1;
+
+        @Nullable
+        private Button mOptionsButton;
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            super.onViewCreated(view, savedInstanceState);
+
+            if (mForFingerprint) {
+                mCancelButton.setVisibility(View.GONE);
+            } else {
+                mCancelButton.setText(R.string.skip_label);
+            }
+
+            final Activity activity = getActivity();
+            ChooseLockGenericController chooseLockGenericController =
+                    new ChooseLockGenericController(activity, mUserId);
+            boolean anyOptionsShown = chooseLockGenericController.getVisibleScreenLockTypes(
+                    DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false).size() > 0;
+            boolean showOptionsButton = activity.getIntent().getBooleanExtra(
+                    ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);
+
+            if (!anyOptionsShown) {
+                Log.w(TAG, "Visible screen lock types is empty!");
+            }
+
+            if (showOptionsButton && anyOptionsShown) {
+                mOptionsButton = view.findViewById(R.id.screen_lock_options);
+                mOptionsButton.setVisibility(View.VISIBLE);
+                mOptionsButton.setOnClickListener(this);
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            switch (v.getId()) {
+                case R.id.screen_lock_options:
+                    launchChooseLockGeneric();
+                    break;
+                case R.id.cancel_button:
+                    SetupSkipDialog dialog = SetupSkipDialog.newInstance(
+                            getActivity().getIntent()
+                                    .getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false));
+                    dialog.show(getFragmentManager());
+                    break;
+                default:
+                    super.onClick(v);
+            }
+        }
+
+        private void launchChooseLockGeneric() {
+            ChooseLockTypeDialogFragment.newInstance(mUserId)
+                    .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) {
+            ScreenLockType currentLockType = mIsAlphaMode ?
+                    ScreenLockType.PASSWORD : ScreenLockType.PIN;
+            if (currentLockType.equals(lock)) {
+                // ignore same lock type.
+                return;
+            }
+            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();
+                }
+            }
+        }
+
+        @Override
+        protected void updateUi() {
+            super.updateUi();
+            if (mOptionsButton != null) {
+                mOptionsButton.setVisibility(
+                        mUiStage == Stage.Introduction ? View.VISIBLE : View.GONE);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java
similarity index 59%
rename from src/com/android/settings/SetupChooseLockPattern.java
rename to src/com/android/settings/password/SetupChooseLockPattern.java
index 762d3b3c09365b5f117d9e6df955ae5165a69729..b1e3d0d89ca62e404ccb79baca8e0876d7bfc1e5 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/password/SetupChooseLockPattern.java
@@ -14,13 +14,13 @@
  * 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;
 
 /**
  * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
@@ -31,26 +31,9 @@ import android.os.UserHandle;
  */
 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
@@ -63,12 +46,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
         return SetupChooseLockPatternFragment.class;
     }
 
-    @Override
-    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
-    }
-
     public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
 
         @Override
diff --git a/src/com/android/settings/fingerprint/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java
similarity index 94%
rename from src/com/android/settings/fingerprint/SetupSkipDialog.java
rename to src/com/android/settings/password/SetupSkipDialog.java
index 842e69c3c7115437046dfd64a67a2ced88979008..36646b755231e895d7723a3aadd9f3ab18846dfb 100644
--- a/src/com/android/settings/fingerprint/SetupSkipDialog.java
+++ b/src/com/android/settings/password/SetupSkipDialog.java
@@ -14,12 +14,11 @@
  * limitations under the License
  */
 
-package com.android.settings.fingerprint;
+package com.android.settings.password;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.FragmentManager;
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -36,7 +35,7 @@ public class SetupSkipDialog extends InstrumentedDialogFragment
 
     private static final String ARG_FRP_SUPPORTED = "frp_supported";
     private static final String TAG_SKIP_DIALOG = "skip_dialog";
-    private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER + 10;
+    public static final int RESULT_SKIP = Activity.RESULT_FIRST_USER + 10;
 
     public static SetupSkipDialog newInstance(boolean isFrpSupported) {
         SetupSkipDialog dialog = new SetupSkipDialog();
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index a1c166068a71315b7aecc114613335cd6244fe72..26e760c96f3a18df3003bbd935fbe8c606c1e60e 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -164,8 +164,7 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
     /**
      * 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 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
         }
     }
 
-     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 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
 
                     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 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
                                         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 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
                                         R.string.print_cancelling_state_title_template,
                                         printJob.getLabel()));
                             }
-                        } break;
+                            break;
                     }
 
                     preference.setSummary(getString(R.string.print_job_summary,
@@ -364,14 +361,13 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
 
                     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 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
                 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 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
     /**
      * 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 class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
         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 class PrintSettingsFragment extends ProfileSettingsPreferenceFragment
             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 97%
rename from src/com/android/settings/search2/AppSearchResult.java
rename to src/com/android/settings/search/AppSearchResult.java
index eeccb82d638e25f71f6b90bf02c478cd5c259b25..b59e32e56666c6be8238ab715ebdab21fc4758e5 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;
 import android.os.UserHandle;
diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java
index f5e06ca53cb9af2e4ed52af7029706e8c09e17cf..239de15ff4cd0782d2a5a869db2957fdb3a7919b 100644
--- a/src/com/android/settings/search/BaseSearchIndexProvider.java
+++ b/src/com/android/settings/search/BaseSearchIndexProvider.java
@@ -16,24 +16,24 @@
 
 package com.android.settings.search;
 
+import android.annotation.XmlRes;
 import android.content.Context;
 import android.content.res.XmlResourceParser;
 import android.provider.SearchIndexableResource;
 import android.support.annotation.CallSuper;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
 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 +42,6 @@ import java.util.List;
 public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider {
 
     private static final String TAG = "BaseSearchIndex";
-    private static final List<String> EMPTY_LIST = new ArrayList<>();
 
     public BaseSearchIndexProvider() {
     }
@@ -93,22 +92,29 @@ public class BaseSearchIndexProvider implements Indexable.SearchIndexProvider {
         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) {
-            final XmlResourceParser parser = context.getResources().getXml(res.xmlResId);
-            final AttributeSet attrs = Xml.asAttributeSet(parser);
-            try {
-                while (parser.next() != XmlPullParser.END_DOCUMENT) {
-                    final String key = XmlParserUtils.getDataKey(context, attrs);
-                    if (!TextUtils.isEmpty(key)) {
-                        nonIndexableKeys.add(key);
-                    }
+            nonIndexableKeys.addAll(getNonIndexableKeysFromXml(context, res.xmlResId));
+        }
+        return nonIndexableKeys;
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
+    public List<String> getNonIndexableKeysFromXml(Context context, @XmlRes int xmlResId) {
+        final List<String> nonIndexableKeys = new ArrayList<>();
+        final XmlResourceParser parser = context.getResources().getXml(xmlResId);
+        final AttributeSet attrs = Xml.asAttributeSet(parser);
+        try {
+            while (parser.next() != XmlPullParser.END_DOCUMENT) {
+                final String key = XmlParserUtils.getDataKey(context, attrs);
+                if (!TextUtils.isEmpty(key)) {
+                    nonIndexableKeys.add(key);
                 }
-            } catch (IOException | XmlPullParserException e) {
-                Log.w(TAG, "Error parsing non-indexable from xml " + res.xmlResId);
             }
+        } catch (IOException | XmlPullParserException e) {
+            Log.w(TAG, "Error parsing non-indexable from xml " + xmlResId);
         }
         return nonIndexableKeys;
     }
diff --git a/src/com/android/settings/search2/CursorToSearchResultConverter.java b/src/com/android/settings/search/CursorToSearchResultConverter.java
similarity index 52%
rename from src/com/android/settings/search2/CursorToSearchResultConverter.java
rename to src/com/android/settings/search/CursorToSearchResultConverter.java
index 71d999e06127e483cc27744841c6037762d2a59f..ce64de957e3e0814cd97641e10d4fda665861424 100644
--- a/src/com/android/settings/search2/CursorToSearchResultConverter.java
+++ b/src/com/android/settings/search/CursorToSearchResultConverter.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,48 +15,38 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
-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;
+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.
@@ -68,21 +58,18 @@ import static com.android.settings.search2.DatabaseResultLoader.COLUMN_INDEX_TIT
  * - {@link Drawable} icon
  * - {@link ResultPayload} payload
  */
-class CursorToSearchResultConverter {
+public class CursorToSearchResultConverter {
 
-    private final String TAG = "CursorConverter";
-
-    private final String mQueryText;
+    private static final String TAG = "CursorConverter";
 
     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",
+            "main_toggle_bluetooth_obsolete",
             "toggle_airplane",
             "tether_settings",
             "battery_saver",
@@ -94,19 +81,17 @@ class CursorToSearchResultConverter {
     private static final Set<String> prioritySettings = new HashSet(Arrays.asList(whiteList));
 
 
-    public CursorToSearchResultConverter(Context context, String queryText) {
+    public CursorToSearchResultConverter(Context context) {
         mContext = context;
-        mKeys = new HashSet<>();
-        mQueryText = queryText;
     }
 
-    public List<SearchResult> convertCursor(SiteMapManager sitemapManager,
+    public Set<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<>();
+        final Set<SearchResult> results = new HashSet<>();
 
         while (cursorResults.moveToNext()) {
             SearchResult result = buildSingleSearchResultFromCursor(sitemapManager,
@@ -115,24 +100,33 @@ class CursorToSearchResultConverter {
                 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;
+    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);
+                case ResultPayload.PayloadType.INLINE_LIST:
+                    return ResultPayloadUtils.unmarshall(marshalledPayload,
+                            InlineListPayload.CREATOR);
+            }
+        } catch (BadParcelableException e) {
+            Log.w(TAG, "Error creating parcelable: " + e);
         }
-        mKeys.add(docId);
+        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 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);
@@ -140,27 +134,19 @@ class CursorToSearchResultConverter {
         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 ResultPayload payload = getUnmarshalledPayload(marshalledPayload, payloadType);
 
         final List<String> breadcrumbs = getBreadcrumbs(sitemapManager, cursor);
-        final int rank = getRank(title, breadcrumbs, baseRank, key);
+        final int rank = getRank(title, baseRank, key);
 
-        final SearchResult.Builder builder = new SearchResult.Builder();
-        builder.addTitle(title)
-                .addSummary(summaryOn)
+        final SearchResult.Builder builder = new SearchResult.Builder()
+                .setStableId(docId)
+                .setTitle(title)
+                .setSummary(summaryOn)
                 .addBreadcrumbs(breadcrumbs)
-                .addRank(rank)
-                .addIcon(getIconForPackage(contextMap, pkgName, className, iconResStr))
-                .addPayload(payload);
+                .setRank(rank)
+                .setIcon(getIconForPackage(contextMap, pkgName, className, iconResStr))
+                .setPayload(payload);
         return builder.build();
     }
 
@@ -196,44 +182,6 @@ class CursorToSearchResultConverter {
         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);
@@ -245,29 +193,24 @@ class CursorToSearchResultConverter {
      *  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
+     *  C) If the query is 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
+     *  If the query matches B, the offset is 0.
+     *  If the query matches C, the offset is 1
 
      * @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) {
+    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 < DatabaseResultLoader.BASE_RANKS[1]) {
-            return SearchResult.TOP_RANK;
+        if (prioritySettings.contains(key) && baseRank < BASE_RANKS[1]) {
+            return TOP_RANK;
         }
         if (title.length() > LONG_TITLE_LENGTH) {
-            return baseRank + 2;
+            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 90%
rename from src/com/android/settings/search2/DatabaseIndexingManager.java
rename to src/com/android/settings/search/DatabaseIndexingManager.java
index 647219bee48ba30dcc1c681b8fc388af6f52449e..d2b2d238ecdf62e12d622e35ac68ec9e8651179d 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,11 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
 
+import com.android.settings.R;
+
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -38,15 +41,14 @@ import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.Pair;
 import android.util.Xml;
 
+import com.android.internal.logging.nano.MetricsProto;
+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 com.android.settings.overlay.FeatureFactory;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -82,9 +84,9 @@ import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICO
 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 +111,6 @@ import static com.android.settings.search.IndexDatabaseHelper.IndexColumns.SCREE
 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.
@@ -123,6 +120,9 @@ import static com.android.settings.search2.DatabaseResultLoader.SELECT_COLUMNS;
 public class DatabaseIndexingManager {
     private static final String LOG_TAG = "DatabaseIndexingManager";
 
+    private static final String METRICS_ACTION_SETTINGS_ASYNC_INDEX =
+            "search_asynchronous_indexing";
+
     public static final String FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER =
             "SEARCH_INDEX_DATA_PROVIDER";
 
@@ -164,21 +164,24 @@ public class DatabaseIndexingManager {
      * Only the first indexing for the default language gets static search results - subsequent
      * calls will only gather non-indexable keys.
      */
-    @VisibleForTesting
-    void performIndexing() {
+    public void performIndexing() {
         final Intent intent = new Intent(SearchIndexablesContract.PROVIDER_INTERFACE);
-        final List<ResolveInfo> list =
+        final List<ResolveInfo> providers =
                 mContext.getPackageManager().queryIntentContentProviders(intent, 0);
 
-        String localeStr = Locale.getDefault().toString();
-        String fingerprint = Build.FINGERPRINT;
-        final boolean isFullIndex = isFullIndex(localeStr, fingerprint);
+        final String localeStr = Locale.getDefault().toString();
+        final String fingerprint = Build.FINGERPRINT;
+        final String providerVersionedNames =
+                IndexDatabaseHelper.buildProviderVersionedNames(providers);
+
+        final boolean isFullIndex = IndexDatabaseHelper.isFullIndex(mContext, localeStr,
+                fingerprint, providerVersionedNames);
 
         if (isFullIndex) {
             rebuildDatabase();
         }
 
-        for (final ResolveInfo info : list) {
+        for (final ResolveInfo info : providers) {
             if (!DatabaseIndexingUtils.isWellKnownProvider(info, mContext)) {
                 continue;
             }
@@ -193,24 +196,10 @@ public class DatabaseIndexingManager {
 
         updateDatabase(isFullIndex, localeStr);
 
+        //TODO(63922686): Setting indexed should be a single method, not 3 separate setters.
         IndexDatabaseHelper.setLocaleIndexed(mContext, localeStr);
         IndexDatabaseHelper.setBuildIndexed(mContext, fingerprint);
-    }
-
-    /**
-     * Perform a full index on an OTA or when the locale has changed
-     *
-     * @param locale is the default for the device
-     * @param fingerprint id for the current build.
-     * @return true when the locale or build has changed since last index.
-     */
-    @VisibleForTesting
-    boolean isFullIndex(String locale, String fingerprint) {
-        final boolean isLocaleIndexed = IndexDatabaseHelper.getInstance(mContext)
-                .isLocaleAlreadyIndexed(mContext, locale);
-        final boolean isBuildIndexed = IndexDatabaseHelper.getInstance(mContext)
-                .isBuildIndexed(mContext, fingerprint);
-        return !isLocaleIndexed || !isBuildIndexed;
+        IndexDatabaseHelper.setProvidersIndexed(mContext, providerVersionedNames);
     }
 
     /**
@@ -620,17 +609,24 @@ public class DatabaseIndexingManager {
         if (data instanceof SearchIndexableResource) {
             indexOneResource(database, localeStr, (SearchIndexableResource) data, nonIndexableKeys);
         } else if (data instanceof SearchIndexableRaw) {
-            indexOneRaw(database, localeStr, (SearchIndexableRaw) data);
+            indexOneRaw(database, localeStr, (SearchIndexableRaw) data, nonIndexableKeys);
         }
     }
 
     private void indexOneRaw(SQLiteDatabase database, String localeStr,
-            SearchIndexableRaw raw) {
+            SearchIndexableRaw raw, Map<String, Set<String>> nonIndexableKeysFromResource) {
         // Should be the same locale as the one we are processing
         if (!raw.locale.toString().equalsIgnoreCase(localeStr)) {
             return;
         }
 
+        Set<String> packageKeys = nonIndexableKeysFromResource.get(raw.intentTargetPackage);
+        boolean enabled = raw.enabled;
+
+        if (packageKeys != null && packageKeys.contains(raw.key)) {
+            enabled = false;
+        }
+
         DatabaseRow.Builder builder = new DatabaseRow.Builder();
         builder.setLocale(localeStr)
                 .setEntries(raw.entries)
@@ -641,7 +637,7 @@ public class DatabaseIndexingManager {
                 .setIntentAction(raw.intentAction)
                 .setIntentTargetPackage(raw.intentTargetPackage)
                 .setIntentTargetClass(raw.intentTargetClass)
-                .setEnabled(raw.enabled)
+                .setEnabled(enabled)
                 .setKey(raw.key)
                 .setUserId(raw.userId);
 
@@ -811,6 +807,7 @@ public class DatabaseIndexingManager {
                         entries = XmlParserUtils.getDataEntries(context, attrs);
                     }
 
+                    // TODO (b/62254931) index primitives instead of payload
                     payload = DatabaseIndexingUtils.getPayloadFromUriMap(controllerUriMap, key);
                     childFragment = XmlParserUtils.getDataChildFragment(context, attrs);
 
@@ -853,7 +850,8 @@ public class DatabaseIndexingManager {
             List<String> nonIndexableKeys) {
 
         final String className = sir.className;
-        final int rank = sir.rank;
+        final String intentAction = sir.intentAction;
+        final String intentTargetPackage = sir.intentTargetPackage;
 
         if (provider == null) {
             Log.w(LOG_TAG, "Cannot find provider: " + className);
@@ -881,7 +879,6 @@ public class DatabaseIndexingManager {
                         .setClassName(className)
                         .setScreenTitle(raw.screenTitle)
                         .setIconResId(raw.iconResId)
-                        .setRank(rank)
                         .setIntentAction(raw.intentAction)
                         .setIntentTargetPackage(raw.intentTargetPackage)
                         .setIntentTargetClass(raw.intentTargetClass)
@@ -906,7 +903,15 @@ public class DatabaseIndexingManager {
                     continue;
                 }
 
-                item.className = (TextUtils.isEmpty(item.className)) ? className : item.className;
+                item.className = TextUtils.isEmpty(item.className)
+                        ? className
+                        : item.className;
+                item.intentAction = TextUtils.isEmpty(item.intentAction)
+                        ? intentAction
+                        : item.intentAction;
+                item.intentTargetPackage = TextUtils.isEmpty(item.intentTargetPackage)
+                        ? intentTargetPackage
+                        : item.intentTargetPackage;
 
                 indexFromResource(database, localeStr, item, nonIndexableKeys);
             }
@@ -935,7 +940,7 @@ public class DatabaseIndexingManager {
                 .setNormalizedSummaryOff(normalizedSummaryOff)
                 .setSpaceDelimitedKeywords(spaceDelimitedKeywords);
 
-        updateOneRow(database, builder.build());
+        updateOneRow(database, builder.build(mContext));
     }
 
     private void updateOneRow(SQLiteDatabase database, DatabaseRow row) {
@@ -1069,10 +1074,11 @@ public class DatabaseIndexingManager {
          * 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 +1226,49 @@ public class DatabaseIndexingManager {
                 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;
+
+                boolean isEmptyIntentAction = TextUtils.isEmpty(mIntentAction);
+                // No intent action is set, or the intent action is for a subsetting.
+                if (isEmptyIntentAction
+                        || (!isEmptyIntentAction && TextUtils.equals(mIntentTargetPackage,
+                        SearchIndexableResources.SUBSETTING_TARGET_PACKAGE))) {
+                    // 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);
             }
         }
@@ -1230,6 +1278,7 @@ public class DatabaseIndexingManager {
 
         @VisibleForTesting
         IndexingCallback mCallback;
+        private long mIndexStartTime;
 
         public IndexingTask(IndexingCallback callback) {
             mCallback = callback;
@@ -1237,6 +1286,7 @@ public class DatabaseIndexingManager {
 
         @Override
         protected void onPreExecute() {
+            mIndexStartTime = System.currentTimeMillis();
             mIsIndexingComplete.set(false);
         }
 
@@ -1248,10 +1298,14 @@ public class DatabaseIndexingManager {
 
         @Override
         protected void onPostExecute(Void aVoid) {
+            int indexingTime = (int) (System.currentTimeMillis() - mIndexStartTime);
+            FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()
+                    .histogram(mContext, METRICS_ACTION_SETTINGS_ASYNC_INDEX, indexingTime);
+
             mIsIndexingComplete.set(true);
             if (mCallback != null) {
                 mCallback.onIndexingFinished();
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/search2/DatabaseIndexingUtils.java b/src/com/android/settings/search/DatabaseIndexingUtils.java
similarity index 86%
rename from src/com/android/settings/search2/DatabaseIndexingUtils.java
rename to src/com/android/settings/search/DatabaseIndexingUtils.java
index bd06ef3a5743b7599d5ca248d33b8a4089f0ea8c..40ba7eeb20358928337a081e99383c787599dcf1 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;
@@ -57,6 +61,18 @@ public class DatabaseIndexingUtils {
     private static final Pattern REMOVE_DIACRITICALS_PATTERN
             = 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}
@@ -158,7 +174,7 @@ public class DatabaseIndexingUtils {
      * - have read/write {@link Manifest.permission#READ_SEARCH_INDEXABLES}
      * - be from a privileged package
      */
-    public static boolean isWellKnownProvider(ResolveInfo info, Context context) {
+    static boolean isWellKnownProvider(ResolveInfo info, Context context) {
         final String authority = info.providerInfo.authority;
         final String packageName = info.providerInfo.applicationInfo.packageName;
 
@@ -181,29 +197,29 @@ public class DatabaseIndexingUtils {
         return isPrivilegedPackage(packageName, context);
     }
 
-    public static boolean isPrivilegedPackage(String packageName, Context context) {
-        final PackageManager pm = context.getPackageManager();
-        try {
-            PackageInfo packInfo = pm.getPackageInfo(packageName, 0);
-            return ((packInfo.applicationInfo.privateFlags
-                    & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            return false;
-        }
-    }
-
-    public static String normalizeHyphen(String input) {
+    static String normalizeHyphen(String input) {
         return (input != null) ? input.replaceAll(NON_BREAKING_HYPHEN, HYPHEN) : EMPTY;
     }
 
-    public static String normalizeString(String input) {
+    static String normalizeString(String input) {
         final String nohyphen = (input != null) ? input.replaceAll(HYPHEN, EMPTY) : EMPTY;
         final String normalized = Normalizer.normalize(nohyphen, Normalizer.Form.NFD);
 
         return REMOVE_DIACRITICALS_PATTERN.matcher(normalized).replaceAll("").toLowerCase();
     }
 
-    public static String normalizeKeywords(String input) {
+    static String normalizeKeywords(String input) {
         return (input != null) ? input.replaceAll(LIST_DELIMITERS, SPACE) : EMPTY;
     }
+
+    private static boolean isPrivilegedPackage(String packageName, Context context) {
+        final PackageManager pm = context.getPackageManager();
+        try {
+            PackageInfo packInfo = pm.getPackageInfo(packageName, 0);
+            return ((packInfo.applicationInfo.privateFlags
+                    & ApplicationInfo.PRIVATE_FLAG_PRIVILEGED) != 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
 }
diff --git a/src/com/android/settings/search2/DatabaseResultLoader.java b/src/com/android/settings/search/DatabaseResultLoader.java
similarity index 64%
rename from src/com/android/settings/search2/DatabaseResultLoader.java
rename to src/com/android/settings/search/DatabaseResultLoader.java
index 70cefe56fd53525adf963c4fb907374df804ed91..73b383ba7b09791d7728a09187a1d448dacd0e31 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 @@ import static com.android.settings.search.IndexDatabaseHelper.Tables.TABLE_PREFS
 /**
  * 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.
@@ -99,7 +97,8 @@ public class DatabaseResultLoader extends AsyncLoader<List<? extends SearchResul
      */
     public static final int[] BASE_RANKS = {1, 3, 7, 9};
 
-    private final String mQueryText;
+    @VisibleForTesting
+    final String mQueryText;
     private final Context mContext;
     private final CursorToSearchResultConverter mConverter;
     private final SiteMapManager mSiteMapManager;
@@ -108,43 +107,28 @@ public class DatabaseResultLoader extends AsyncLoader<List<? extends SearchResul
         super(context);
         mSiteMapManager = mapManager;
         mContext = context;
-        mQueryText = cleanQuery(queryText);
-        mConverter = new CursorToSearchResultConverter(context, mQueryText);
+        mQueryText = queryText;
+        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;
-
-        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 Set<SearchResult> results = new HashSet<>();
 
-        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
@@ -153,26 +137,14 @@ public class DatabaseResultLoader extends AsyncLoader<List<? extends SearchResul
         return super.onCancelLoad();
     }
 
-    /**
-     * A generic method to make the query suitable for searching the database.
-     *
-     * @return the cleaned query string
-     */
-    private static String cleanQuery(String query) {
-        if (TextUtils.isEmpty(query)) {
-            return null;
-        }
-        return query.trim();
-    }
-
     /**
      * Creates and executes the query which matches prefixes of the first word of the given columns.
      *
      * @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 +158,9 @@ public class DatabaseResultLoader extends AsyncLoader<List<? extends SearchResul
      *
      * @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 +173,9 @@ public class DatabaseResultLoader extends AsyncLoader<List<? extends SearchResul
      *
      * @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 +188,10 @@ public class DatabaseResultLoader extends AsyncLoader<List<? extends SearchResul
      * @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 +271,4 @@ public class DatabaseResultLoader extends AsyncLoader<List<? extends SearchResul
         }
         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 bb9f5adf12d05ff8b46a224c0b437b1de81db03f..07583871d4c6240938af0f6fad56f93343841b41 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.inputmethod.VirtualKeyboardFragment;
 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/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index 76346ecc5cc9c62e069640a1f80489927e27445b..d78b61194103f5037b20094a2b1c087d79946c52 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -17,12 +17,17 @@
 package com.android.settings.search;
 
 import android.content.Context;
+import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
+import android.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
 import android.util.Log;
 
+import java.util.List;
+
 public class IndexDatabaseHelper extends SQLiteOpenHelper {
 
     private static final String TAG = "IndexDatabaseHelper";
@@ -32,6 +37,8 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
 
     private static final String INDEX = "index";
 
+    private static final String PREF_KEY_INDEXED_PROVIDERS = "indexed_providers";
+
     public interface Tables {
         String TABLE_PREFS_INDEX = "prefs_index";
         String TABLE_SITE_MAP = "site_map";
@@ -245,23 +252,69 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
         return version;
     }
 
-    public static void clearCachedIndexed(Context context) {
-        context.getSharedPreferences(INDEX, 0).edit().clear().commit();
+    /**
+     * Perform a full index on an OTA or when the locale has changed
+     *
+     * @param locale      is the default for the device
+     * @param fingerprint id for the current build.
+     * @return true when the locale or build has changed since last index.
+     */
+    @VisibleForTesting
+    static boolean isFullIndex(Context context, String locale, String fingerprint,
+            String providerVersionedNames) {
+        final boolean isLocaleIndexed = IndexDatabaseHelper.isLocaleAlreadyIndexed(context, locale);
+        final boolean isBuildIndexed = IndexDatabaseHelper.isBuildIndexed(context, fingerprint);
+        final boolean areProvidersIndexed = IndexDatabaseHelper
+                .areProvidersIndexed(context, providerVersionedNames);
+
+        return !(isLocaleIndexed && isBuildIndexed && areProvidersIndexed);
+    }
+
+    @VisibleForTesting
+    static String buildProviderVersionedNames(List<ResolveInfo> providers) {
+        StringBuilder sb = new StringBuilder();
+        for (ResolveInfo info : providers) {
+            sb.append(info.providerInfo.packageName)
+                    .append(':')
+                    .append(info.providerInfo.applicationInfo.versionCode)
+                    .append(',');
+        }
+        return sb.toString();
+    }
+
+    static void clearCachedIndexed(Context context) {
+        context.getSharedPreferences(INDEX, Context.MODE_PRIVATE).edit().clear().commit();
+    }
+
+    static void setLocaleIndexed(Context context, String locale) {
+        context.getSharedPreferences(INDEX, Context.MODE_PRIVATE)
+                .edit()
+                .putBoolean(locale, true)
+                .apply();
+    }
+
+    static void setProvidersIndexed(Context context, String providerVersionedNames) {
+        context.getSharedPreferences(INDEX, Context.MODE_PRIVATE)
+                .edit()
+                .putString(PREF_KEY_INDEXED_PROVIDERS, providerVersionedNames)
+                .apply();
     }
 
-    public static void setLocaleIndexed(Context context, String locale) {
-        context.getSharedPreferences(INDEX, 0).edit().putBoolean(locale, true).commit();
+    static boolean isLocaleAlreadyIndexed(Context context, String locale) {
+        return context.getSharedPreferences(INDEX, Context.MODE_PRIVATE).getBoolean(locale, false);
     }
 
-    public static boolean isLocaleAlreadyIndexed(Context context, String locale) {
-        return context.getSharedPreferences(INDEX, 0).getBoolean(locale, false);
+    static boolean areProvidersIndexed(Context context, String providerVersionedNames) {
+        final String indexedProviders = context.getSharedPreferences(INDEX, Context.MODE_PRIVATE)
+                .getString(PREF_KEY_INDEXED_PROVIDERS, null);
+        return TextUtils.equals(indexedProviders, providerVersionedNames);
     }
 
-    public static boolean isBuildIndexed(Context context, String buildNo) {
-        return context.getSharedPreferences(INDEX, 0).getBoolean(buildNo, false);
+    static boolean isBuildIndexed(Context context, String buildNo) {
+        return context.getSharedPreferences(INDEX, Context.MODE_PRIVATE).getBoolean(buildNo, false);
     }
 
-    public static void setBuildIndexed(Context context, String buildNo) {
+    static void setBuildIndexed(Context context, String buildNo) {
         context.getSharedPreferences(INDEX, 0).edit().putBoolean(buildNo, true).commit();
     }
 
diff --git a/src/com/android/settings/search/InlineListPayload.java b/src/com/android/settings/search/InlineListPayload.java
new file mode 100644
index 0000000000000000000000000000000000000000..c11c4a388f509dece4a59e442269c8573e8af540
--- /dev/null
+++ b/src/com/android/settings/search/InlineListPayload.java
@@ -0,0 +1,62 @@
+package com.android.settings.search;
+
+import android.content.Intent;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Payload for settings which are selected from multiple values. For example, Location can be
+ * set to multiple degrees of accuracy.
+ */
+public class InlineListPayload extends InlinePayload {
+
+    /**
+     * Number of selections in the list.
+     */
+    private int mNumOptions;
+
+    public InlineListPayload(String key, @PayloadType int payloadType, Intent intent,
+            boolean isDeviceSupported, int numOptions, int defaultValue) {
+        super(key, payloadType, intent, isDeviceSupported, defaultValue);
+        mNumOptions = numOptions;
+    }
+
+    private InlineListPayload(Parcel in) {
+        super(in);
+        mNumOptions = in.readInt();
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeInt(mNumOptions);
+    }
+
+    @Override
+    protected int standardizeInput(int input) throws IllegalArgumentException {
+        if (input < 0 || input >= mNumOptions) {
+            throw new IllegalArgumentException(
+                    "Invalid argument for ListSelect. Expected between 0 and "
+                            + mNumOptions + " but found: " + input);
+        }
+        return input;
+    }
+
+    @Override
+    @PayloadType public int getType() {
+        return PayloadType.INLINE_LIST;
+    }
+
+    public static final Parcelable.Creator<InlineListPayload> CREATOR =
+            new Parcelable.Creator<InlineListPayload>() {
+                @Override
+                public InlineListPayload createFromParcel(Parcel in) {
+                    return new InlineListPayload(in);
+                }
+
+                @Override
+                public InlineListPayload[] newArray(int size) {
+                    return new InlineListPayload[size];
+                }
+            };
+}
diff --git a/src/com/android/settings/search/InlinePayload.java b/src/com/android/settings/search/InlinePayload.java
new file mode 100644
index 0000000000000000000000000000000000000000..03b882839d7141abb48dfa085978716a7fb0adf3
--- /dev/null
+++ b/src/com/android/settings/search/InlinePayload.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.search;
+
+import android.content.Intent;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.provider.Settings;
+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;
+
+    /**
+     * Defines where the Setting is stored.
+     */
+    @SettingsSource final int mSettingSource;
+
+    /**
+     * True when the setting is available for the device.
+     */
+    final boolean mIsDeviceSupported;
+
+    /**
+     * The default value for the setting.
+     */
+    final int mDefaultvalue;
+
+    /**
+     * @param key uniquely identifies the stored setting.
+     * @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, @SettingsSource int source, Intent intent,
+            boolean isDeviceSupported, int defaultValue) {
+        super(intent);
+        mSettingKey = key;
+        mSettingSource = source;
+        mIsDeviceSupported = isDeviceSupported;
+        mDefaultvalue = defaultValue;
+    }
+
+    InlinePayload(Parcel parcel) {
+        super(parcel.readParcelable(Intent.class.getClassLoader()));
+        mSettingKey = parcel.readString();
+        mSettingSource = parcel.readInt();
+        mIsDeviceSupported = parcel.readInt() == TRUE;
+        mDefaultvalue = parcel.readInt();
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeString(mSettingKey);
+        dest.writeInt(mSettingSource);
+        dest.writeInt(mIsDeviceSupported ? TRUE : FALSE);
+        dest.writeInt(mDefaultvalue);
+    }
+
+    @Override
+    @PayloadType public abstract int getType();
+
+    /**
+     * @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;
+    }
+
+    /**
+     * Checks if the input is valid for the given setting.
+     *
+     * @param input The number to be get or set for the setting.
+     * @return {@param input} mapped to the public-facing API for settings.
+     * @throws IllegalArgumentException when the input is not valid for the given inline type.
+     */
+    protected abstract int standardizeInput(int input) throws IllegalArgumentException;
+
+    /**
+     * @returns the current value of the setting.
+     */
+    public int getValue(Context context) {
+        int settingsValue = -1;
+        switch(mSettingSource) {
+            case SettingsSource.SECURE:
+                settingsValue = Settings.Secure.getInt(context.getContentResolver(),
+                        mSettingKey, mDefaultvalue);
+                break;
+            case SettingsSource.SYSTEM:
+                settingsValue = Settings.System.getInt(context.getContentResolver(),
+                        mSettingKey, mDefaultvalue);
+                break;
+
+            case SettingsSource.GLOBAL:
+                settingsValue = Settings.Global.getInt(context.getContentResolver(),
+                        mSettingKey, mDefaultvalue);
+                break;
+        }
+
+        return standardizeInput(settingsValue);
+    }
+
+    /**
+     * Attempts to set the setting value.
+     *
+     * @param newValue is the requested value for the setting.
+     * @returns true when the setting was changed, and false otherwise.
+     */
+    public boolean setValue(Context context, int 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;
+    }
+}
\ 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 0000000000000000000000000000000000000000..bac031317191bee67b70d46626202bb059b3e19f
--- /dev/null
+++ b/src/com/android/settings/search/InlineSwitchPayload.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.search;
+
+import android.content.Intent;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Payload for inline Switch results. Mappings from integer to boolean.
+ */
+public class InlineSwitchPayload extends InlinePayload {
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    /**
+     * 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, int defaultValue) {
+        super(key, source, intent, isDeviceSupported, defaultValue);
+        // 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
+    @PayloadType public int getType() {
+        return PayloadType.INLINE_SWITCH;
+    }
+
+    @Override
+    protected int standardizeInput(int value) {
+        if (value != OFF && value != ON) {
+            throw new IllegalArgumentException("Invalid input for InlineSwitch. Expected: "
+                    + ON + " or " + OFF
+                    + " but found: " + value);
+        }
+        return mIsStandard
+                ? value
+                : 1 - value;
+    }
+
+    @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];
+        }
+    };
+
+    public boolean isStandard() {
+        return mIsStandard;
+    }
+}
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 d4a0ca24a2aa91d6970d9dd4e43f7498da72dfca..bb8320d3b3618d565a47b40160bae69444f2840c 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 @@ public class InlineSwitchViewHolder extends SearchViewHolder {
     }
 
     @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 82%
rename from src/com/android/settings/search2/InstalledAppResultLoader.java
rename to src/com/android/settings/search/InstalledAppResultLoader.java
index 47e1f675115a5aaacd1cec8c05aafdec2a07f100..6340a61b738d3c556f244c59002a03bd56f5ff16 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;
@@ -26,6 +27,7 @@ import android.net.Uri;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -34,17 +36,18 @@ import com.android.settings.SettingsActivity;
 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.Objects;
+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)
@@ -52,10 +55,11 @@ public class InstalledAppResultLoader extends AsyncLoader<List<? extends SearchR
 
     private List<String> mBreadcrumb;
     private SiteMapManager mSiteMapManager;
-    private final String mQuery;
+    @VisibleForTesting
+    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 +71,13 @@ public class InstalledAppResultLoader extends AsyncLoader<List<? extends SearchR
     }
 
     @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 +102,29 @@ public class InstalledAppResultLoader extends AsyncLoader<List<? extends SearchR
 
                 final AppSearchResult.Builder builder = new AppSearchResult.Builder();
                 builder.setAppInfo(info)
-                        .addTitle(info.loadLabel(pm))
-                        .addRank(getRank(wordDiff))
+                        .setStableId(Objects.hash(info.packageName, user.id))
+                        .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 +133,15 @@ public class InstalledAppResultLoader extends AsyncLoader<List<? extends SearchR
                         | 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 +212,15 @@ public class InstalledAppResultLoader extends AsyncLoader<List<? extends SearchR
         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 +233,7 @@ public class InstalledAppResultLoader extends AsyncLoader<List<? extends SearchR
 
     /**
      * 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/search2/IntentSearchViewHolder.java b/src/com/android/settings/search/IntentSearchViewHolder.java
similarity index 58%
rename from src/com/android/settings/search2/IntentSearchViewHolder.java
rename to src/com/android/settings/search/IntentSearchViewHolder.java
index 9a7e395bb204a161bc3481b34dd7d6b9bc0e609d..711d08e8a0ba22fe4524c04cc9a9ad11d2f678d9 100644
--- a/src/com/android/settings/search2/IntentSearchViewHolder.java
+++ b/src/com/android/settings/search/IntentSearchViewHolder.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.ComponentName;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.Pair;
+import android.util.Log;
 import android.view.View;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.SettingsActivity;
+import com.android.internal.logging.nano.MetricsProto;
+
+import java.util.List;
 
 /**
  * ViewHolder for intent based search results.
@@ -31,34 +33,38 @@ import com.android.settings.SettingsActivity;
  */
 public class IntentSearchViewHolder extends SearchViewHolder {
 
+    private static final String TAG = "IntentSearchViewHolder";
+
     public IntentSearchViewHolder(View view) {
         super(view);
     }
 
+    @Override
+    public int getClickActionMetricName() {
+        return MetricsProto.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();
-            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.onSearchResultClicked(this, result);
+            final Intent intent = result.payload.getIntent();
             // Use app user id to support work profile use case.
             if (result instanceof AppSearchResult) {
                 AppSearchResult appResult = (AppSearchResult) result;
                 UserHandle userHandle = appResult.getAppUserHandle();
                 fragment.getActivity().startActivityAsUser(intent, userHandle);
             } else {
-                fragment.startActivity(intent);
+                final PackageManager pm = fragment.getActivity().getPackageManager();
+                final List<ResolveInfo> info = pm.queryIntentActivities(intent, 0 /* flags */);
+                if (info != null && !info.isEmpty()) {
+                    fragment.startActivity(intent);
+                } else {
+                    Log.e(TAG, "Cannot launch search result, title: "
+                            + result.title + ", " + intent);
+                }
             }
         });
     }
diff --git a/src/com/android/settings/search/ResultPayload.java b/src/com/android/settings/search/ResultPayload.java
new file mode 100644
index 0000000000000000000000000000000000000000..6108569aeeec106a5f9172e06a0b5977ca9225e2
--- /dev/null
+++ b/src/com/android/settings/search/ResultPayload.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.INTENT, PayloadType.INLINE_SLIDER, PayloadType.INLINE_SWITCH,
+            PayloadType.INLINE_LIST, 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 an inline list-select, with an undefined UI.
+         */
+        int INLINE_LIST = 3;
+
+        /**
+         * Result is a recently saved query.
+         */
+        int SAVED_QUERY = 4;
+    }
+
+    /**
+     * Enumerates the possible values for the Availability of a setting.
+     */
+    @IntDef({Availability.AVAILABLE,
+            Availability.DISABLED_DEPENDENT_SETTING,
+            Availability.DISABLED_DEPENDENT_APP,
+            Availability.DISABLED_UNSUPPORTED,
+            Availability.RESOURCE_CONTENTION,
+            Availability.INTENT_ONLY,
+            Availability.DISABLED_FOR_USER,})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface Availability {
+        /**
+         * The setting is available.
+         */
+        int AVAILABLE = 0;
+
+        /**
+         * The setting has a dependency in settings app which is currently disabled, blocking
+         * access.
+         */
+        int DISABLED_DEPENDENT_SETTING = 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;
+
+        /**
+         * The setting is disabled because corresponding app is disabled.
+         */
+        int DISABLED_DEPENDENT_APP = 4;
+
+        /**
+         * This setting is supported on the device but cannot be changed inline.
+         */
+        int INTENT_ONLY = 5;
+
+        /**
+         * The setting cannot be changed by the current user.
+         * ex: MobileNetworkTakeMeThereSetting should not be available to a secondary user.
+         */
+        int DISABLED_FOR_USER = 6;
+    }
+
+    @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 41d15e22e491ee10c908149967072f034ab16ec8..2c908c194db2e946bcf41e7355f6e7149659eed6 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 92ca42af731b3592f45a519663d63b99b8be41a6..f6a3ff6972d4082d265cbb9ec086ccbf7d5c6e4c 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 245842c49e5c285da453dbd503980c1fc5321060..87457f56b147befcb898483c230f674a1b09dd84 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 @@ public class SavedQueryLoader extends AsyncLoader<List<? extends SearchResult>>
             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 94%
rename from src/com/android/settings/search2/SavedQueryPayload.java
rename to src/com/android/settings/search/SavedQueryPayload.java
index 6316894a2ad4f5233aa3f6a63db8bf24e03f9418..0a151fc08ff7f9a4687f7a8279bf8e646b994430 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 class SavedQueryPayload extends ResultPayload {
     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 e2325e83104e8d8b9afa7da56ae6ade32c87b947..466af0b47168b398e987a95aaf800b737d1a5120 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 98%
rename from src/com/android/settings/search2/SavedQueryRemover.java
rename to src/com/android/settings/search/SavedQueryRemover.java
index 4395cb6c6a9b4b87f3563bf87d7439956819fc42..47bb3baa2e86694e8e32c40d3c17ab6aa5d9775b 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 e468eb93d5381418d6e860e38ebb4b023473d71a..14509b6f9c59c93efd4fb767cf4f8f75b08e8961 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;
@@ -30,6 +33,11 @@ public class SavedQueryViewHolder extends SearchViewHolder {
         removeButton = view.findViewById(android.R.id.icon);
     }
 
+    @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);
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 5a8455b68c7f2a3570f948fda692a5e1a9484411..61a580b0f17271f9a95ae853d76ce42c824ef1db 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 61%
rename from src/com/android/settings/search2/SearchFeatureProvider.java
rename to src/com/android/settings/search/SearchFeatureProvider.java
index fa052fc4f0bef2ae606986d787293fdf77b3ca08..2fbebba0ff241e1b397ac76a667223dd22b2cdb4 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
@@ -33,14 +36,6 @@ public interface SearchFeatureProvider {
      */
     boolean isEnabled(Context context);
 
-    /**
-     * Inserts the Menu items into Settings activity.
-     *
-     * @param menu Items will be inserted into this menu.
-     * @param activity The activity that precedes SearchActivity.
-     */
-    void setUpSearchMenu(Menu menu, Activity activity);
-
     /**
      * Returns a new loader to search in index database.
      */
@@ -67,9 +62,15 @@ public interface SearchFeatureProvider {
     SiteMapManager getSiteMapManager();
 
     /**
-     * Updates the Settings indexes
+     * Updates the Settings indexes and calls {@link IndexingCallback#onIndexingFinished()} on
+     * {@param callback} when indexing is complete.
+     */
+    void updateIndexAsync(Context context, IndexingCallback callback);
+
+    /**
+     * Synchronously updates the Settings database.
      */
-    void updateIndex(Context context, IndexingCallback callback);
+    void updateIndex(Context context);
 
     /**
      * @returns true when indexing is complete.
@@ -95,5 +96,38 @@ public interface SearchFeatureProvider {
     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 60%
rename from src/com/android/settings/search2/SearchFeatureProviderImpl.java
rename to src/com/android/settings/search/SearchFeatureProviderImpl.java
index 4e47f9db57ad4f13a6768f77b921a5dca8e77a89..2bcd383cce80a879a5a17506033adf86a863beb7 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,24 +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.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;
-
-import com.android.settings.R;
+import android.text.TextUtils;
 import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search.IndexingCallback;
-
-import java.util.concurrent.atomic.AtomicBoolean;
+import com.android.settings.overlay.FeatureFactory;
 
 /**
  * FeatureProvider for the refactored search code.
@@ -38,6 +30,8 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
 
     private static final String TAG = "SearchFeatureProvider";
 
+    private static final String METRICS_ACTION_SETTINGS_INDEX = "search_synchronous_indexing";
+
     private DatabaseIndexingManager mDatabaseIndexingManager;
     private SiteMapManager mSiteMapManager;
 
@@ -46,36 +40,16 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
         return true;
     }
 
-    @Override
-    public void setUpSearchMenu(Menu menu, final Activity activity) {
-        if (menu == null || activity == null) {
-            return;
-        }
-        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;
-                    }
-                });
-
-        menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-    }
-
     @Override
     public DatabaseResultLoader getDatabaseSearchLoader(Context context, String query) {
-        return new DatabaseResultLoader(context, query, getSiteMapManager());
+        return new DatabaseResultLoader(context, cleanQuery(query), getSiteMapManager());
     }
 
     @Override
     public InstalledAppResultLoader getInstalledAppSearchLoader(Context context, String query) {
         return new InstalledAppResultLoader(
-                context, new PackageManagerWrapperImpl(context.getPackageManager()), query,
-                getSiteMapManager());
+                context, new PackageManagerWrapperImpl(context.getPackageManager()),
+                cleanQuery(query), getSiteMapManager());
     }
 
     @Override
@@ -105,10 +79,28 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider {
     }
 
     @Override
-    public void updateIndex(Context context, IndexingCallback callback) {
-        long indexStartTime = System.currentTimeMillis();
+    public void updateIndexAsync(Context context, IndexingCallback callback) {
         getIndexingManager(context).indexDatabase(callback);
-        Log.d(TAG, "IndexDatabase() took " +
-                (System.currentTimeMillis() - indexStartTime) + " ms");
+    }
+
+    @Override
+    public void updateIndex(Context context) {
+        long indexStartTime = System.currentTimeMillis();
+        getIndexingManager(context).performIndexing();
+        int indexingTime = (int) (System.currentTimeMillis() - indexStartTime);
+        FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+                .histogram(context, METRICS_ACTION_SETTINGS_INDEX, indexingTime);
+    }
+
+    /**
+     * A generic method to make the query suitable for searching the database.
+     *
+     * @return the cleaned query string
+     */
+    private String cleanQuery(String query) {
+        if (TextUtils.isEmpty(query)) {
+            return null;
+        }
+        return query.trim();
     }
 }
diff --git a/src/com/android/settings/search2/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java
similarity index 67%
rename from src/com/android/settings/search2/SearchFragment.java
rename to src/com/android/settings/search/SearchFragment.java
index 2a5c96100827a13e7853fbfadd7ca4f6ed2637a8..69c20621e76aa0cd6101629dd27fbd21c3fbdb11 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,30 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.Pair;
+import android.util.TypedValue;
 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 android.widget.TextView;
+import android.widget.Toolbar;
 
-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 com.android.settings.widget.ActionBarShadowController;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -57,12 +66,9 @@ import java.util.concurrent.atomic.AtomicInteger;
  * 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 +101,17 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
     @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 +125,7 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
 
     @Override
     public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.DASHBOARD_SEARCH_RESULTS;
+        return MetricsEvent.DASHBOARD_SEARCH_RESULTS;
     }
 
     @Override
@@ -134,7 +141,7 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
         setHasOptionsMenu(true);
 
         final LoaderManager loaderManager = getLoaderManager();
-        mSearchAdapter = new SearchResultsAdapter(this);
+        mSearchAdapter = new SearchResultsAdapter(this, mSearchFeatureProvider);
         mSavedQueryController = new SavedQueryController(
                 getContext(), loaderManager, mSearchAdapter);
         mSearchFeatureProvider.initFeedbackButton();
@@ -149,16 +156,9 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
         }
 
         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 */);
+            mSearchFeatureProvider.updateIndexAsync(activity, this /* indexingCallback */);
         } else {
             Log.w(TAG, "Cannot update the Indexer as we are running low on storage space!");
         }
@@ -174,6 +174,37 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
         mResultsRecyclerView.addOnScrollListener(mScrollListener);
 
         mNoResultsView = view.findViewById(R.id.no_results_layout);
+
+        Toolbar toolbar = view.findViewById(R.id.search_toolbar);
+        getActivity().setActionBar(toolbar);
+        getActivity().getActionBar().setDisplayHomeAsUpEnabled(true);
+
+        mSearchView = toolbar.findViewById(R.id.search_view);
+        mSearchView.setQuery(mQuery, false /* submitQuery */);
+        mSearchView.setOnQueryTextListener(this);
+        mSearchView.requestFocus();
+
+        // Updating internal views inside SearchView was the easiest way to get this too look right.
+        // Instead of grabbing the TextView directly, we grab it as a view and do an instanceof
+        // check. This ensures if we return, say, a LinearLayout in the tests, they won't fail.
+        View searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text);
+        if (searchText instanceof TextView) {
+            TextView searchTextView = (TextView) searchText;
+            searchTextView.setTextColor(getContext().getColorStateList(
+                    com.android.internal.R.color.text_color_primary));
+            searchTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
+                    getResources().getDimension(R.dimen.search_bar_text_size));
+
+        }
+        View editFrame = mSearchView.findViewById(com.android.internal.R.id.search_edit_frame);
+        if (editFrame != null) {
+            ViewGroup.MarginLayoutParams params =
+                    (ViewGroup.MarginLayoutParams) editFrame.getLayoutParams();
+            params.setMarginStart(0);
+            editFrame.setLayoutParams(params);
+        }
+        ActionBarShadowController.attachToRecyclerView(
+                view.findViewById(R.id.search_bar_container), getLifecycle(), mResultsRecyclerView);
         return view;
     }
 
@@ -191,7 +222,7 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
             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 +245,9 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
         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 +268,7 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
             mSavedQueryController.loadSavedQueries();
             mSearchFeatureProvider.hideFeedbackButton();
         } else {
+            mSearchAdapter.initializeSearch(mQuery);
             restartLoaders();
         }
 
@@ -251,7 +284,7 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
     }
 
     @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 +298,18 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
     }
 
     @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 +331,30 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
         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 +388,6 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
         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 +401,37 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
             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 d1d6945e0975523d871085f9ad84f82e96289776..31d39b5e36734d6fce0f68517b3bbede5f3435e0 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -21,6 +21,7 @@ import android.support.annotation.DrawableRes;
 import android.support.annotation.VisibleForTesting;
 import android.support.annotation.XmlRes;
 
+import android.text.TextUtils;
 import com.android.settings.DateTimeSettings;
 import com.android.settings.DeviceInfoSettings;
 import com.android.settings.DisplaySettings;
@@ -41,12 +42,15 @@ import com.android.settings.backup.BackupSettingsActivity;
 import com.android.settings.backup.BackupSettingsFragment;
 import com.android.settings.bluetooth.BluetoothSettings;
 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;
@@ -88,6 +92,12 @@ import java.util.HashMap;
 
 public final class SearchIndexableResources {
 
+    /**
+     * Identifies subsettings which have an {@link SearchIndexableResource#intentAction} but
+     * whose intents should still be treated as subsettings inside of Settings.
+     */
+    public static final String SUBSETTING_TARGET_PACKAGE = "subsetting_target_package";
+
     @XmlRes
     public static final int NO_DATA_RES_ID = 0;
 
@@ -97,8 +107,22 @@ public final class SearchIndexableResources {
     @VisibleForTesting
     static void addIndex(Class<?> indexClass, @XmlRes int xmlResId,
             @DrawableRes int iconResId) {
+        addIndex(indexClass, xmlResId, iconResId, null /* targetAction */);
+    }
+
+    @VisibleForTesting
+    static void addIndex(Class<?> indexClass, @XmlRes int xmlResId,
+            @DrawableRes int iconResId, String targetAction) {
         String className = indexClass.getName();
-        sResMap.put(className, new SearchIndexableResource(0, xmlResId, className, iconResId));
+        SearchIndexableResource resource =
+                new SearchIndexableResource(0, xmlResId, className, iconResId);
+
+        if (!TextUtils.isEmpty(targetAction)) {
+            resource.intentAction = targetAction;
+            resource.intentTargetPackage = SUBSETTING_TARGET_PACKAGE;
+        }
+
+        sResMap.put(className, resource);
     }
 
     static {
@@ -112,13 +136,16 @@ public final class SearchIndexableResources {
         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(DisplaySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_display,
+                "android.settings.DISPLAY_SETTINGS");
+        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);
         addIndex(AppAndNotificationDashboardFragment.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_applications);
-        addIndex(SoundSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_sound);
+        addIndex(SoundSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_sound,
+                "android.settings.SOUND_SETTINGS");
         addIndex(ZenModeSettings.class,
                 R.xml.zen_mode_settings, R.drawable.ic_settings_notifications);
         addIndex(ZenModePrioritySettings.class,
@@ -131,8 +158,7 @@ public final class SearchIndexableResources {
                 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);
@@ -145,8 +171,7 @@ public final class SearchIndexableResources {
         addIndex(LocationSettings.class, R.xml.location_settings, R.drawable.ic_settings_location);
         addIndex(ScanningSettings.class, R.xml.location_scanning, R.drawable.ic_settings_location);
         addIndex(SecuritySettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_security);
-        addIndex(EncryptionAndCredential.class, R.xml.encryption_and_credential,
-                R.drawable.ic_settings_security);
+        addIndex(EncryptionAndCredential.class, NO_DATA_RES_ID, R.drawable.ic_settings_security);
         addIndex(ScreenPinningSettings.class, NO_DATA_RES_ID, R.drawable.ic_settings_security);
         addIndex(UserAndAccountDashboardFragment.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_accounts);
@@ -182,6 +207,8 @@ public final class SearchIndexableResources {
                 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 ecc41b6282f4acf27b9bb0652786f94cb3d11d43..d96661a38c970bc47a4cd583601886c1b9bc980f 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 @@ public class SearchResult implements Comparable<SearchResult> {
     /**
      * 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 @@ public class SearchResult implements Comparable<SearchResult> {
         icon = builder.mIcon;
         payload = builder.mResultPayload;
         viewType = payload.getType();
-        stableId = Objects.hash(title, summary, breadcrumbs, rank, viewType);
     }
 
     @Override
@@ -105,19 +109,19 @@ public class SearchResult implements Comparable<SearchResult> {
     }
 
     @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 @@ public class SearchResult implements Comparable<SearchResult> {
         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 @@ public class SearchResult implements Comparable<SearchResult> {
             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 9bd1bde6300ff5d4d2c07fd01ab07cb4d5a879c3..b7bbc668952876d97fcd9b171969e1c6f0c507e2 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 0000000000000000000000000000000000000000..d2ace0e6bb5717b754d275a274a6eef4270a69e2
--- /dev/null
+++ b/src/com/android/settings/search/SearchResultsAdapter.java
@@ -0,0 +1,402 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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:
+                // TODO (b/62807132) replace layout InlineSwitchViewHolder and return an
+                // InlineSwitchViewHolder.
+                view = inflater.inflate(R.layout.search_intent_item, parent, false);
+                return new IntentSearchViewHolder(view);
+            case ResultPayload.PayloadType.INLINE_LIST:
+                // TODO (b/62807132) build a inline-list view holder & layout.
+                view = inflater.inflate(R.layout.search_intent_item, parent, false);
+                return new IntentSearchViewHolder(view);
+            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 89%
rename from src/com/android/settings/search2/SearchViewHolder.java
rename to src/com/android/settings/search/SearchViewHolder.java
index 185a5fe432e292c7ddad76d6c5ce997a2eee7f21..ed72940f8b6d4bbe9a8089bc242d788585e35d88 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;
@@ -47,12 +48,15 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
     public final ImageView iconView;
 
     protected final MetricsFeatureProvider mMetricsFeatureProvider;
+    protected final SearchFeatureProvider mSearchFeatureProvider;
     private final IconDrawableFactory mIconDrawableFactory;
 
     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);
@@ -62,6 +66,8 @@ public abstract class SearchViewHolder extends RecyclerView.ViewHolder {
         mIconDrawableFactory = IconDrawableFactory.newInstance(view.getContext());
     }
 
+    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 1bf0a153f7ecf448803a33b7fa847214036610ea..a13081ae6a50170b9e59a5434d039f9189b23e26 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -23,8 +23,6 @@ import android.provider.SearchIndexableResource;
 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;
@@ -60,8 +58,8 @@ public class SettingsSearchIndexablesProvider extends SearchIndexablesProvider {
             ref[COLUMN_INDEX_XML_RES_RESID] = val.xmlResId;
             ref[COLUMN_INDEX_XML_RES_CLASS_NAME] = val.className;
             ref[COLUMN_INDEX_XML_RES_ICON_RESID] = val.iconResId;
-            ref[COLUMN_INDEX_XML_RES_INTENT_ACTION] = null; // intent action
-            ref[COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE] = null; // intent target package
+            ref[COLUMN_INDEX_XML_RES_INTENT_ACTION] = val.intentAction;
+            ref[COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE] = val.intentTargetPackage;
             ref[COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS] = null; // intent target class
             cursor.addRow(ref);
         }
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 17f1743401eeb5ed872b07a01db21aec9a6d62f1..c81381c96b52018c7ee6edf36e875cfba14c83c6 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 0000000000000000000000000000000000000000..c254a40144c255ff1038f849ceff18e69900ece6
--- /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/InlinePayload.java b/src/com/android/settings/search2/InlinePayload.java
deleted file mode 100644
index 4b1c168d4c6c467287067884b014548ba94587a2..0000000000000000000000000000000000000000
--- 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 b0099761948d2cb334cc051e63a0442fcf211bc1..0000000000000000000000000000000000000000
--- 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 3e1049ef90744eae23ac72a88df64f4c4e38743c..0000000000000000000000000000000000000000
--- 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/ResultPayload.java b/src/com/android/settings/search2/ResultPayload.java
deleted file mode 100644
index 42942341fdb49fa2b5c909ba467c17b02b47ae16..0000000000000000000000000000000000000000
--- 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 60f2f7c02e015e727af4657daf9159505e996a1a..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..3c893407698ffb9ba9510812f11bf0527f04cc7d
--- /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 31378633f6743f88fa0248565d3758e807e49cf0..e239a438dea2c8144839d56dea429eb00fef734d 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -24,10 +24,10 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 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;
@@ -67,6 +67,11 @@ public class LockscreenDashboardFragment extends DashboardFragment
         return R.xml.security_lockscreen_settings;
     }
 
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_url_lockscreen;
+    }
+
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java
index 259ef124ac4464cebcc5beb36908443a511ab97e..a687cb9045e78bb57b41ff33238d59a103667eab 100644
--- a/src/com/android/settings/security/OwnerInfoPreferenceController.java
+++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java
@@ -25,12 +25,12 @@ import android.support.v7.preference.PreferenceScreen;
 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 0000000000000000000000000000000000000000..f881e2ff8c81b6c516a71e71c3257edcfb1becd6
--- /dev/null
+++ b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.R;
+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 !isSupported(context)
+                || isExpired(context)
+                || hasLaunchedBefore(context)
+                || !canOpenUrlInBrowser(context);
+    }
+
+    private static boolean isSupported(Context context) {
+        return context.getResources()
+                .getBoolean(R.bool.config_new_device_intro_suggestion_supported);
+    }
+
+    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 0000000000000000000000000000000000000000..819d5f72f44d0dc279b09c3488a480318b2ef0f0
--- /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 4eb14bd3811dd3fd95bfe2417af5d4be2b6fcc68..9b7a9df0c73b21bb584ddf120bdb3a974bb42523 100644
--- a/src/com/android/settings/survey/SurveyMixin.java
+++ b/src/com/android/settings/survey/SurveyMixin.java
@@ -18,11 +18,11 @@ package com.android.settings.survey;
 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/FactoryResetPreferenceController.java b/src/com/android/settings/system/FactoryResetPreferenceController.java
index a3cf10a53197bbf4a4b4550972ef5b4a9f8598f5..4379105da187ff7462fc87254656f3a69184ac30 100644
--- a/src/com/android/settings/system/FactoryResetPreferenceController.java
+++ b/src/com/android/settings/system/FactoryResetPreferenceController.java
@@ -45,7 +45,7 @@ public class FactoryResetPreferenceController extends PreferenceController {
     /** Hide "Factory reset" settings for secondary users, except demo users. */
     @Override
     public boolean isAvailable() {
-        return mUm.isAdminUser() || Utils.isCarrierDemoUser(mContext);
+        return mUm.isAdminUser() || Utils.isDemoUser(mContext);
     }
 
     @Override
diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java
index d4685bc0c89c308e538c6618907f51f71043803a..c04e3744d11ed0c6182ab864bbec9d407b27f6ae 100644
--- a/src/com/android/settings/system/ResetDashboardFragment.java
+++ b/src/com/android/settings/system/ResetDashboardFragment.java
@@ -23,11 +23,11 @@ import com.android.internal.logging.nano.MetricsProto;
 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 1a5a1829a72eddd4321e345fa9af6980dd485668..fd164bef3714b0eaa968213b1684dcb25ec57ad5 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -54,6 +54,11 @@ public class SystemDashboardFragment extends DashboardFragment {
         return R.xml.system_dashboard_fragment;
     }
 
+    @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 0dfdab6bebe119b57c514f75655fb5540b553b90..e8823a6388e2612f9b7d5504cf16da9560330935 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -36,7 +36,7 @@ import java.util.Collections;
 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 8026e278ecc4d8abbce9c5dede0d3f6cc9a7724b..bef2e9ab7df693e54e204bace53b38c4452fe3aa 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -54,7 +54,6 @@ import android.widget.SimpleAdapter;
 
 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.SettingsActivity;
 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.Collections;
 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
@@ -727,6 +725,7 @@ public class UserSettings extends SettingsPreferenceFragment
         final boolean voiceCapable = Utils.isVoiceCapable(context);
         final ArrayList<Integer> missingIcons = new ArrayList<>();
         final ArrayList<UserPreference> userPreferences = new ArrayList<>();
+        int guestId = UserPreference.USERID_GUEST_DEFAULTS;
         userPreferences.add(mMePreference);
 
         for (UserInfo user : users) {
@@ -740,6 +739,7 @@ public class UserSettings extends SettingsPreferenceFragment
                 pref = mMePreference;
             } else if (user.isGuest()) {
                 // Skip over Guest. We add generic Guest settings after this loop
+                guestId = user.id;
                 continue;
             } else {
                 // With Telephony:
@@ -816,9 +816,23 @@ public class UserSettings extends SettingsPreferenceFragment
             userPreferences.add(pref);
             pref.setDisabledByAdmin(
                     mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
-            if (!pref.isDisabledByAdmin()) {
-                pref.setSelectable(false);
-            }
+            int finalGuestId = guestId;
+            pref.setOnPreferenceClickListener(preference -> {
+                int id = finalGuestId;
+                if (id == UserPreference.USERID_GUEST_DEFAULTS) {
+                    UserInfo guest = mUserManager.createGuest(
+                            getContext(), preference.getTitle().toString());
+                    if (guest != null) {
+                        id = guest.id;
+                    }
+                }
+                try {
+                    ActivityManager.getService().switchUser(id);
+                } catch (RemoteException e) {
+                    e.rethrowFromSystemServer();
+                }
+                return true;
+            });
         }
 
         // Sort list of users by serialNum
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index 1dc6ae561fae74d77f007172691692f8332f4351..ae393fddea974292aff22b2cd51390684faf5e21 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -34,6 +34,8 @@ import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
+import android.util.IconDrawableFactory;
+import android.util.Log;
 import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -46,12 +48,14 @@ import java.util.Collections;
 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;
+    private IconDrawableFactory mIconDrawableFactory;
 
     abstract protected Config getConfig();
 
@@ -64,8 +68,9 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
         super.onCreate(icicle);
 
         mContext = getActivity();
-        mPM = mContext.getPackageManager();
+        mPm = mContext.getPackageManager();
         mDpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
+        mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
         mServiceListing = new ServiceListing(mContext, mConfig);
         mServiceListing.addCallback(new ServiceListing.Callback() {
             @Override
@@ -101,14 +106,29 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
 
         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(mIconDrawableFactory.getBadgedIcon(service, service.applicationInfo,
+                    UserHandle.getUserId(service.applicationInfo.uid)));
+            if (title != null && !title.equals(summary)) {
+                pref.setTitle(title);
+                pref.setSummary(summary);
+            } else {
+                pref.setTitle(summary);
+            }
+            pref.setKey(cn.flattenToString());
             pref.setChecked(mServiceListing.isEnabled(cn));
             if (managedProfileId != UserHandle.USER_NULL
                     && !mDpm.isNotificationListenerServicePermitted(
@@ -119,13 +139,20 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings {
                 @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 f71a2a9c2692810f442abe995dff5b237d2eb115..0000000000000000000000000000000000000000
--- 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/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
index afbb0b4794b909dba8db37f4d373797d76faf51f..90c5888f32b900522584d5f472eea045f08bd7a5 100644
--- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
+++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
@@ -45,7 +45,7 @@ public class WallpaperSuggestionActivity extends Activity {
         finish();
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     void startFallbackSuggestion() {
         // fall back to default wallpaper picker
         Utils.startWithFragment(this, WallpaperTypeSettings.class.getName(), null, null, 0,
diff --git a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
index bef47773b14c8530aa2b80987259241d38520ee2..1ca8ac72436e8aeb84b977337914ba3f2010a3c6 100644
--- a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
+++ b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java
@@ -90,8 +90,13 @@ public class WallpaperTypeSettings extends SettingsPreferenceFragment implements
                 final List<ResolveInfo> rList = pm.queryIntentActivities(intent,
                         PackageManager.MATCH_DEFAULT_ONLY);
 
-                // Add indexable data for each of the matching activities
+                // Add indexable data for package that is in config_wallpaper_picker_package
+                final String wallpaperPickerPackage =
+                        context.getString(R.string.config_wallpaper_picker_package);
                 for (ResolveInfo info : rList) {
+                    if (!wallpaperPickerPackage.equals(info.activityInfo.packageName)) {
+                        continue;
+                    }
                     CharSequence label = info.loadLabel(pm);
                     if (label == null) label = info.activityInfo.packageName;
 
diff --git a/src/com/android/settings/widget/ActionBarShadowController.java b/src/com/android/settings/widget/ActionBarShadowController.java
new file mode 100644
index 0000000000000000000000000000000000000000..0c6b02fedb490ebe42f4d4c0d47932a31dd8b522
--- /dev/null
+++ b/src/com/android/settings/widget/ActionBarShadowController.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.annotation.VisibleForTesting;
+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;
+
+/**
+ * A controller that adds shadow to actionbar when content view scrolls.
+ * <p/>
+ * It also works on custom views acting as an actionbar.
+ */
+public class ActionBarShadowController implements LifecycleObserver, OnStart, OnStop {
+
+    @VisibleForTesting
+    static final float ELEVATION_HIGH = 8;
+    @VisibleForTesting
+    static final float ELEVATION_LOW = 0;
+
+    @VisibleForTesting
+    ScrollChangeWatcher mScrollChangeWatcher;
+    private RecyclerView mRecyclerView;
+    private boolean isScrollWatcherAttached;
+
+    public static ActionBarShadowController attachToRecyclerView(Activity activity,
+            Lifecycle lifecycle, RecyclerView recyclerView) {
+        return new ActionBarShadowController(activity, lifecycle, recyclerView);
+    }
+
+    public static ActionBarShadowController attachToRecyclerView(View anchorView,
+            Lifecycle lifecycle, RecyclerView recyclerView) {
+        return new ActionBarShadowController(anchorView, lifecycle, recyclerView);
+    }
+
+    private ActionBarShadowController(Activity activity, Lifecycle lifecycle,
+            RecyclerView recyclerView) {
+        mScrollChangeWatcher = new ScrollChangeWatcher(activity);
+        mRecyclerView = recyclerView;
+        attachScrollWatcher();
+        lifecycle.addObserver(this);
+    }
+
+    private ActionBarShadowController(View anchorView, Lifecycle lifecycle,
+            RecyclerView recyclerView) {
+        mScrollChangeWatcher = new ScrollChangeWatcher(anchorView);
+        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.
+     */
+    final class ScrollChangeWatcher extends RecyclerView.OnScrollListener {
+
+        private final Activity mActivity;
+        private final View mAnchorView;
+
+        public ScrollChangeWatcher(Activity activity) {
+            mActivity = activity;
+            mAnchorView = null;
+        }
+
+        public ScrollChangeWatcher(View anchorView) {
+            mAnchorView = anchorView;
+            mActivity = null;
+        }
+
+        // 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);
+            if (mAnchorView != null) {
+                mAnchorView.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);
+            } else {
+                final ActionBar actionBar = mActivity.getActionBar();
+                if (actionBar != null) {
+                    actionBar.setElevation(shouldShowShadow ? ELEVATION_HIGH : ELEVATION_LOW);
+                }
+            }
+        }
+    }
+
+}
diff --git a/src/com/android/settings/widget/CarrierDemoPasswordDialogFragment.java b/src/com/android/settings/widget/CarrierDemoPasswordDialogFragment.java
deleted file mode 100644
index 8482b9fb10cf4131db1caede435d7ef9f39cb5da..0000000000000000000000000000000000000000
--- a/src/com/android/settings/widget/CarrierDemoPasswordDialogFragment.java
+++ /dev/null
@@ -1,144 +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.widget;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.TypedArray;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.InputType;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.EditText;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.util.HexDump;
-import com.android.settings.R;
-
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-public class CarrierDemoPasswordDialogFragment extends InstrumentedDialogFragment {
-
-    private static final String TAG = "CarrierDemoPasswordDF";
-
-    private MessageDigest mMessageDigest;
-
-    public CarrierDemoPasswordDialogFragment() {
-        try {
-            mMessageDigest = MessageDigest.getInstance("SHA-256");
-        } catch (NoSuchAlgorithmException e) {
-            Log.e(TAG, "Unable to verify demo mode password", e);
-        }
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        final AlertDialog dialog = new AlertDialog.Builder(getContext())
-                .setPositiveButton(R.string.retail_demo_reset_next,
-                        new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        final Fragment parentFragment = getParentFragment();
-                        if (parentFragment instanceof Callback
-                                && which == DialogInterface.BUTTON_POSITIVE) {
-                            ((Callback) parentFragment).onPasswordVerified();
-                        }
-                    }
-                })
-                .setNegativeButton(android.R.string.cancel, null)
-                .setMessage(R.string.retail_demo_reset_message)
-                .setTitle(R.string.retail_demo_reset_title)
-                .create();
-
-        final Context context = dialog.getContext();
-        final EditText passwordField = new EditText(context);
-        passwordField.setSingleLine();
-        passwordField.setInputType(InputType.TYPE_CLASS_TEXT
-                | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-        passwordField.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                // no-op
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                verifyPassword(dialog, passwordField.getText().toString());
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-                // no-op
-            }
-        });
-
-        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
-            @Override
-            public void onShow(DialogInterface dialogInterface) {
-                verifyPassword(dialog, passwordField.getText().toString());
-                passwordField.requestFocus();
-                final InputMethodManager imm = (InputMethodManager) getContext().getSystemService(
-                        Context.INPUT_METHOD_SERVICE);
-                imm.showSoftInput(passwordField, InputMethodManager.SHOW_IMPLICIT);
-            }
-        });
-        dialog.setCanceledOnTouchOutside(false);
-
-        final TypedArray a = context.obtainStyledAttributes(
-                new int[] { android.R.attr.dialogPreferredPadding });
-        final int sidePadding = a.getDimensionPixelSize(0, 0);
-        dialog.setView(passwordField, sidePadding, 0, sidePadding, 0);
-        a.recycle();
-
-        return dialog;
-    }
-
-    private void verifyPassword(AlertDialog dialog, String input) {
-        final Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-        if (mMessageDigest == null || TextUtils.isEmpty(input)) {
-            positiveButton.setEnabled(false);
-            return;
-        }
-        final String passwordHash = getContext().getString(
-                com.android.internal.R.string.config_carrierDemoModePassword);
-        if (passwordHash == null || TextUtils.isEmpty(passwordHash)) {
-            // This device does not support carrier demo mode.
-            return;
-        }
-        final byte[] inputDigest = mMessageDigest.digest(input.getBytes());
-        final String inputHash = HexDump.toHexString(inputDigest, 0, inputDigest.length, false);
-        positiveButton.setEnabled(TextUtils.equals(passwordHash, inputHash));
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.CARRIER_DEMO_MODE_PASSWORD;
-    }
-
-    public interface Callback {
-        void onPasswordVerified();
-    }
-}
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index 506ada93f92f83de31519f3d54dea6a3b2a69ad1..b50a50a5f7fe555583b52842c4f79f86606ab9ea 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -22,6 +22,7 @@ import android.graphics.ColorFilter;
 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;
@@ -38,8 +39,7 @@ public class DonutView extends View {
     // From manual testing, this is the longest we can go without visual errors.
     private static final int LINE_CHARACTER_LIMIT = 10;
     private float mStrokeWidth;
-    private float mDeviceDensity;
-    private int mPercent;
+    private double mPercent;
     private Paint mBackgroundCircle;
     private Paint mFilledArc;
     private TextPaint mTextPaint;
@@ -53,8 +53,7 @@ public class DonutView extends View {
 
     public DonutView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mDeviceDensity = getResources().getDisplayMetrics().density;
-        mStrokeWidth = 6f * mDeviceDensity;
+        mStrokeWidth = context.getResources().getDimension(R.dimen.storage_donut_thickness);
         final ColorFilter mAccentColorFilter =
                 new PorterDuffColorFilter(
                         Utils.getColorAttr(context, android.R.attr.colorAccent),
@@ -90,6 +89,9 @@ public class DonutView extends View {
         mBigNumberPaint.setTextSize(
                 resources.getDimension(R.dimen.storage_donut_view_percent_text_size));
         mBigNumberPaint.setTextAlign(Paint.Align.CENTER);
+        mBigNumberPaint.setTypeface(Typeface.create(
+                context.getString(com.android.internal.R.string.config_headlineFontFamily),
+                Typeface.NORMAL));
     }
 
     @Override
@@ -116,7 +118,7 @@ public class DonutView extends View {
                 getWidth() - mStrokeWidth,
                 getHeight() - mStrokeWidth,
                 TOP,
-                (360 * mPercent / 100),
+                (360 *  (float) mPercent),
                 false,
                 mFilledArc);
     }
@@ -138,7 +140,7 @@ public class DonutView extends View {
     /**
      * Set a percentage full to have the donut graph.
      */
-    public void setPercentage(int percent) {
+    public void setPercentage(double percent) {
         mPercent = percent;
         mPercentString = Utils.formatPercentage(mPercent);
         mFullString = getContext().getString(R.string.storage_percent_full);
diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
similarity index 51%
rename from src/com/android/settings/applications/AppHeaderController.java
rename to src/com/android/settings/widget/EntityHeaderController.java
index 804d645967a6b29829c7a545ea2bf7fe0e4e431c..8f64920963641e7843a00c9d9b3d3a764919c1a5 100644
--- a/src/com/android/settings/applications/AppHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications;
+package com.android.settings.widget;
 
 import android.annotation.IdRes;
 import android.annotation.UserIdInt;
@@ -30,6 +30,7 @@ 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;
@@ -41,13 +42,21 @@ 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 AppHeaderController {
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
+        .ACTION_OPEN_APP_NOTIFICATION_SETTING;
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING;
+
+public class EntityHeaderController {
 
     @IntDef({ActionType.ACTION_NONE,
             ActionType.ACTION_APP_INFO,
@@ -65,12 +74,15 @@ public class AppHeaderController {
 
     private static final String TAG = "AppDetailFeature";
 
-    private final Context mContext;
+    private final Context mAppContext;
+    private final Activity mActivity;
     private final Fragment mFragment;
     private final int mMetricsCategory;
-    private final View mAppHeader;
-
+    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;
@@ -78,90 +90,122 @@ public class AppHeaderController {
     @UserIdInt
     private int mUid = UserHandle.USER_NULL;
     @ActionType
-    private int mLeftAction;
+    private int mAction1;
     @ActionType
-    private int mRightAction;
+    private int mAction2;
 
     private boolean mIsInstantApp;
 
-    public AppHeaderController(Context context, Fragment fragment, View appHeader) {
-        mContext = context;
+    /**
+     * 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(context).getMetricsFeatureProvider()
+        mMetricsCategory = FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()
                 .getMetricsCategory(fragment);
-        if (appHeader != null) {
-            mAppHeader = appHeader;
+        if (header != null) {
+            mHeader = header;
         } else {
-            mAppHeader = LayoutInflater.from(fragment.getContext())
-                    .inflate(R.layout.app_details, null /* root */);
+            mHeader = LayoutInflater.from(fragment.getContext())
+                    .inflate(R.layout.settings_entity_header, null /* root */);
         }
     }
 
-    public AppHeaderController setIcon(Drawable icon) {
+    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(mContext.getResources());
+            mIcon = icon.getConstantState().newDrawable(mAppContext.getResources());
         }
         return this;
     }
 
-    public AppHeaderController setIcon(ApplicationsState.AppEntry appEntry) {
+    /**
+     * 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(mContext.getResources());
+            mIcon = appEntry.icon.getConstantState().newDrawable(mAppContext.getResources());
         }
         return this;
     }
 
-    public AppHeaderController setLabel(CharSequence label) {
+    public EntityHeaderController setIconContentDescription(String contentDescription) {
+        mIconContentDescription = contentDescription;
+        return this;
+    }
+
+    public EntityHeaderController setLabel(CharSequence label) {
         mLabel = label;
         return this;
     }
 
-    public AppHeaderController setLabel(ApplicationsState.AppEntry appEntry) {
+    public EntityHeaderController setLabel(ApplicationsState.AppEntry appEntry) {
         mLabel = appEntry.label;
         return this;
     }
 
-    public AppHeaderController setSummary(CharSequence summary) {
+    public EntityHeaderController setSummary(CharSequence summary) {
         mSummary = summary;
         return this;
     }
 
-    public AppHeaderController setSummary(PackageInfo packageInfo) {
+    public EntityHeaderController setSummary(PackageInfo packageInfo) {
         if (packageInfo != null) {
             mSummary = packageInfo.versionName;
         }
         return this;
     }
 
-    public AppHeaderController setButtonActions(@ActionType int leftAction,
-            @ActionType int rightAction) {
-        mLeftAction = leftAction;
-        mRightAction = rightAction;
+    public EntityHeaderController setButtonActions(@ActionType int action1,
+            @ActionType int action2) {
+        mAction1 = action1;
+        mAction2 = action2;
         return this;
     }
 
-    public AppHeaderController setPackageName(String packageName) {
+    public EntityHeaderController setPackageName(String packageName) {
         mPackageName = packageName;
         return this;
     }
 
-    public AppHeaderController setUid(int uid) {
+    public EntityHeaderController setUid(int uid) {
         mUid = uid;
         return this;
     }
 
-    public AppHeaderController setAppNotifPrefIntent(Intent appNotifPrefIntent) {
+    public EntityHeaderController setAppNotifPrefIntent(Intent appNotifPrefIntent) {
         mAppNotifPrefIntent = appNotifPrefIntent;
         return this;
     }
 
-    public AppHeaderController setIsInstantApp(boolean isInstantApp) {
+    public EntityHeaderController setIsInstantApp(boolean isInstantApp) {
         this.mIsInstantApp = isInstantApp;
         return this;
     }
 
     /**
-     * Done mutating appheader, rebinds everything and return a new {@link LayoutPreference}.
+     * 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));
@@ -172,41 +216,42 @@ public class AppHeaderController {
     }
 
     /**
-     * Done mutating appheader, rebinds everything (optionally skip rebinding buttons).
+     * Done mutating entity header, rebinds everything (optionally skip rebinding buttons).
      */
     public View done(Activity activity, boolean rebindActions) {
         styleActionBar(activity);
-        ImageView iconView = mAppHeader.findViewById(R.id.app_detail_icon);
+        ImageView iconView = mHeader.findViewById(R.id.entity_header_icon);
         if (iconView != null) {
             iconView.setImageDrawable(mIcon);
+            iconView.setContentDescription(mIconContentDescription);
         }
-        setText(R.id.app_detail_title, mLabel);
-        setText(R.id.app_detail_summary, mSummary);
+        setText(R.id.entity_header_title, mLabel);
+        setText(R.id.entity_header_summary, mSummary);
         if (mIsInstantApp) {
             setText(R.id.install_type,
-                    mAppHeader.getResources().getString(R.string.install_type_instant));
+                    mHeader.getResources().getString(R.string.install_type_instant));
         }
 
         if (rebindActions) {
-            bindAppHeaderButtons();
+            bindHeaderButtons();
         }
 
-        return mAppHeader;
+        return mHeader;
     }
 
     /**
-     * Only binds app header with button actions.
+     * Only binds entity header with button actions.
      */
-    public AppHeaderController bindAppHeaderButtons() {
-        ImageButton leftButton = mAppHeader.findViewById(R.id.left_button);
-        ImageButton rightButton = mAppHeader.findViewById(R.id.right_button);
+    public EntityHeaderController bindHeaderButtons() {
+        ImageButton button1 = mHeader.findViewById(android.R.id.button1);
+        ImageButton button2 = mHeader.findViewById(android.R.id.button2);
 
-        bindButton(leftButton, mLeftAction);
-        bindButton(rightButton, mRightAction);
+        bindButton(button1, mAction1);
+        bindButton(button2, mAction2);
         return this;
     }
 
-    public AppHeaderController styleActionBar(Activity activity) {
+    public EntityHeaderController styleActionBar(Activity activity) {
         if (activity == null) {
             Log.w(TAG, "No activity, cannot style actionbar.");
             return this;
@@ -219,12 +264,15 @@ public class AppHeaderController {
         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 appheader, rebinds everything.
+     * Done mutating entity header, rebinds everything.
      */
     @VisibleForTesting
     View done(Activity activity) {
@@ -243,11 +291,18 @@ public class AppHeaderController {
                     button.setVisibility(View.GONE);
                 } else {
                     button.setContentDescription(
-                            mContext.getString(R.string.application_info_label));
+                            mAppContext.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.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;
@@ -256,7 +311,15 @@ public class AppHeaderController {
                 if (mAppNotifPrefIntent == null) {
                     button.setVisibility(View.GONE);
                 } else {
-                    button.setOnClickListener(v -> mFragment.startActivity(mAppNotifPrefIntent));
+                    button.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()
+                                    .actionWithSource(mAppContext, mMetricsCategory,
+                                            ACTION_OPEN_APP_NOTIFICATION_SETTING);
+                            mFragment.startActivity(mAppNotifPrefIntent);
+                        }
+                    });
                     button.setVisibility(View.VISIBLE);
                 }
                 return;
@@ -268,7 +331,15 @@ public class AppHeaderController {
                     button.setVisibility(View.GONE);
                     return;
                 }
-                button.setOnClickListener(v -> mFragment.startActivity(intent));
+                button.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        FeatureFactory.getFactory(mAppContext).getMetricsFeatureProvider()
+                                .actionWithSource(mAppContext, mMetricsCategory,
+                                        ACTION_OPEN_APP_SETTING);
+                        mFragment.startActivity(intent);
+                    }
+                });
                 button.setVisibility(View.VISIBLE);
                 return;
             }
@@ -280,7 +351,7 @@ public class AppHeaderController {
     }
 
     private Intent resolveIntent(Intent i) {
-        ResolveInfo result = mContext.getPackageManager().resolveActivity(i, 0);
+        ResolveInfo result = mAppContext.getPackageManager().resolveActivity(i, 0);
         if (result != null) {
             return new Intent(i.getAction())
                     .setClassName(result.activityInfo.packageName, result.activityInfo.name);
@@ -289,7 +360,7 @@ public class AppHeaderController {
     }
 
     private void setText(@IdRes int id, CharSequence text) {
-        TextView textView = mAppHeader.findViewById(id);
+        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 0000000000000000000000000000000000000000..c83dff42afcd9d8ab66d5f1d18315867e0f6fedc
--- /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 84e3ed853cd0f81b9055b2a3d926697e25434174..0000000000000000000000000000000000000000
--- 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 53e3d758e4fd9204d7cbeee0fc85813098c1b9be..0000000000000000000000000000000000000000
--- 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 0000000000000000000000000000000000000000..705e918ea5e9b56c6864936f37ff5d05d989f3e6
--- /dev/null
+++ b/src/com/android/settings/widget/ScrollToParentEditText.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.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;
+
+import com.android.settings.widget.ImeAwareEditText;
+
+/**
+ * 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 ImeAwareEditText {
+
+    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 91%
rename from src/com/android/settings/SeekBarPreference.java
rename to src/com/android/settings/widget/SeekBarPreference.java
index a8d5fbf67299be655d3028f7a1166f06c9eb1fdf..ee7d4b8587d79980b07288359215ce75e4cccea0 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.Parcel;
 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;
@@ -45,6 +46,7 @@ public class SeekBarPreference extends RestrictedPreference
     private int mDefaultProgress = -1;
 
     private SeekBar mSeekBar;
+    private boolean mShouldBlink;
 
     public SeekBarPreference(
             Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -79,6 +81,11 @@ public class SeekBarPreference extends RestrictedPreference
         this(context, null);
     }
 
+    public void setShouldBlink(boolean shouldBlink) {
+        mShouldBlink = shouldBlink;
+        notifyChanged();
+    }
+
     @Override
     public void onBindViewHolder(PreferenceViewHolder view) {
         super.onBindViewHolder(view);
@@ -89,9 +96,26 @@ public class SeekBarPreference extends RestrictedPreference
         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);
         }
+        if (mShouldBlink) {
+            View v = view.itemView;
+            v.post(() -> {
+                if (v.getBackground() != null) {
+                    final int centerX = v.getWidth() / 2;
+                    final int centerY = v.getHeight() / 2;
+                    v.getBackground().setHotspot(centerX, centerY);
+                }
+                v.setPressed(true);
+                v.setPressed(false);
+                mShouldBlink = false;
+            });
+        }
     }
 
     @Override
@@ -130,6 +154,10 @@ public class SeekBarPreference extends RestrictedPreference
         }
     }
 
+    public int getMax() {
+        return mMax;
+    }
+
     public void setProgress(int progress) {
         setProgress(progress, true);
     }
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index af80fd474ba2b3cc734520d7b1ad067221e65600..c3aaba56ee122cb7814889d64a1957e4632d7626 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.wifi;
 
-import static android.content.Context.NETWORK_SCORE_SERVICE;
 import static android.content.Context.WIFI_SERVICE;
 
 import android.content.Context;
@@ -26,7 +25,6 @@ import android.provider.SearchIndexableResource;
 
 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.dashboard.DashboardFragment;
 import com.android.settings.network.NetworkScoreManagerWrapper;
@@ -44,6 +42,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
 
     private static final String TAG = "ConfigureWifiSettings";
 
+    private WifiWakeupPreferenceController mWifiWakeupPreferenceController;
     private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
 
     @Override
@@ -59,9 +58,14 @@ public class ConfigureWifiSettings extends DashboardFragment {
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mProgressiveDisclosureMixin.setTileLimit(
-            mUseOpenWifiPreferenceController.isAvailable() ? 3 : 2);
-        ((SettingsActivity) getActivity()).setDisplaySearchMenu(true);
+        int tileLimit = 1;
+        if (mWifiWakeupPreferenceController.isAvailable()) {
+            tileLimit++;
+        }
+        if (mUseOpenWifiPreferenceController.isAvailable()) {
+            tileLimit++;
+        }
+        mProgressiveDisclosureMixin.setTileLimit(tileLimit);
     }
 
     @Override
@@ -73,16 +77,17 @@ public class ConfigureWifiSettings extends DashboardFragment {
     protected List<PreferenceController> getPreferenceControllers(Context context) {
         final NetworkScoreManagerWrapper networkScoreManagerWrapper =
                 new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
+        mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(
+                context, getLifecycle(), networkScoreManagerWrapper);
         mUseOpenWifiPreferenceController = new UseOpenWifiPreferenceController(context, this,
                 networkScoreManagerWrapper, getLifecycle());
         final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new WifiWakeupPreferenceController(context, getLifecycle()));
+        controllers.add(mWifiWakeupPreferenceController);
         controllers.add(new NetworkScorerPickerPreferenceController(context,
                 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 6e88d797677828e5b64bc9d38c7c8e82a5d00e00..7cf19f28838f32285407dd6a09c9d7c59ebbeb35 100644
--- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
+++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
@@ -28,10 +28,10 @@ import android.support.v7.preference.PreferenceScreen;
 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/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index bf67565ea94c8f595d5552af3c395bf4276c5d49..ee4acd1301c7dd45d4ce311aedcaf5048e1f43c1 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -127,17 +127,25 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment
         final List<AccessPoint> accessPoints =
                 WifiSavedConfigUtils.getAllConfigs(context, mWifiManager);
         Collections.sort(accessPoints, SAVED_NETWORK_COMPARATOR);
-        preferenceScreen.removeAll();
+        cacheRemoveAllPrefs(preferenceScreen);
 
         final int accessPointsSize = accessPoints.size();
-        for (int i = 0; i < accessPointsSize; ++i){
+        for (int i = 0; i < accessPointsSize; ++i) {
+            AccessPoint ap = accessPoints.get(i);
+            String key = AccessPointPreference.generatePreferenceKey(ap);
             LongPressAccessPointPreference preference =
-                    new LongPressAccessPointPreference(accessPoints.get(i), context,
-                            mUserBadgeCache, true, this);
-            preference.setIcon(null);
-            preferenceScreen.addPreference(preference);
+                    (LongPressAccessPointPreference) getCachedPreference(key);
+            if (preference == null) {
+                preference = new LongPressAccessPointPreference(
+                        ap, context, mUserBadgeCache, true, this);
+                preference.setKey(key);
+                preference.setIcon(null);
+                preferenceScreen.addPreference(preference);
+            }
         }
 
+        removeCachedPrefs(preferenceScreen);
+
         if(getPreferenceScreen().getPreferenceCount() < 1) {
             Log.w(TAG, "Saved networks activity loaded, but there are no saved networks!");
         }
diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
index 09f5e92ed06cd1af11e8c3558c2432170edfc2b9..cea4d46031137b74bc67f978affb0d7695052676 100644
--- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
+++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
@@ -8,7 +8,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.ContentObserver;
 import android.net.NetworkScoreManager;
-
 import android.net.NetworkScorerAppData;
 import android.net.Uri;
 import android.os.Handler;
@@ -20,12 +19,15 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
-import com.android.settings.network.NetworkScoreManagerWrapper;
+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.network.NetworkScoreManagerWrapper;
+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;
 
 /**
  * {@link PreferenceController} that controls whether a user wants to enable the "use open networks
@@ -43,6 +45,7 @@ public class UseOpenWifiPreferenceController extends PreferenceController
 
     private Preference mPreference;
     private ComponentName mEnableUseWifiComponentName;
+    private boolean mDoFeatureSupportedScorersExist;
 
     public UseOpenWifiPreferenceController(Context context, Fragment fragment,
             NetworkScoreManagerWrapper networkScoreManagerWrapper, Lifecycle lifecycle) {
@@ -52,6 +55,7 @@ public class UseOpenWifiPreferenceController extends PreferenceController
         mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
         mSettingObserver = new SettingObserver();
         updateEnableUseWifiComponentName();
+        checkForFeatureSupportedScorers();
         lifecycle.addObserver(this);
     }
 
@@ -61,6 +65,21 @@ public class UseOpenWifiPreferenceController extends PreferenceController
                 appData == null ? null : appData.getEnableUseOpenWifiActivity();
     }
 
+    private void checkForFeatureSupportedScorers() {
+        if (mEnableUseWifiComponentName != null) {
+            mDoFeatureSupportedScorersExist = true;
+            return;
+        }
+        List<NetworkScorerAppData> scorers = mNetworkScoreManagerWrapper.getAllValidScorers();
+        for (NetworkScorerAppData scorer : scorers) {
+            if (scorer.getEnableUseOpenWifiActivity() != null) {
+                mDoFeatureSupportedScorersExist = true;
+                return;
+            }
+        }
+        mDoFeatureSupportedScorersExist = false;
+    }
+
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
@@ -79,7 +98,7 @@ public class UseOpenWifiPreferenceController extends PreferenceController
 
     @Override
     public boolean isAvailable() {
-        return mEnableUseWifiComponentName != null;
+        return mDoFeatureSupportedScorersExist;
     }
 
     @Override
@@ -93,8 +112,23 @@ public class UseOpenWifiPreferenceController extends PreferenceController
             return;
         }
         final SwitchPreference useOpenWifiPreference = (SwitchPreference) preference;
-        useOpenWifiPreference.setVisible(isAvailable());
+
+        boolean isScorerSet = mNetworkScoreManagerWrapper.getActiveScorerPackage() != null;
+        boolean doesActiveScorerSupportFeature = mEnableUseWifiComponentName != null;
+
         useOpenWifiPreference.setChecked(isSettingEnabled());
+        useOpenWifiPreference.setVisible(isAvailable());
+        useOpenWifiPreference.setEnabled(isScorerSet && doesActiveScorerSupportFeature);
+
+        if (!isScorerSet) {
+            useOpenWifiPreference.setSummary(
+                    R.string.use_open_wifi_automatically_summary_scoring_disabled);
+        } else if (!doesActiveScorerSupportFeature) {
+            useOpenWifiPreference.setSummary(
+                    R.string.use_open_wifi_automatically_summary_scorer_unsupported_disabled);
+        } else {
+            useOpenWifiPreference.setSummary(R.string.use_open_wifi_automatically_summary);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index 8e577a4f6ad54c9e182c87c17a83192164ba02ce..5d725d8772d8c9fab51189ed91b3c82c90dd9f91 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.WifiConfiguration;
 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 class WifiApEnabler {
         }
     }
 
-    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 fb01f1fb7ccffb98cf89ca5b7c02dd0ef5168a91..2a17dfcccc021b5369d876c7e6e394711006f17a 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -75,7 +75,7 @@ import java.util.Iterator;
  */
 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 class WifiConfigController implements TextWatcher,
     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 @@ public class WifiConfigController implements TextWatcher,
     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 f88e38b18b251aa90e1504795b53e47c6a8d2e85..238f0e19fd2d809660c11c18efdcc0aa11d18ba3 100644
--- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java
@@ -29,10 +29,10 @@ import android.text.TextUtils;
 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 09b33319301714c667c405486a029001980d5d3a..bc61cff0ea5fba879839a87de5df693966439119 100644
--- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
@@ -20,14 +20,14 @@ import android.support.v7.preference.PreferenceScreen;
 
 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 ee8285bcf7975e26493f1c59ac37c7e597edd640..cc10293baa35116b01fcdcc0ea5a6e870da9d1a3 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -43,7 +43,6 @@ import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -147,8 +146,9 @@ public class WifiSettings extends RestrictedSettingsFragment
     // account creation outside of setup wizard.
     private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
     // This string extra specifies a network to open the connect dialog on, so the user can enter
-    // network credentials.  This is used by quick settings for secured networks.
-    private static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
+    // network credentials.  This is used by quick settings for secured networks, among other
+    // things.
+    public static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
 
     // should Next button only be enabled when we have a connection?
     private boolean mEnableNextOnConnection;
@@ -201,6 +201,15 @@ public class WifiSettings extends RestrictedSettingsFragment
         // loaded (ODR).
         setAnimationAllowed(false);
 
+        addPreferences();
+
+        mIsRestricted = isUiRestricted();
+
+        mBgThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
+        mBgThread.start();
+    }
+
+    private void addPreferences() {
         addPreferencesFromResource(R.xml.wifi_settings);
 
         mConnectedAccessPointPreferenceCategory =
@@ -219,11 +228,6 @@ public class WifiSettings extends RestrictedSettingsFragment
         mStatusMessagePreference = new LinkablePreference(prefContext);
 
         mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());
-
-        mIsRestricted = isUiRestricted();
-
-        mBgThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
-        mBgThread.start();
     }
 
     @Override
@@ -342,16 +346,20 @@ public class WifiSettings extends RestrictedSettingsFragment
         mWifiTracker.startTracking();
 
         if (mIsRestricted) {
-            if (!isUiRestrictedByOnlyAdmin()) {
-                getEmptyTextView().setText(R.string.wifi_empty_list_user_restricted);
-            }
-            getPreferenceScreen().removeAll();
+            restrictUi();
             return;
         }
 
         onWifiStateChanged(mWifiManager.getWifiState());
     }
 
+    private void restrictUi() {
+        if (!isUiRestrictedByOnlyAdmin()) {
+            getEmptyTextView().setText(R.string.wifi_empty_list_user_restricted);
+        }
+        getPreferenceScreen().removeAll();
+    }
+
     /**
      * Only update the AP list if there are not any APs currently shown.
      *
@@ -391,6 +399,15 @@ public class WifiSettings extends RestrictedSettingsFragment
     public void onResume() {
         final Activity activity = getActivity();
         super.onResume();
+
+        // Because RestrictedSettingsFragment's onResume potentially requests authorization,
+        // which changes the restriction state, recalculate it.
+        final boolean alreadyImmutablyRestricted = mIsRestricted;
+        mIsRestricted = isUiRestricted();
+        if (!alreadyImmutablyRestricted && mIsRestricted) {
+            restrictUi();
+        }
+
         if (mWifiEnabler != null) {
             mWifiEnabler.resume(activity);
         }
@@ -412,6 +429,19 @@ public class WifiSettings extends RestrictedSettingsFragment
         super.onStop();
     }
 
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        final boolean formerlyRestricted = mIsRestricted;
+        mIsRestricted = isUiRestricted();
+        if (formerlyRestricted && !mIsRestricted
+                && getPreferenceScreen().getPreferenceCount() == 0) {
+            // De-restrict the ui
+            addPreferences();
+        }
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.WIFI;
@@ -697,6 +727,7 @@ public class WifiSettings extends RestrictedSettingsFragment
 
             case WifiManager.WIFI_STATE_DISABLED:
                 setOffMessage();
+                setAdditionalSettingsSummaries();
                 setProgressBarVisible(false);
                 break;
         }
@@ -712,6 +743,21 @@ public class WifiSettings extends RestrictedSettingsFragment
         changeNextButtonState(mWifiTracker.isConnected());
     }
 
+    /** Helper method to return whether an AccessPoint is disabled due to a wrong password */
+    private static boolean isDisabledByWrongPassword(AccessPoint accessPoint) {
+        WifiConfiguration config = accessPoint.getConfig();
+        if (config == null) {
+            return false;
+        }
+        WifiConfiguration.NetworkSelectionStatus networkStatus =
+                config.getNetworkSelectionStatus();
+        if (networkStatus == null || networkStatus.isNetworkEnabled()) {
+            return false;
+        }
+        int reason = networkStatus.getNetworkSelectionDisableReason();
+        return WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD == reason;
+    }
+
     private void updateAccessPointPreferences() {
         // in case state has changed
         if (!mWifiManager.isWifiEnabled()) {
@@ -734,10 +780,7 @@ public class WifiSettings extends RestrictedSettingsFragment
             AccessPoint accessPoint = accessPoints.get(index);
             // Ignore access points that are out of range.
             if (accessPoint.isReachable()) {
-                String key = accessPoint.getBssid();
-                if (TextUtils.isEmpty(key)) {
-                    key = accessPoint.getSsidStr();
-                }
+                String key = AccessPointPreference.generatePreferenceKey(accessPoint);
                 hasAvailableAccessPoints = true;
                 LongPressAccessPointPreference pref =
                         (LongPressAccessPointPreference) getCachedPreference(key);
@@ -750,10 +793,11 @@ public class WifiSettings extends RestrictedSettingsFragment
                 preference.setKey(key);
                 preference.setOrder(index);
                 if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
-                        && !accessPoint.isSaved()
                         && accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
-                    onPreferenceTreeClick(preference);
-                    mOpenSsid = null;
+                    if (!accessPoint.isSaved() || isDisabledByWrongPassword(accessPoint)) {
+                        onPreferenceTreeClick(preference);
+                        mOpenSsid = null;
+                    }
                 }
                 mAccessPointsPreferenceCategory.addPreference(preference);
                 accessPoint.setListener(WifiSettings.this);
@@ -991,6 +1035,7 @@ public class WifiSettings extends RestrictedSettingsFragment
         mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_CONNECT,
                 isSavedNetwork);
         mWifiManager.connect(config, mConnectListener);
+        scrollToPreference(mConnectedAccessPointPreferenceCategory);
     }
 
     protected void connect(final int networkId, boolean isSavedNetwork) {
diff --git a/src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java b/src/com/android/settings/wifi/WifiSleepPolicyPreferenceController.java
deleted file mode 100644
index 3e7911b6ad1b4034f121c55d4f516d8592b0edb1..0000000000000000000000000000000000000000
--- 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 9eea74a5cee6be1f1394648002edb9a2019e15f2..f174b4f8b316317900dc420b1c5c7be858e078c0 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -29,10 +29,11 @@ import android.text.TextUtils;
 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.network.NetworkScoreManagerWrapper;
+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.
@@ -41,10 +42,13 @@ public class WifiWakeupPreferenceController extends PreferenceController impleme
         LifecycleObserver, OnResume, OnPause {
 
     private static final String KEY_ENABLE_WIFI_WAKEUP = "enable_wifi_wakeup";
+    private final NetworkScoreManagerWrapper mNetworkScoreManager;
     private SettingObserver mSettingObserver;
 
-    public WifiWakeupPreferenceController(Context context, Lifecycle lifecycle) {
+    public WifiWakeupPreferenceController(
+            Context context, Lifecycle lifecycle, NetworkScoreManagerWrapper networkScoreManager) {
         super(context);
+        mNetworkScoreManager = networkScoreManager;
         lifecycle.addObserver(this);
     }
 
@@ -110,11 +114,17 @@ public class WifiWakeupPreferenceController extends PreferenceController impleme
         boolean networkRecommendationsEnabled = Settings.Global.getInt(
                 mContext.getContentResolver(),
                 Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0) == 1;
-        enableWifiWakeup.setEnabled(networkRecommendationsEnabled && wifiScanningEnabled);
-
-        enableWifiWakeup.setSummary(wifiScanningEnabled ?
-                R.string.wifi_wakeup_summary :
-                R.string.wifi_wakeup_summary_scanning_disabled);
+        boolean activeScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
+        enableWifiWakeup.setEnabled(
+                networkRecommendationsEnabled && wifiScanningEnabled && activeScorerSet);
+
+        if (!activeScorerSet) {
+            enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary_scoring_disabled);
+        } else if (!wifiScanningEnabled) {
+            enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary_scanning_disabled);
+        } else {
+            enableWifiWakeup.setSummary(R.string.wifi_wakeup_summary);
+        }
     }
 
     class SettingObserver extends ContentObserver {
diff --git a/src/com/android/settings/wifi/WpsPreferenceController.java b/src/com/android/settings/wifi/WpsPreferenceController.java
index 736d2311149866e7c273951854d6e03c81dcb1e7..7aaa7eb9398213b5f0caf35e6a1424a7c1d86ebb 100644
--- a/src/com/android/settings/wifi/WpsPreferenceController.java
+++ b/src/com/android/settings/wifi/WpsPreferenceController.java
@@ -31,10 +31,10 @@ import android.support.v7.preference.PreferenceScreen;
 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 @@ public class WpsPreferenceController extends PreferenceController implements
             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 23e547aea0e10580ed7f8aa2ba76cf78372e9325..b28a731597497e7d9352c026a48795bed60519be 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -27,7 +27,6 @@ import android.content.IntentFilter;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
 import android.net.ConnectivityManager.NetworkCallback;
-import android.net.IpPrefix;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
@@ -48,26 +47,28 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.Utils;
 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.widget.EntityHeaderController;
 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;
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.List;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
@@ -81,7 +82,7 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     @VisibleForTesting
-    static final String KEY_CONNECTION_DETAIL_PREF = "connection_detail";
+    static final String KEY_HEADER = "connection_header";
     @VisibleForTesting
     static final String KEY_BUTTONS_PREF = "buttons";
     @VisibleForTesting
@@ -116,7 +117,6 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
     private Network mNetwork;
     private NetworkInfo mNetworkInfo;
     private NetworkCapabilities mNetworkCapabilities;
-    private Context mPrefContext;
     private int mRssi;
     private String[] mSignalStr;
     private final WifiConfiguration mWifiConfig;
@@ -125,8 +125,8 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
     private final MetricsFeatureProvider mMetricsFeatureProvider;
 
     // UI elements - in order of appearance
-    private Preference mConnectionDetailPref;
     private LayoutPreference mButtonsPref;
+    private EntityHeaderController mEntityHeaderController;
     private Button mForgetButton;
     private Button mSignInButton;
     private WifiDetailPreference mSignalStrengthPref;
@@ -240,15 +240,12 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
 
-        mPrefContext = screen.getPreferenceManager().getContext();
-
-        mConnectionDetailPref = screen.findPreference(KEY_CONNECTION_DETAIL_PREF);
+        setupEntityHeader(screen);
 
         mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
-        mSignInButton = (Button) mButtonsPref.findViewById(R.id.signin_button);
+        mSignInButton = 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);
@@ -263,14 +260,29 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
         mDnsPref = (WifiDetailPreference) screen.findPreference(KEY_DNS_PREF);
 
         mIpv6Category = (PreferenceCategory) screen.findPreference(KEY_IPV6_CATEGORY);
-        mIpv6AddressPref = (Preference) screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
+        mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
 
         mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */));
-        mForgetButton = (Button) mButtonsPref.findViewById(R.id.forget_button);
+        mForgetButton = mButtonsPref.findViewById(R.id.forget_button);
         mForgetButton.setText(R.string.forget);
         mForgetButton.setOnClickListener(view -> forgetNetwork());
     }
 
+    private void setupEntityHeader(PreferenceScreen screen) {
+        LayoutPreference headerPref = (LayoutPreference) screen.findPreference(KEY_HEADER);
+        mEntityHeaderController =
+                EntityHeaderController.newInstance(
+                        mFragment.getActivity(), mFragment,
+                        headerPref.findViewById(R.id.entity_header));
+
+        ImageView iconView = headerPref.findViewById(R.id.entity_header_icon);
+        iconView.setBackground(
+                mContext.getDrawable(R.drawable.ic_settings_widget_background));
+        iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+
+        mEntityHeaderController.setLabel(mAccessPoint.getSsidStr());
+    }
+
     @Override
     public void onResume() {
         // Ensure mNetwork is set before any callbacks above are delivered, since our
@@ -349,7 +361,8 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
 
     private void refreshNetworkState() {
         mAccessPoint.update(mWifiConfig, mWifiInfo, mNetworkInfo);
-        mConnectionDetailPref.setTitle(mAccessPoint.getSettingsSummary());
+        mEntityHeaderController.setSummary(mAccessPoint.getSettingsSummary())
+                .done(mFragment.getActivity(), true /* rebind */);
     }
 
     private void refreshRssiViews() {
@@ -358,7 +371,8 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
         Drawable wifiIcon = NetworkBadging.getWifiIcon(
                 iconSignalLevel, NetworkBadging.BADGING_NONE, mContext.getTheme()).mutate();
 
-        mConnectionDetailPref.setIcon(wifiIcon);
+        wifiIcon.setTint(Utils.getColorAccent(mContext));
+        mEntityHeaderController.setIcon(wifiIcon).done(mFragment.getActivity(), true /* rebind */);
 
         Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate();
         wifiIconDark.setTint(mContext.getResources().getColor(
@@ -476,4 +490,13 @@ public class WifiDetailPreferenceController extends PreferenceController impleme
                 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 0000000000000000000000000000000000000000..3df1978d51d0cf4f042281c86b1fdc0b9cda53c9
--- /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/OnPrepareOptionsMenu.java b/src/com/android/settings/wifi/p2p/P2pPeerCategoryPreferenceController.java
similarity index 63%
rename from src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java
rename to src/com/android/settings/wifi/p2p/P2pPeerCategoryPreferenceController.java
index d64280764c03411edd4469bdfa473a80c6a5bfd5..5baa403abe58a7e5aab1d02bef786c6953397240 100644
--- a/src/com/android/settings/core/lifecycle/events/OnPrepareOptionsMenu.java
+++ b/src/com/android/settings/wifi/p2p/P2pPeerCategoryPreferenceController.java
@@ -14,11 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.settings.core.lifecycle.events;
+package com.android.settings.wifi.p2p;
 
-import android.view.Menu;
-import android.view.MenuInflater;
+import android.content.Context;
 
-public interface OnPrepareOptionsMenu {
-    void onPrepareOptionsMenu(Menu menu);
+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%
rename from src/com/android/settings/core/lifecycle/events/OnOptionsItemSelected.java
rename to src/com/android/settings/wifi/p2p/P2pPersistentCategoryPreferenceController.java
index b34b407f4159a440288ce50433ee50bb08bf2fa6..139f69830a7ca5eb05f26b60d90ac61867027707 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 0000000000000000000000000000000000000000..ca992a984eb1271c61c9f4491617a9920a9eaf0d
--- /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 df871ab6a15a441542d9663e9769ed78c18739b3..3eb2b7b2392657cef1ece9f20eccbd52c6d2a072 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.Preference;
 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 977be7ea72347cae37969418b3ea3858c5db334d..cd328d9bb7c76d672abb10072344f36deb3755c6 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.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener;
 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 android.widget.Toast;
 
 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 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
     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 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
                 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 class WifiP2pSettings extends SettingsPreferenceFragment
         }
     };
 
-    public WifiP2pSettings() {
-        if (DBG) Log.d(TAG, "Creating WifiP2pSettings ...");
+    @Override
+    protected String getLogTag() {
+        return TAG;
     }
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        addPreferencesFromResource(R.xml.wifi_p2p_settings);
+    protected int getPreferenceScreenResId() {
+        return 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);
+    @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) {
         final Activity activity = getActivity();
         mWifiP2pManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE);
         if (mWifiP2pManager != null) {
@@ -180,7 +198,7 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
 
         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 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
                             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 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
             }
         };
 
-        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);
@@ -490,11 +498,6 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
         return null;
     }
 
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.WIFI_P2P;
-    }
-
     @Override
     public int getDialogMetricsCategory(int dialogId) {
         switch (dialogId) {
@@ -524,13 +527,13 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
     }
 
     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 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
 
     @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 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
 
     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 @@ public class WifiP2pSettings extends SettingsPreferenceFragment
             });
         }
     }
-
-    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/res/values-hi/strings.xml b/tests/app/res/values-hi/strings.xml
index ed366ca7252608058f0db5b3b62d78199c4989d0..3a754c65ce3249009c4416f54d1256d8583f5ba0 100644
--- a/tests/app/res/values-hi/strings.xml
+++ b/tests/app/res/values-hi/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"खोजे जाने योग्य"</string>
-    <string name="start_scan" msgid="3834980997400324437">"स्कैन प्रारंभ करें"</string>
+    <string name="discoverable" msgid="5156521178072363663">"खोजे जाने लायक"</string>
+    <string name="start_scan" msgid="3834980997400324437">"स्कैन शुरू करें"</string>
     <string name="stop_scan" msgid="4195720269023182612">"स्कैन बंद करें"</string>
     <string name="operator_hello" msgid="5164036004953019483">"नमस्कार ऑपरेटर!"</string>
     <string name="operator_settings_title" msgid="6484497120056200416">"ऑपरेटर"</string>
diff --git a/tests/app/res/values-mr/strings.xml b/tests/app/res/values-mr/strings.xml
index 0a53c5792ff265dfecf50ead1b53eb38864d4d3b..be6511b446f0ca03a3794e938858e3f370abe4df 100644
--- a/tests/app/res/values-mr/strings.xml
+++ b/tests/app/res/values-mr/strings.xml
@@ -16,13 +16,13 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="discoverable" msgid="5156521178072363663">"शोधण्यायोग्य"</string>
-    <string name="start_scan" msgid="3834980997400324437">"स्कॅन प्रारंभ करा"</string>
+    <string name="discoverable" msgid="5156521178072363663">"शोधसुलभ"</string>
+    <string name="start_scan" msgid="3834980997400324437">"स्कॅन सुरू करा"</string>
     <string name="stop_scan" msgid="4195720269023182612">"स्कॅन थांबवा"</string>
     <string name="operator_hello" msgid="5164036004953019483">"हॅलो ऑपरेटर!"</string>
     <string name="operator_settings_title" msgid="6484497120056200416">"ऑपरेटर"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"पसंतीचा क्रियाकलाप प्रारंभ करण्‍यासाठी वापरले जाऊ शकणारे ऑपरेटर हुक"</string>
+    <string name="operator_settings_summary" msgid="8356150829172002728">"पसंतीची अॅक्टिव्हिटी सुरू करण्‍यासाठी वापरले जाऊ शकणारे अॉपरेटर हूक"</string>
     <string name="manufacturer_hello" msgid="5926168503597475062">"हॅलो निर्माता!"</string>
     <string name="manufacturer_settings_title" msgid="3516742885166545864">"निर्माता"</string>
-    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"पसंतीचा क्रियाकलाप प्रारंभ करण्‍यासाठी वापरले जाऊ शकणारे निर्माता हुक"</string>
+    <string name="manufacturer_settings_summary" msgid="4436962417539186408">"पसंतीची अॅक्टिव्हिटी सुरू करण्‍यासाठी वापरले जाऊ शकणारे निर्माता हूक"</string>
 </resources>
diff --git a/tests/app/res/values-pa/strings.xml b/tests/app/res/values-pa/strings.xml
index 61c310211220fb034280fb71b4e9a535b94c85ef..3604287d4705629e3c8dc11d9f77db08e57aaaf8 100644
--- a/tests/app/res/values-pa/strings.xml
+++ b/tests/app/res/values-pa/strings.xml
@@ -19,9 +19,9 @@
     <string name="discoverable" msgid="5156521178072363663">"ਖੋਜਣਯੋਗ"</string>
     <string name="start_scan" msgid="3834980997400324437">"ਸਕੈਨ ਚਾਲੂ ਕਰੋ"</string>
     <string name="stop_scan" msgid="4195720269023182612">"ਸਕੈਨ ਰੋਕੋ"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"ਹੈਲੋ ਕੈਰੀਅਰ!"</string>
-    <string name="operator_settings_title" msgid="6484497120056200416">"ਕੈਰੀਅਰ"</string>
-    <string name="operator_settings_summary" msgid="8356150829172002728">"ਕੈਰੀਅਰ ਹੁੱਕ ਜਿਸ ਦੀ ਵਰਤੋਂ ਪਸੰਦ ਦੀ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਲਈ  ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
+    <string name="operator_hello" msgid="5164036004953019483">"ਹੈਲੋ ਓਪਰੇਟਰ!"</string>
+    <string name="operator_settings_title" msgid="6484497120056200416">"ਓਪਰੇਟਰ"</string>
+    <string name="operator_settings_summary" msgid="8356150829172002728">"ਓਪਰੇਟਰ ਹੁੱਕ ਜਿਸਦੀ ਵਰਤੋਂ ਪਸੰਦ ਦੀ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
     <string name="manufacturer_hello" msgid="5926168503597475062">"ਹੈਲੋ ਨਿਰਮਾਤਾ!"</string>
     <string name="manufacturer_settings_title" msgid="3516742885166545864">"ਨਿਰਮਾਤਾ"</string>
     <string name="manufacturer_settings_summary" msgid="4436962417539186408">"ਨਿਰਮਾਤਾ ਹੁੱਕ ਜਿਸ ਦੀ ਵਰਤੋਂ ਪਸੰਦ ਦੀ ਸਰਗਰਮੀ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ"</string>
diff --git a/tests/app/res/values-zh-rHK/strings.xml b/tests/app/res/values-zh-rHK/strings.xml
index 335b55c5a06ebe84a5ed4095d01c50108fcb3017..55170070b6a02dabed80975e55fdbeec184c88be 100644
--- a/tests/app/res/values-zh-rHK/strings.xml
+++ b/tests/app/res/values-zh-rHK/strings.xml
@@ -17,8 +17,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="discoverable" msgid="5156521178072363663">"可供偵測"</string>
-    <string name="start_scan" msgid="3834980997400324437">"開始掃瞄"</string>
-    <string name="stop_scan" msgid="4195720269023182612">"停止掃瞄"</string>
+    <string name="start_scan" msgid="3834980997400324437">"開始掃描"</string>
+    <string name="stop_scan" msgid="4195720269023182612">"停止掃描"</string>
     <string name="operator_hello" msgid="5164036004953019483">"流動網絡供應商您好！"</string>
     <string name="operator_settings_title" msgid="6484497120056200416">"流動網絡供應商"</string>
     <string name="operator_settings_summary" msgid="8356150829172002728">"可用來啟動所選活動的流動網絡供應商勾點"</string>
diff --git a/tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java b/tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b372ad4b1bc0e4a57073cfd0ba7423a109bddd1
--- /dev/null
+++ b/tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.when;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiDevice;
+
+import com.android.settings.SettingsActivity;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+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;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class BluetoothDeviceDetailsRotationTest {
+    private Context mContext;
+    private UiDevice mUiDevice;
+    private Instrumentation mInstrumentation;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private CachedBluetoothDevice mCachedDevice;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private LocalBluetoothManager mBluetoothManager;
+
+    private String mDeviceAddress;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = InstrumentationRegistry.getTargetContext();
+        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+
+        mDeviceAddress = "AA:BB:CC:DD:EE:FF";
+        when(mCachedDevice.getAddress()).thenReturn(mDeviceAddress);
+        when(mCachedDevice.getName()).thenReturn("Mock Device");
+
+        BluetoothDeviceDetailsFragment.sTestDataFactory =
+                new BluetoothDeviceDetailsFragment.TestDataFactory() {
+            @Override
+            public CachedBluetoothDevice getDevice(String deviceAddress) {
+                return mCachedDevice;
+            }
+
+            @Override
+            public LocalBluetoothManager getManager(Context context) {
+                return mBluetoothManager;
+            }
+        };
+    }
+
+    @Test
+    public void rotation() {
+        Intent intent = new Intent("android.settings.BLUETOOTH_SETTINGS");
+        SettingsActivity activity = (SettingsActivity) mInstrumentation.startActivitySync(intent);
+        Bundle args = new Bundle(1);
+        args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS, mDeviceAddress);
+        activity.startPreferencePanel(null, BluetoothDeviceDetailsFragment.class.getName(), args,
+               0, null, null, 0);
+        try {
+            mUiDevice.setOrientationLeft();
+            mUiDevice.setOrientationNatural();
+            mUiDevice.setOrientationRight();
+            mUiDevice.setOrientationNatural();
+        } catch (RemoteException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java
index 0f957150134d497ec1165e1a70b2365c4b726abb..22e98c71e5e0db8067d610779528688fc3e3d6f9 100644
--- a/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java
+++ b/tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java
@@ -25,8 +25,6 @@ import android.support.test.espresso.matcher.ViewMatchers;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 
-import com.android.settings.R;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -57,7 +55,7 @@ public class AppNotificationSettingsTest {
 
         mInstrumentation.startActivitySync(intent);
 
-        onView(allOf(withId(R.id.left_button),
+        onView(allOf(withId(android.R.id.button1),
                 withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
                 .check(doesNotExist());
     }
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 924e716e740eb5ce1edb3c25fe04d025ac3d5848..e2bd6eeaace708f597e438164582cbd5b0d10909 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 @@ import java.util.List;
  * 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 05464ad78cad4e443d767773490c1bba62c40c6b..25e7da05edc330d3c9c4a812a536dcd6025f02a2 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.InstrumentationRegistry;
 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/password/SetupChooseLockPasswordAppTest.java b/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..78acc3e7419520a4b7bf8d4c6d7b219819d5f3be
--- /dev/null
+++ b/tests/app/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+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.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.support.test.filters.MediumTest;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.settings.R;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class SetupChooseLockPasswordAppTest {
+
+    @Rule
+    public ActivityTestRule<SetupChooseLockPassword> mActivityTestRule =
+            new ActivityTestRule<>(
+                    SetupChooseLockPassword.class,
+                    true /* enable touch at launch */,
+                    false /* don't launch at every test */);
+
+    @Test
+    public void testSkipDialogIsShown() throws Throwable {
+        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
+
+        onView(withId(R.id.cancel_button))
+                .check(matches(withText(R.string.skip_label)))
+                .check(matches(isDisplayed()))
+                .perform(click());
+        onView(withId(android.R.id.button1)).check(matches(isDisplayed())).perform(click());
+
+        assertThat(activity.isFinishing()).named("Is finishing").isTrue();
+    }
+}
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 e6fe899741e7d7993b93feedcde7e9e7f9239a6d..d342881915579ddbd66d787f6e966d180767f896 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 org.junit.runner.RunWith;
 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 @@ public class SearchFragmentEspressoTest {
 
     @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 b4484332ca253267b9f27801b052f99be7f514f7..ae0102feaab97b82a0d22a798afb5d1f573dd91e 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 # 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 767edf8e046c595f2c5ff210662ad48e32f1bb16..b9e328c347a1c83aa5d4afb127fd4c2491c78bba 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 0f65f898c405e52ed7a629890ff08000a05a2d0c..47711b0344192518395014fa26ba91089884ec41 100644
--- a/tests/robotests/assets/grandfather_not_implementing_indexable
+++ b/tests/robotests/assets/grandfather_not_implementing_indexable
@@ -18,16 +18,12 @@ com.android.settings.fingerprint.FingerprintSettings$FingerprintSettingsFragment
 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.applications.ProcessStatsSummary
 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.deviceinfo.PrivateVolumeUnmount
 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 c1f0d6096be7e8e7e20dfe7c4b1cffc2154137bd..64b5c83bd05d13251308a97904d7bcfa93cdd88b 100644
--- a/tests/robotests/assets/grandfather_not_implementing_instrumentable
+++ b/tests/robotests/assets/grandfather_not_implementing_instrumentable
@@ -1,5 +1,9 @@
 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.CustomListPreference$CustomListPreferenceDialogFragment
+com.android.settings.password.ChooseLockPassword$SaveAndFinishWorker
+com.android.settings.password.ChooseLockPattern$SaveAndFinishWorker
+com.android.settings.RestrictedListPreference$RestrictedListPreferenceDialogFragment
+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 a95fc0b6537773969bcaabbbed0113db612ede7f..948b14ad70c99d0906d90faed1bb1bf0f25ece19 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 8184d2cfe77138988cbaa3daa3f6f61687976c80..b3290725c98cf53a1746fac525413fd0e0704f13 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 020957e6c5ac34e9664a2c23e74402c575b0b300..a761f35408663e20e3cc90b32612eba6143ed714 100644
--- a/tests/robotests/assets/whitelist_duplicate_index_key
+++ b/tests/robotests/assets/whitelist_duplicate_index_key
@@ -2,4 +2,4 @@ add_users_when_locked
 additional_system_update_settings
 dashboard_tile_placeholder
 screen_zoom
-usage_access
\ No newline at end of file
+usage_access
diff --git a/tests/robotests/res/drawable/selectable_card.xml b/tests/robotests/res/drawable/selectable_card.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8d1274a86ca25854791b0d217488f714879c7bd6
--- /dev/null
+++ b/tests/robotests/res/drawable/selectable_card.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.
+-->
+
+<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 0000000000000000000000000000000000000000..cedf5b9eb624a62923e5f78337165cb51efee3c1
--- /dev/null
+++ b/tests/robotests/res/layout-mcc999/fingerprint_enroll_find_sensor.xml
@@ -0,0 +1,80 @@
+<?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"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    style="?attr/fingerprint_layout_theme"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:suwFooter="@layout/fingerprint_enroll_find_sensor_base_footer">
+
+    <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.Secondary"
+                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/res/xml/empty_settings.xml b/tests/robotests/res/values/config.xml
similarity index 76%
rename from res/xml/empty_settings.xml
rename to tests/robotests/res/values/config.xml
index d63f7d6ab9b3bf74e4cb7956788de759094ac481..156e20aef83cb37ae8661f59f644712d2be3eaea 100644
--- a/res/xml/empty_settings.xml
+++ b/tests/robotests/res/values/config.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
   Copyright (C) 2017 The Android Open Source Project
 
@@ -15,4 +14,7 @@
   limitations under the License.
   -->
 
-<PreferenceScreen />
+<resources>
+    <!-- Whether or not new device intro suggestion is supported for this device -->
+    <bool name="config_new_device_intro_suggestion_supported">true</bool>
+</resources>
\ No newline at end of file
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 0000000000000000000000000000000000000000..a46130661b0cc51a92c3fc8abc3dece937df1508
--- /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 0000000000000000000000000000000000000000..7c015cf505194abf810b00c379944224cbd4b66e
--- /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 ffa6d96f6ac417ec7cc2e32684d96baa69150b0c..3dcf6ab6d04c355eda35f7275f49c0136770a6c5 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;
 
 /**
@@ -35,6 +34,10 @@ public class AmbientDisplayConfiguration {
         return true;
     }
 
+    public boolean pulseOnPickupCanBeModified(int user) {
+        return true;
+    }
+
     public boolean pulseOnDoubleTapAvailable() {
         return true;
     }
@@ -42,4 +45,32 @@ public class AmbientDisplayConfiguration {
     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 alwaysOnAvailableForUser(int user) {
+        return true;
+    }
+
+    public boolean available() {
+        return true;
+    }
+
+    public boolean enabled(int user) {
+        return true;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index 8c1d7d493fb97ac7bf1f8563fd9dce16a35ac3ea..6b895d7463a5d79dbda67ab2f425122da726e9eb 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -1,9 +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;
@@ -14,13 +16,18 @@ import java.util.List;
 
 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 bc88b1aaa46f9bd91524b06182b6b20d5b92b825..7a3875e81286b186cc67601600a9999136579b3b 100644
--- a/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/EncryptionAndCredentialTest.java
@@ -16,23 +16,110 @@
 
 package com.android.settings;
 
+import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE;
+import static android.app.admin.DevicePolicyManager.ENCRYPTION_STATUS_INACTIVE;
+import static com.android.settings.EncryptionAndCredential.SEARCH_INDEX_DATA_PROVIDER;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.when;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.os.UserManager;
+import android.provider.SearchIndexableResource;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
-import static com.google.common.truth.Truth.assertThat;
-
+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 java.util.ArrayList;
+import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class EncryptionAndCredentialTest {
 
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+
+    private ShadowApplication mApplication;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mApplication = ShadowApplication.getInstance();
+        mApplication.setSystemService(Context.DEVICE_POLICY_SERVICE, mDevicePolicyManager);
+        mApplication.setSystemService(Context.USER_SERVICE, mUserManager);
+        mContext = mApplication.getApplicationContext();
+    }
+
     @Test
     public void getMetricsCategory_shouldReturnEncryptionAndCredential() {
         EncryptionAndCredential fragment = new EncryptionAndCredential();
         assertThat(fragment.getMetricsCategory()).isEqualTo(MetricsEvent.ENCRYPTION_AND_CREDENTIAL);
     }
 
+    // Search provider tests
+    @Test
+    public void getXmlResourcesToIndex_shouldReturnAllXmls() {
+        final List<SearchIndexableResource> index =
+                SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        mContext, true /* enabled */);
+
+        assertThat(index).hasSize(3);
+    }
+
+    @Test
+    public void getNonIndexableKeys_pageIsDisabled_shouldReturnAllKeysAsNonIndexable() {
+        when(mUserManager.isAdminUser()).thenReturn(false);
+
+        final List<SearchIndexableResource> index =
+                SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(mContext, true /* enabled */);
+        final List<String> expectedKeys = new ArrayList<>();
+        for (SearchIndexableResource res : index) {
+            expectedKeys.addAll(((BaseSearchIndexProvider) SEARCH_INDEX_DATA_PROVIDER)
+                    .getNonIndexableKeysFromXml(mContext, res.xmlResId));
+        }
+        final List<String> keys = SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        assertThat(keys).containsExactlyElementsIn(expectedKeys);
+    }
+
+    @Test
+    public void getNonIndexableKeys_deviceEncrypted_shouldReturnUnencryptedKeys() {
+        when(mUserManager.isAdminUser()).thenReturn(true);
+        when(mDevicePolicyManager.getStorageEncryptionStatus()).thenReturn(
+                ENCRYPTION_STATUS_ACTIVE);
+
+        final List<String> expectedKeys = new ArrayList<>();
+        expectedKeys.addAll(((BaseSearchIndexProvider) SEARCH_INDEX_DATA_PROVIDER)
+                .getNonIndexableKeysFromXml(mContext, R.xml.security_settings_unencrypted));
+        final List<String> keys = SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        assertThat(keys).containsExactlyElementsIn(expectedKeys);
+    }
+
+    @Test
+    public void getNonIndexableKeys_deviceNotEncrypted_shouldReturnEncryptedKeys() {
+        when(mUserManager.isAdminUser()).thenReturn(true);
+        when(mDevicePolicyManager.getStorageEncryptionStatus())
+                .thenReturn(ENCRYPTION_STATUS_INACTIVE);
+
+        final List<String> expectedKeys = new ArrayList<>();
+        expectedKeys.addAll(((BaseSearchIndexProvider) SEARCH_INDEX_DATA_PROVIDER)
+                .getNonIndexableKeysFromXml(mContext, R.xml.security_settings_encrypted));
+        final List<String> keys = SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+
+        assertThat(keys).containsExactlyElementsIn(expectedKeys);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
index 34cb2e7bdadef09c2b6f54132db2302dda0cf773..3d50c6366aa5eaffc3df29840f200fbe7b515111 100644
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
@@ -27,7 +27,6 @@ import org.robolectric.annotation.Config;
 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/LicenseHtmlLoaderTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
index 3f58f92291e3703a2add4fa549e449a5b36840fe..b16d3155532e960658465e6db5930389aa910321 100644
--- a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
@@ -23,7 +23,6 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import android.content.Context;
 
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
index 9951a3b65d7b520fe9e933c3a904947470d4aa48..21b8e475dea75004c59db0dcdc40a1a52869dff2 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MasterClearTest.java
@@ -17,39 +17,111 @@
 package com.android.settings;
 
 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.spy;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
+import android.app.Activity;
+import android.app.Fragment;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Intent;
+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 com.android.settings.testutils.shadow.ShadowUtils;
 
 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.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);
         when(mScrollView.getChildCount()).thenReturn(1);
     }
 
+    @Test
+    public void testShowWipeEuicc_euiccDisabled() {
+        prepareEuiccState(
+                false /* isEuiccEnabled */, true /* isEuiccProvisioned */);
+        assertThat(mMasterClear.showWipeEuicc()).isFalse();
+    }
+
+    @Test
+    public void testShowWipeEuicc_euiccEnabled_unprovisioned() {
+        prepareEuiccState(
+                true /* isEuiccEnabled */, false /* isEuiccProvisioned */);
+        assertThat(mMasterClear.showWipeEuicc()).isFalse();
+    }
+
+    @Test
+    public void testShowWipeEuicc_euiccEnabled_provisioned() {
+        prepareEuiccState(
+                true /* isEuiccEnabled */, true /* isEuiccProvisioned */);
+        assertThat(mMasterClear.showWipeEuicc()).isTrue();
+    }
+
+    private void prepareEuiccState(
+            boolean isEuiccEnabled,
+            boolean isEuiccProvisioned) {
+        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);
+    }
+
     @Test
     public void testHasReachedBottom_NotScrollDown_returnFalse() {
         initScrollView(100, 0, 200);
@@ -71,6 +143,22 @@ public class MasterClearTest {
         assertThat(mMasterClear.hasReachedBottom(mScrollView)).isTrue();
     }
 
+    @Test
+    @Config(shadows = { ShadowUtils.class })
+    public void testInitiateMasterClear_inDemoMode_sendsIntent() {
+        ShadowUtils.setIsDemoUser(true);
+
+        final ComponentName componentName = ComponentName.unflattenFromString(
+                "com.android.retaildemo/.DeviceAdminReceiver");
+        ShadowUtils.setDeviceOwnerComponent(componentName);
+
+        mMasterClear.mInitiateListener.onClick(
+                mContentView.findViewById(R.id.initiate_master_clear));
+        final Intent intent = mShadowActivity.getNextStartedActivity();
+        assertThat(Intent.ACTION_FACTORY_RESET).isEqualTo(intent.getAction());
+        assertThat(componentName.getPackageName()).isEqualTo(intent.getPackage());
+    }
+
     private void initScrollView(int height, int scrollY, int childBottom) {
         when(mScrollView.getHeight()).thenReturn(height);
         when(mScrollView.getScrollY()).thenReturn(scrollY);
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index 3c1178b55dd4b98d3a5fb7f6b15fbd8d554fa056..3fc46e86609ff3f08864d5dd48946e65fe5e4b01 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -16,16 +16,28 @@
 
 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;
 
@@ -37,17 +49,9 @@ import org.mockito.Mock;
 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 {
@@ -63,15 +67,10 @@ public class SettingsActivityTest {
     private Bitmap mBitmap;
     private SettingsActivity mActivity;
 
-    private FakeFeatureFactory mFeatureFactory;
-
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        FakeFeatureFactory.setupForTest(mContext);
-        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-
         mActivity = spy(new SettingsActivity());
         doReturn(mBitmap).when(mActivity).getBitmapFromXmlResource(anyInt());
     }
@@ -91,27 +90,7 @@ public class SettingsActivityTest {
     public void testSetTaskDescription_IconChanged() {
         mActivity.setTaskDescription(mTaskDescription);
 
-        verify(mTaskDescription).setIcon(any());
-    }
-
-    @Test
-    public void testCreateOptionsMenu_setsUpSearch() {
-        ReflectionHelpers.setField(mActivity, "mSearchFeatureProvider",
-                mFeatureFactory.getSearchFeatureProvider());
-        mActivity.mDisplaySearch = true;
-        mActivity.onCreateOptionsMenu(null);
-
-        verify(mFeatureFactory.getSearchFeatureProvider()).setUpSearchMenu(any(Menu.class),
-                any(Activity.class));
-    }
-
-    @Test
-    public void testSaveState_DisplaySearchSaved() {
-        mActivity.mDisplaySearch = true;
-        Bundle bundle = new Bundle();
-        mActivity.saveState(bundle);
-
-        assertThat((boolean) bundle.get(SettingsActivity.SAVE_KEY_SHOW_SEARCH)).isTrue();
+        verify(mTaskDescription).setIcon(nullable(Bitmap.class));
     }
 
     @Test
@@ -124,20 +103,13 @@ public class SettingsActivityTest {
     }
 
     @Test
-    public void testRestoreState_DisplaySearchRestored() {
-        Bundle bundle = new Bundle();
-        bundle.putBoolean(SettingsActivity.SAVE_KEY_SHOW_SEARCH, true);
-        mActivity.onRestoreInstanceState(bundle);
+    public void testOnClick() {
+        doReturn("com.android.settings").when(mActivity).getPackageName();
 
-        assertThat(mActivity.mDisplaySearch).isTrue();
-    }
-
-    @Test
-    public void testRestoreState_EnabledHomeRestored() {
-        Bundle bundle = new Bundle();
-        bundle.putBoolean(SettingsActivity.SAVE_KEY_SHOW_SEARCH, true);
-        mActivity.onRestoreInstanceState(bundle);
+        mActivity.onClick(null);
 
-        assertThat(mActivity.mDisplaySearch).isTrue();
+        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/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
index fbf8c3beec869ddf39a0ebb17c0c9ca2891a756e..dd17d9c1e8ec291778a681c6a24fe5cd2e381cb9 100644
--- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Matchers.anyInt;
 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;
@@ -37,13 +36,11 @@ import java.io.File;
 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.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 4b5cd750e0a4fe8280f106474dfa5ea61671ded1..dc4166d7eb3e07a08fb9cddc497e76fa2b202d3f 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,8 +32,11 @@ import org.mockito.Mock;
 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;
@@ -42,16 +47,31 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
 @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
@@ -102,7 +122,27 @@ public class SettingsPreferenceFragmentTest {
         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 c925e5d9ef1c2b956936992a7021d35361071357..78bc7d14768950467eb991ddd27a2ee75ce22628 100644
--- a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
@@ -25,7 +25,9 @@ import android.content.ComponentName;
 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;
@@ -64,11 +66,11 @@ public class SetupChooseLockPatternTest {
 
         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 115bc8a1d4a8428d499c37538928a97554d75943..21061c1b33db15e32fb66646b5b8753deb964a95 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -16,21 +16,35 @@
 
 package com.android.settings;
 
+import static com.android.settings.testutils.ResIdSubject.assertResId;
+
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Intent;
 
+import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.setupwizardlib.util.WizardManagerHelper;
 
+import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
-import static com.google.common.truth.Truth.assertThat;
-
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowSystemProperties.class
+        })
 public class SetupWizardUtilsTest {
 
+    @After
+    public void tearDown() {
+        SettingsShadowSystemProperties.clear();
+    }
+
     @Test
     public void testCopySetupExtras() throws Throwable {
         Intent fromIntent = new Intent();
@@ -44,4 +58,24 @@ public class SetupWizardUtilsTest {
         assertThat(toIntent.getBooleanExtra(WizardManagerHelper.EXTRA_USE_IMMERSIVE_MODE, false))
                 .isTrue();
     }
+
+    @Test
+    public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() {
+        SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
+                WizardManagerHelper.THEME_GLIF);
+        Intent intent = new Intent();
+        intent.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2);
+
+        assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
+    }
+
+    @Test
+    public void testGetTheme_withEmptyIntent_shouldReturnSystemProperty() {
+        SettingsShadowSystemProperties.set(SetupWizardUtils.SYSTEM_PROP_SETUPWIZARD_THEME,
+                WizardManagerHelper.THEME_GLIF_V2_LIGHT);
+        Intent intent = new Intent();
+
+        assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
index d7e133e84e75e04f92b2f9258c8f561a6c1fb40b..59a5867081a0af1ab5744b22884c5bdba077a6c7 100644
--- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
@@ -32,9 +32,14 @@ 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/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
index c5ba9c477c24c13aca0720db686eb3c663424f96..f2d1e6534acc85934f4389f6433bf08c87841aaf 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
@@ -33,7 +33,6 @@ import org.mockito.Answers;
 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 2d450185f49734fb0fd39d329a7cc5df3ba81d7e..81b563f93e94904acd20810818721a563cda841d 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
@@ -17,7 +17,6 @@ package com.android.settings.accounts;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.UserHandle;
@@ -26,8 +25,6 @@ import android.support.v7.preference.PreferenceScreen;
 
 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 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.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 @@ public class AccountDetailDashboardFragmentTest {
     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 @@ public class AccountDetailDashboardFragmentTest {
 
         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 0000000000000000000000000000000000000000..4dce0c69a5fe0a9c6717d7b8d0509076de36bc3f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.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.accounts;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
+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.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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;
+
+
+@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 onResume_shouldDisplayAccountInEntityHeader() {
+        final Lifecycle lifecycle = new Lifecycle();
+        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,
+                lifecycle, mActivity, mFragment, args);
+
+        assertThat(mController.isAvailable()).isTrue();
+
+        when(mScreen.findPreference(anyString())).thenReturn(mHeaderPreference);
+
+        mController.displayPreference(mScreen);
+        lifecycle.onResume();
+
+        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 0647489ef8f2dac6c7cdc46059287e84ef93d43c..f4f093a296df759b78f68ec565c558e46db86b96 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.AccountManager;
 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;
@@ -36,6 +38,7 @@ 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.ArgumentMatcher;
 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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
     }
 
     @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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
         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 @@ public class AccountPreferenceControllerTest {
         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;
-        }
+    private static ArgumentMatcher<Preference> titleMatches(String expected) {
+        return preference -> TextUtils.equals(expected, preference.getTitle());
+    }
 
-        @Override
-        public boolean matches(Object arg) {
-            final Preference preference = (Preference) arg;
-            return TextUtils.equals(mExpectedTitle, 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/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
index edb5d89bcd809438e3a87c5622f5a194d6a26f71..5fbd3a706a446e7b5d5bab45ed628c75ccddf6a7 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
@@ -16,11 +16,17 @@
 package com.android.settings.accounts;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
+
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
 
 import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SyncAdapterType;
 import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 
@@ -28,29 +34,58 @@ 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.testutils.shadow.ShadowAccountManager;
+import com.android.settings.testutils.shadow.ShadowContentResolver;
 
+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 org.robolectric.shadows.ShadowApplication;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
 public class AccountSyncPreferenceControllerTest {
 
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private AccountManager mAccountManager;
+
+    private Context mContext;
+    private AccountSyncPreferenceController mController;
+    private Preference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication application = ShadowApplication.getInstance();
+        application.setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
+        mContext = application.getApplicationContext();
+
+        when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
+                new AuthenticatorDescription[0]);
+        when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
+
+        mPreference = new Preference(mContext);
+        mPreference.setKey("account_sync");
+
+        mController = new AccountSyncPreferenceController(mContext);
+        mController.init(new Account("acct1", "type1"), new UserHandle(3));
+    }
+
+    @After
+    public void tearDown() {
+        ShadowContentResolver.reset();
+    }
+
     @Test
     public void handlePreferenceTreeClick_shouldStartFragment() {
-        final ShadowApplication application = ShadowApplication.getInstance();
-        final Context context = application.getApplicationContext();
-        final Preference preference = new Preference(context);
-        preference.setKey("account_sync");
-
-        final AccountSyncPreferenceController controller =
-                new AccountSyncPreferenceController(context);
-        controller.init(new Account("acct1", "type1"), mock(UserHandle.class));
-        controller.handlePreferenceTreeClick(preference);
+        mController.handlePreferenceTreeClick(mPreference);
 
-        final Intent nextActivity = application.getNextStartedActivity();
+        final Intent nextActivity = ShadowApplication.getInstance().getNextStartedActivity();
 
         assertThat(nextActivity.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
                 .isEqualTo(AccountSyncSettings.class.getName());
@@ -58,4 +93,93 @@ public class AccountSyncPreferenceControllerTest {
                 .isEqualTo(R.string.account_sync_title);
     }
 
+    @Test
+    public void updateSummary_adapterInvisible_shouldNotCount() {
+        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
+                "type1" /* accountType */, false /* userVisible */, true /* supportsUploading */);
+        SyncAdapterType[] syncAdapters = {syncAdapterType};
+        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
+
+        mController.updateSummary(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
+    }
+
+    @Test
+    public void updateSummary_notSameAccountType_shouldNotCount() {
+        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
+                "type5" /* accountType */, true /* userVisible */, true /* supportsUploading */);
+        SyncAdapterType[] syncAdapters = {syncAdapterType};
+        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
+
+        mController.updateSummary(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
+    }
+
+    @Test
+    public void updateSummary_notSyncable_shouldNotCount() {
+        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
+                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
+        SyncAdapterType[] syncAdapters = {syncAdapterType};
+        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
+        ShadowContentResolver.setSyncable("authority", 0);
+
+        mController.updateSummary(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
+    }
+
+    @Test
+    public void updateSummary_syncDisabled_shouldNotCount() {
+        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
+                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
+        SyncAdapterType[] syncAdapters = {syncAdapterType};
+        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
+        ShadowContentResolver.setSyncAutomatically("authority", false);
+        ShadowContentResolver.setMasterSyncAutomatically(3, true);
+
+        mController.updateSummary(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
+    }
+
+    @Test
+    public void updateSummary_syncEnabled_shouldCount() {
+        SyncAdapterType syncAdapterType = new SyncAdapterType("authority" /* authority */,
+                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
+        SyncAdapterType[] syncAdapters = {syncAdapterType};
+        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
+
+        mController.updateSummary(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.account_sync_summary_all_on));
+    }
+
+    @Test
+    public void updateSummary_multipleSyncAdapters_shouldSetSummary() {
+        SyncAdapterType syncAdapterType1 = new SyncAdapterType("authority1" /* authority */,
+                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
+        SyncAdapterType syncAdapterType2 = new SyncAdapterType("authority2" /* authority */,
+                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
+        SyncAdapterType syncAdapterType3 = new SyncAdapterType("authority3" /* authority */,
+                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
+        SyncAdapterType syncAdapterType4 = new SyncAdapterType("authority4" /* authority */,
+                "type1" /* accountType */, true /* userVisible */, true /* supportsUploading */);
+        SyncAdapterType[] syncAdapters =
+                {syncAdapterType1, syncAdapterType2, syncAdapterType3, syncAdapterType4};
+        ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
+
+        ShadowContentResolver.setSyncAutomatically("authority4", false);
+
+        mController.updateSummary(mPreference);
+
+        assertThat(mPreference.getSummary())
+                .isEqualTo(mContext.getString(R.string.account_sync_summary_some_on, 3, 4));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
index dc258e297d32c834e91942b29f4557839ff36389..a25aa281a01267cce09a69d7b9b48389e5de1972 100644
--- a/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AutoSyncWorkDataPreferenceControllerTest.java
@@ -19,7 +19,6 @@ package com.android.settings.accounts;
 
 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;
 
diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
index fe4766a16c995b645c0c5d9cf1172e25ef463804..0f7de468307f914c1b5788692a73babefcc89206 100644
--- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
@@ -149,6 +149,6 @@ public class EmergencyInfoPreferenceControllerTest {
         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 5ac911f72d7c366fd295ec0f5903e1c47dd21d1b..93b525398ff0537abf0f62a3e70d8d63f891d5ee 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,8 +36,8 @@ import android.content.Context;
 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.R;
@@ -45,16 +55,6 @@ 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.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 {
@@ -131,7 +131,7 @@ public class RemoveAccountPreferenceControllerTest {
                     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/applications/AdvancedAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/AdvancedAppSettingsTest.java
index 0352153ed99280918d8691fa44823cb926d4ef96..968421b47286d1cbf1eb72c15c53080499d5bc40 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.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 org.robolectric.util.ReflectionHelpers;
 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 class AdvancedAppSettingsTest {
     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 @@ public class AdvancedAppSettingsTest {
 
     }
 
-
     @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/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
index e8b4f450fb46fe5e8610326afc8f12d7ba649897..62395f3063db6ec41e3733a2dee1f226c4b27bc5 100644
--- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
@@ -17,40 +17,52 @@
 package com.android.settings.applications;
 
 import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.support.v7.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceScreen;
 
 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.testutils.SettingsRobolectricTestRunner;
+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 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.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.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)
+@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,26 +76,56 @@ public class AppInfoWithHeaderTest {
         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));
     }
 
+    @Test
+    public void packageRemoved_noAppEntry_shouldFinishActivity() {
+        BroadcastReceiver packageRemovedReceiver =
+                ReflectionHelpers.getField(mAppInfoWithHeader, "mPackageRemovedReceiver");
+        ReflectionHelpers.setField(mAppInfoWithHeader, "mAppEntry", null);
+
+        final Intent packageRemovedBroadcast = new Intent();
+        packageRemovedBroadcast.setData(Uri.parse("package:com.android.settings"));
+        packageRemovedReceiver.onReceive(RuntimeEnvironment.application, packageRemovedBroadcast);
+
+        assertThat(mAppInfoWithHeader.mPackageRemovedCalled).isTrue();
+    }
+
+    @Test
+    public void packageRemoved_appEntryMatchesPackageName_shouldFinishActivity() {
+        BroadcastReceiver packageRemovedReceiver =
+                ReflectionHelpers.getField(mAppInfoWithHeader, "mPackageRemovedReceiver");
+        final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
+        entry.info = new ApplicationInfo();
+        entry.info.packageName = "com.android.settings";
+        ReflectionHelpers.setField(mAppInfoWithHeader, "mAppEntry", entry);
+
+        final Intent packageRemovedBroadcast = new Intent();
+        packageRemovedBroadcast.setData(Uri.parse("package:" + entry.info.packageName));
+        packageRemovedReceiver.onReceive(RuntimeEnvironment.application, packageRemovedBroadcast);
+
+        assertThat(mAppInfoWithHeader.mPackageRemovedCalled).isTrue();
+    }
+
     public static class TestFragment extends AppInfoWithHeader {
 
         PreferenceManager mManager;
         PreferenceScreen mScreen;
         Context mShadowContext;
+        boolean mPackageRemovedCalled;
 
         public TestFragment() {
             mPm = mock(PackageManager.class);
@@ -93,7 +135,7 @@ public class AppInfoWithHeaderTest {
             mPackageInfo.applicationInfo = new ApplicationInfo();
             mShadowContext = ShadowApplication.getInstance().getApplicationContext();
             ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
-                                             (InstantAppDataProvider) (info -> false));
+                    (InstantAppDataProvider) (info -> false));
             when(mManager.getContext()).thenReturn(mShadowContext);
         }
 
@@ -126,6 +168,11 @@ public class AppInfoWithHeaderTest {
         public Context getContext() {
             return mShadowContext;
         }
+
+        @Override
+        protected void onPackageRemoved() {
+            mPackageRemovedCalled = true;
+        }
     }
 
 }
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 0000000000000000000000000000000000000000..e19c52f22045565191bf12f04ab115884f6a30fd
--- /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/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
index 5bf46482af26ebc2fa80167203aea36d6913e2b4..6122576bb3eba9eb0f90ffb1dac5d4c36d3bd189 100644
--- a/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DrawOverlayDetailsTest.java
@@ -16,6 +16,10 @@
 
 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;
@@ -35,10 +39,6 @@ import org.robolectric.annotation.Config;
 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 class DrawOverlayDetailsTest {
     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/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
index 18a39204a24a87585ae4c8e636a4e796d1bb74a7..3269acb1e2933cc7160799a3b0b7e076b08f7a47 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 @@ package com.android.settings.applications;
 
 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;
@@ -63,7 +64,8 @@ public class FetchPackageStorageAsyncLoaderTest {
         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 1391b2f99a8fa57fc356657380f7a0d15b4a5ca9..56df10e73e335b9c43af69351cfeff5cca41d749 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
@@ -16,6 +16,19 @@
 
 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;
@@ -40,19 +53,9 @@ import org.robolectric.shadows.ShadowApplication;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+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}.
  */
@@ -111,11 +114,12 @@ public final class InstalledAppCounterTest {
 
     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) {
@@ -134,7 +138,7 @@ public final class InstalledAppCounterTest {
         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);
 
@@ -249,16 +253,8 @@ public final class InstalledAppCounterTest {
         }
     }
 
-    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;
             }
@@ -270,10 +266,10 @@ public final class InstalledAppCounterTest {
                     !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 f47be60affe604187bfd70a364040c9f3c372ab6..e20a43556ab0a0005e5d10f0ad10fc369b80e2aa 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -16,7 +16,10 @@
 
 package com.android.settings.applications;
 
+
 import android.app.AlertDialog;
+import android.app.AppOpsManager;
+import android.app.Fragment;
 import android.app.LoaderManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
@@ -41,6 +44,7 @@ import com.android.settings.SettingsActivity;
 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 +70,9 @@ import java.util.HashSet;
 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;
@@ -111,6 +114,8 @@ public final class InstalledAppDetailsTest {
     private BatteryUtils mBatteryUtils;
     @Mock
     private LoaderManager mLoaderManager;
+    @Mock
+    private AppOpsManager mAppOpsManager;
 
     private FakeFeatureFactory mFeatureFactory;
     private InstalledAppDetails mAppDetail;
@@ -121,8 +126,7 @@ public final class InstalledAppDetailsTest {
     @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;
@@ -137,6 +141,7 @@ public final class InstalledAppDetailsTest {
         doReturn(mActivity).when(mAppDetail).getActivity();
         doReturn(mShadowContext).when(mAppDetail).getContext();
         doReturn(mPackageManager).when(mActivity).getPackageManager();
+        doReturn(mAppOpsManager).when(mActivity).getSystemService(Context.APP_OPS_SERVICE);
 
         // Default to not considering any apps to be instant (individual tests can override this).
         ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
@@ -145,7 +150,7 @@ public final class InstalledAppDetailsTest {
 
     @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 +166,7 @@ public final class InstalledAppDetailsTest {
 
     @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 +252,7 @@ public final class InstalledAppDetailsTest {
         // 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 +364,14 @@ public final class InstalledAppDetailsTest {
 
         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 2c5fef5944f6bce9e85057a99a01a4cff237d089..c4c3259bf2c55b06ebb7f6324e085e23dc170894 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
@@ -36,7 +36,6 @@ import org.mockito.MockitoAnnotations;
 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.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;
 
 /**
@@ -87,11 +85,12 @@ public final class InstalledAppListerTest {
 
     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 @@ public final class InstalledAppListerTest {
         }
     }
 
-    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 @@ public final class InstalledAppListerTest {
                     !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/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
index c8badc3978c625a807e299f70cdf4c790e01a186..52c1069e4228c5ab147b70a161fe15c765f2c012 100644
--- a/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ManageApplicationsTest.java
@@ -17,30 +17,51 @@
 package com.android.settings.applications;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.os.Handler;
 import android.os.Looper;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.TextView;
+
 import com.android.settings.R;
 import com.android.settings.Settings;
-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.SettingsRobolectricTestRunner;
 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.applications.ApplicationsState.Callbacks;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+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.RuntimeEnvironment;
 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.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+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.verify;
 import static org.mockito.Mockito.when;
 
@@ -59,16 +80,20 @@ import static org.mockito.Mockito.when;
         })
 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 +119,142 @@ public class ManageApplicationsTest {
         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();
+    }
+
+    @Test
+    public void onCreateView_shouldNotShowLoadingContainer() {
+        final ManageApplications fragment = spy(new ManageApplications());
+        ReflectionHelpers.setField(fragment, "mResetAppsHelper",
+                mock(ResetAppsHelper.class));
+        doNothing().when(fragment).createHeader();
+
+        final LayoutInflater layoutInflater = mock(LayoutInflater.class);
+        final View view = mock(View.class);
+        final View loadingContainer = mock(View.class);
+        when(layoutInflater.inflate(anyInt(), eq(null))).thenReturn(view);
+        when(view.findViewById(R.id.loading_container)).thenReturn(loadingContainer);
+
+        fragment.onCreateView(layoutInflater, mock(ViewGroup.class), null);
+
+        verify(loadingContainer, never()).setVisibility(View.VISIBLE);
+    }
+
+    @Test
+    public void updateLoading_appLoaded_shouldNotDelayCallToHandleLoadingContainer() {
+        final ManageApplications fragment = mock(ManageApplications.class);
+        ReflectionHelpers.setField(fragment, "mLoadingContainer", mock(View.class));
+        ReflectionHelpers.setField(fragment, "mListContainer", mock(View.class));
+        when(fragment.getActivity()).thenReturn(mock(Activity.class));
+        final Runnable showLoadingContainerRunnable = mock(Runnable.class);
+        final Handler handler = mock(Handler.class);
+        final ManageApplications.ApplicationsAdapter adapter =
+            spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
+        ReflectionHelpers.setField(adapter, "mShowLoadingContainerRunnable",
+            showLoadingContainerRunnable);
+        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
+
+        // app loading completed
+        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", true);
+        final ArrayList<ApplicationsState.AppEntry> appList = new ArrayList<>();
+        appList.add(mock(ApplicationsState.AppEntry.class));
+        when(mSession.getAllApps()).thenReturn(appList);
+
+        adapter.updateLoading();
+
+        verify(handler, never()).postDelayed(eq(showLoadingContainerRunnable), anyLong());
+    }
+
+    @Test
+    public void updateLoading_appNotLoaded_shouldDelayCallToHandleLoadingContainer() {
+        final ManageApplications fragment = mock(ManageApplications.class);
+        ReflectionHelpers.setField(fragment, "mLoadingContainer", mock(View.class));
+        ReflectionHelpers.setField(fragment, "mListContainer", mock(View.class));
+        when(fragment.getActivity()).thenReturn(mock(Activity.class));
+        final Runnable showLoadingContainerRunnable = mock(Runnable.class);
+        final Handler handler = mock(Handler.class);
+        final ManageApplications.ApplicationsAdapter adapter =
+            spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
+        ReflectionHelpers.setField(adapter, "mShowLoadingContainerRunnable",
+            showLoadingContainerRunnable);
+        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
+
+        // app loading not yet completed
+        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", false);
+
+        adapter.updateLoading();
+
+        verify(handler).postDelayed(eq(showLoadingContainerRunnable), anyLong());
+    }
+
+    @Test
+    public void onRebuildComplete_shouldCancelDelayedRunnable() {
+        final Context context = RuntimeEnvironment.application;
+        final ManageApplications fragment = mock(ManageApplications.class);
+        final View loadingContainer = mock(View.class);
+        when(loadingContainer.getContext()).thenReturn(context);
+        final View listContainer = mock(View.class);
+        when(listContainer.getVisibility()).thenReturn(View.INVISIBLE);
+        when(listContainer.getContext()).thenReturn(context);
+        ReflectionHelpers.setField(fragment, "mLoadingContainer", loadingContainer);
+        ReflectionHelpers.setField(fragment, "mListContainer", listContainer);
+        when(fragment.getActivity()).thenReturn(mock(Activity.class));
+        final Runnable showLoadingContainerRunnable = mock(Runnable.class);
+        final Handler handler = mock(Handler.class);
+        final ManageApplications.ApplicationsAdapter adapter =
+            spy(new ManageApplications.ApplicationsAdapter(mState, fragment, 0));
+        ReflectionHelpers.setField(adapter, "mShowLoadingContainerRunnable",
+            showLoadingContainerRunnable);
+        ReflectionHelpers.setField(adapter, "mFgHandler", handler);
+        ReflectionHelpers.setField(adapter, "mFilterMode", -1);
+
+        // app loading not yet completed
+        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", false);
+        adapter.updateLoading();
+
+        // app loading completed
+        ReflectionHelpers.setField(adapter, "mHasReceivedLoadEntries", true);
+        final ArrayList<ApplicationsState.AppEntry> appList = new ArrayList<>();
+        appList.add(mock(ApplicationsState.AppEntry.class));
+        when(mSession.getAllApps()).thenReturn(appList);
+
+        adapter.onRebuildComplete(null);
+
+        verify(handler).removeCallbacks(showLoadingContainerRunnable);
+    }
+
+    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 40c354eb609d29904e898a52a0fa302fd03fd393..5df5bed9ed3daf2523a2da128a9f5f453ede60d4 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 @@ package com.android.settings.applications;
 
 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;
 
@@ -32,8 +32,8 @@ import android.view.LayoutInflater;
 
 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 @@ public class MusicViewHolderControllerTest {
 
     @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 0000000000000000000000000000000000000000..16355768651e2d4cfbd062a7284c6735cc1462e7
--- /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 ab00a6068c4636ddd11dd19d9c9005f4b89b85f4..6bac9a3ee67996abf9de7cf41d9cab8a862e370c 100644
--- a/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PictureInPictureDetailsTest.java
@@ -16,6 +16,12 @@
 
 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;
@@ -31,11 +37,6 @@ 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.Matchers.eq;
-import static org.mockito.Mockito.verify;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class PictureInPictureDetailsTest {
@@ -82,11 +83,11 @@ public class PictureInPictureDetailsTest {
     @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 87150ac7c86f2603259afcba2e3a0912ff246d8c..30ebcde0c2de9baa4cf4b67df5e13da1208a316f 100644
--- a/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
+++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsAccessTest.java
@@ -16,6 +16,10 @@
 
 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;
@@ -33,10 +37,6 @@ import org.mockito.MockitoAnnotations;
 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 class PremiumSmsAccessTest {
     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 0000000000000000000000000000000000000000..44039910850b8589fb41e7dbbab5a0c65e6cd3a5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.text.TextUtils;
+
+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.ArgumentMatcher;
+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.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+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
+    private PreferenceCategory mDivider;
+    @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(mScreen.findPreference(RecentAppsPreferenceController.KEY_DIVIDER))
+                .thenReturn(mDivider);
+        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).containsAllOf(mController.getPreferenceKey(),
+                RecentAppsPreferenceController.KEY_DIVIDER);
+    }
+
+    @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);
+        verify(mDivider).setVisible(false);
+    }
+
+    @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);
+        when(mMockContext.getString(eq(R.string.battery_history_minutes_no_seconds), anyInt()))
+            .thenReturn(mContext.getString(R.string.battery_history_minutes_no_seconds, 45));
+
+        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);
+        verify(mDivider).setVisible(true);
+    }
+
+    @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);
+    }
+
+    @Test
+    public void display_showRecents_formatSummary() {
+        when(mMockContext.getResources().getBoolean(R.bool.config_display_recent_apps))
+            .thenReturn(true);
+        final List<UsageStats> stats = new ArrayList<>();
+        final UsageStats stat1 = new UsageStats();
+        stat1.mLastTimeUsed = System.currentTimeMillis();
+        stat1.mPackageName = "pkg.class";
+        stats.add(stat1);
+
+        when(mAppState.getEntry(stat1.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);
+        when(mMockContext.getString(eq(R.string.battery_history_minutes_no_seconds), anyInt()))
+            .thenReturn(mContext.getString(R.string.battery_history_minutes_no_seconds, 35));
+        when(mMockContext.getResources().getText(eq(R.string.recent_app_summary)))
+            .thenReturn(mContext.getResources().getText(R.string.recent_app_summary));
+
+        mController = new RecentAppsPreferenceController(mMockContext, mAppState, null);
+        mController.displayPreference(mScreen);
+
+        verify(mCategory).addPreference(argThat(summaryMatches("35m ago")));
+    }
+
+    private static ArgumentMatcher<Preference> summaryMatches(String expected) {
+        return preference -> TextUtils.equals(expected, preference.getSummary());
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
index 8c62e23bd78bd1730dd3a8e2397a675b179721a9..07acb13de0233d6c27be78994bf3be920adefbbd 100644
--- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
@@ -16,6 +16,10 @@
 
 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 android.os.RemoteException;
 
@@ -33,10 +37,6 @@ import org.mockito.MockitoAnnotations;
 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 {
@@ -59,11 +59,11 @@ public class UsageAccessDetailsTest {
     @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 a5919b6a37d7d9d9dfdf5b9f67c307ab22524457..d2f1bbddefbc146fb614e978e583963b324ebe70 100644
--- a/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/VrListenerSettingsTest.java
@@ -16,6 +16,10 @@
 
 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;
@@ -31,10 +35,6 @@ import org.mockito.Mock;
 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 @@ public class VrListenerSettingsTest {
     @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 08b322f755f73950fbd67e6516a36894ed7baa70..a995394d0311b07969cb65b8e2aeec684243f0d1 100644
--- a/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/WriteSettingsDetailsTest.java
@@ -16,6 +16,10 @@
 
 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;
@@ -31,10 +35,6 @@ import org.mockito.Mock;
 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 @@ public class WriteSettingsDetailsTest {
     @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 b788d1e5f06640d405db31617d7fee1bb1baf1a8..6c8ad9ba82766cb3b0f876c14ccf12ca9d9f6006 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
@@ -24,7 +24,7 @@ import android.support.v7.preference.TwoStatePreference;
 
 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 fcb24d43af8360a07408017fcdea2219e7b19399..7fa11cf84181670dad538e9a5893dd2237c1ffd2 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -25,8 +25,8 @@ import android.support.v7.preference.TwoStatePreference;
 
 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/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
index fcb02b70798fc724671289a9b32c62691e9cd60b..66ec80a26c8602114f4683733af36dc59e81168d 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.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 org.robolectric.annotation.Config;
 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 @@ public class DefaultAppPickerFragmentTest {
     @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 @@ public class DefaultAppPickerFragmentTest {
 
     @Test
     public void clickPreference_hasConfirmation_shouldShowConfirmation() {
+        mFragment.onAttach((Context) mActivity);
         final RadioButtonPreference pref =
                 new RadioButtonPreference(RuntimeEnvironment.application);
         pref.setKey("TEST");
@@ -78,6 +86,17 @@ public class DefaultAppPickerFragmentTest {
         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/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
index cae41f0e37bf8e59f80931a724bb1602b5a94259..d7e5192b87c73ad19ddc3637ff9b53524e0a84df 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications.defaultapps;
 
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
@@ -84,4 +85,33 @@ public class DefaultHomePreferenceControllerTest {
 
         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/instantapps/InstantAppButtonsControllerTest.java b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
index 585118d24fd1e211039d41522bde9d5a1e5b3c24..9e190b56e49d34c25c10f12efae38558e6ce6ddb 100644
--- a/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/instantapps/InstantAppButtonsControllerTest.java
@@ -57,7 +57,6 @@ import org.mockito.Answers;
 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/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
index 9c47f3bd5acf82ae0a61118c364cf869abd78b29..69c8a0385f2bd3b17ce58aa793d7a7cf37e4139a 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
@@ -50,7 +50,6 @@ import org.robolectric.annotation.Implements;
 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/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..fd46b4b37270f68272341e209290e41b8b592cc2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.eq;
+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.bluetooth.BluetoothAdapter;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AlwaysDiscoverableTest {
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+
+    @Mock
+    private Context mContext;
+
+    private AlwaysDiscoverable mAlwaysDiscoverable;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mAlwaysDiscoverable = new AlwaysDiscoverable(mContext, mLocalAdapter);
+    }
+
+    @Test
+    public void isStartedWithoutStart() {
+        assertThat(mAlwaysDiscoverable.mStarted).isFalse();
+    }
+
+    @Test
+    public void isStartedWithStart() {
+        mAlwaysDiscoverable.start();
+        assertThat(mAlwaysDiscoverable.mStarted).isTrue();
+    }
+
+    @Test
+    public void isStartedWithStartStop() {
+        mAlwaysDiscoverable.start();
+        mAlwaysDiscoverable.stop();
+        assertThat(mAlwaysDiscoverable.mStarted).isFalse();
+    }
+
+    @Test
+    public void stopWithoutStart() {
+        mAlwaysDiscoverable.stop();
+        // expect no crash
+        verify(mLocalAdapter, never()).setScanMode(anyInt());
+    }
+
+    @Test
+    public void startSetsModeAndRegistersReceiver() {
+        when(mLocalAdapter.getScanMode()).thenReturn(BluetoothAdapter.SCAN_MODE_NONE);
+        mAlwaysDiscoverable.start();
+        verify(mLocalAdapter).setScanMode(eq(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE));
+        verify(mContext).registerReceiver(eq(mAlwaysDiscoverable), any());
+    }
+
+    @Test
+    public void stopUnregistersReceiver() {
+        mAlwaysDiscoverable.start();
+        mAlwaysDiscoverable.stop();
+        verify(mContext).unregisterReceiver(mAlwaysDiscoverable);
+    }
+
+    @Test
+    public void resetsToDiscoverableModeWhenScanModeChanges() {
+        mAlwaysDiscoverable.start();
+        verify(mLocalAdapter, times(1)).setScanMode(
+                BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+
+        sendScanModeChangedIntent(BluetoothAdapter.SCAN_MODE_CONNECTABLE,
+                BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+
+        verify(mLocalAdapter, times(2)).setScanMode(
+                BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+    }
+
+    private void sendScanModeChangedIntent(int newMode, int previousMode) {
+        when(mLocalAdapter.getScanMode()).thenReturn(newMode);
+        Intent intent = new Intent(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
+        intent.putExtra(BluetoothAdapter.EXTRA_SCAN_MODE, newMode);
+        intent.putExtra(BluetoothAdapter.EXTRA_PREVIOUS_SCAN_MODE, previousMode);
+        mAlwaysDiscoverable.onReceive(mContext, intent);
+    }
+}
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 0000000000000000000000000000000000000000..7af2b85195332429247b028630943c396b1f8ea7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.anyString;
+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.FragmentManager;
+import android.app.FragmentTransaction;
+import android.widget.Button;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+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 forgetDialog() {
+        showScreen(mController);
+        FragmentManager fragmentManager = mock(FragmentManager.class);
+        when(mFragment.getFragmentManager()).thenReturn(fragmentManager);
+        FragmentTransaction ft = mock(FragmentTransaction.class);
+        when(fragmentManager.beginTransaction()).thenReturn(ft);
+        mRightButton.callOnClick();
+
+        ArgumentCaptor<ForgetDeviceDialogFragment> dialogCaptor =
+                ArgumentCaptor.forClass(ForgetDeviceDialogFragment.class);
+        verify(ft).add(dialogCaptor.capture(), anyString());
+
+        ForgetDeviceDialogFragment dialogFragment = dialogCaptor.getValue();
+        assertThat(dialogFragment).isNotNull();
+    }
+
+    @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 0000000000000000000000000000000000000000..240ece1f9d739694e870438d34a0ed90e3810143
--- /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 0000000000000000000000000000000000000000..3b8db0465791debb9069d417761025646ae5cf29
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.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.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 String 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(String connectionSummary) {
+            this.connectionSummary = connectionSummary;
+            return this;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public String getAddress() {
+            return address;
+        }
+
+        public int getMajorDeviceClass() {
+            return majorDeviceClass;
+        }
+
+        public boolean isConnected() {
+            return connected;
+        }
+
+        public String getConnectionSummary() {
+            return connectionSummary;
+        }
+    }
+
+    protected DeviceConfig makeDefaultDeviceConfig() {
+        return new DeviceConfig()
+                .setName("Mock Device")
+                .setAddress("B4:B0:34:B5:3B:1B")
+                .setMajorDeviceClass(BluetoothClass.Device.Major.AUDIO_VIDEO)
+                .setConnected(true)
+                .setConnectionSummary(mContext.getString(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(config.getAddress());
+        when(mCachedDevice.getDevice()).thenReturn(mDevice);
+        when(mCachedDevice.getAddress()).thenReturn(config.getAddress());
+    }
+
+    /**
+     * 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 0000000000000000000000000000000000000000..27c1a83c287f31d416e2ed1d1897cba2fe905c25
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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 com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+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 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;
+
+@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 LayoutPreference 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 LayoutPreference(mContext, R.layout.settings_entity_header);
+        mPreference.setKey(mController.getPreferenceKey());
+        mScreen.addPreference(mPreference);
+        setupDevice(mDeviceConfig);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEntityHeaderController.reset();
+    }
+
+    /**
+     * Test to verify the current test context object works so that we are not checking null
+     * against null
+     */
+    @Test
+    public void testContextMock() {
+        assertThat(mContext.getString(R.string.bluetooth_connected)).isEqualTo("Connected");
+    }
+
+    @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, true);
+    }
+
+    @Test
+    public void connectionStatusChangesWhileScreenOpen() {
+        InOrder inOrder = inOrder(mHeaderController);
+        when(mCachedDevice.getConnectionSummary()).thenReturn(
+                mContext.getString(R.string.bluetooth_connected));
+        showScreen(mController);
+        inOrder.verify(mHeaderController).setSummary(
+                mContext.getString(R.string.bluetooth_connected));
+
+        when(mCachedDevice.getConnectionSummary()).thenReturn(null);
+        mController.onDeviceAttributesChanged();
+        inOrder.verify(mHeaderController).setSummary((CharSequence) null);
+
+        when(mCachedDevice.getConnectionSummary()).thenReturn(
+                mContext.getString(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 0000000000000000000000000000000000000000..24b28a19e83c1015d38d793a3570f0a00113cd27
--- /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 0000000000000000000000000000000000000000..445e4e37417655ce82f343c8cd86f3dbb2f4ac3a
--- /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(null));
+        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/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..544b5903c9c7102453450f25c7de78a354a47e10
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.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.bluetooth;
+
+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.mock;
+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.os.Bundle;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.fakes.RoboMenu;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BluetoothDeviceDetailsFragmentTest {
+    private BluetoothDeviceDetailsFragment mFragment;
+    private Context mContext;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private CachedBluetoothDevice mCachedDevice;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private LocalBluetoothManager mLocalManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        FakeFeatureFactory.setupForTest(mContext);
+
+        String deviceAddress = "55:66:77:88:99:AA";
+        mFragment = spy(BluetoothDeviceDetailsFragment.newInstance(deviceAddress));
+        doReturn(mLocalManager).when(mFragment).getLocalBluetoothManager(any());
+        doReturn(mCachedDevice).when(mFragment).getCachedDevice(any());
+
+        when(mCachedDevice.getAddress()).thenReturn(deviceAddress);
+        Bundle args = new Bundle();
+        args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS, deviceAddress);
+        mFragment.setArguments(args);
+        mFragment.onAttach(mContext);
+    }
+
+    @Test
+    public void renameControlGetsAdded() {
+        RoboMenu menu = new RoboMenu(mContext);
+        MenuInflater inflater = new MenuInflater(mContext);
+        mFragment.onCreateOptionsMenu(menu, inflater);
+        MenuItem item = menu.getItem(0);
+        assertThat(item.getTitle()).isEqualTo(mContext.getString(R.string.bluetooth_rename_button));
+        assertThat(item.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_mode_edit));
+    }
+
+    @Test
+    public void renameControlClicked() {
+        RoboMenu menu = new RoboMenu(mContext);
+        MenuInflater inflater = new MenuInflater(mContext);
+        mFragment.onCreateOptionsMenu(menu, inflater);
+        MenuItem item = menu.getItem(0);
+        assertThat(item.getItemId()).isEqualTo(
+                BluetoothDeviceDetailsFragment.EDIT_DEVICE_NAME_ITEM_ID);
+
+        FragmentManager fragmentManager = mock(FragmentManager.class);
+        when(mFragment.getFragmentManager()).thenReturn(fragmentManager);
+        FragmentTransaction ft = mock(FragmentTransaction.class);
+        when(fragmentManager.beginTransaction()).thenReturn(ft);
+
+        ArgumentCaptor<Fragment> captor = ArgumentCaptor.forClass(Fragment.class);
+        mFragment.onOptionsItemSelected(item);
+        verify(ft).add(captor.capture(), eq(RemoteDeviceNameDialogFragment.TAG));
+        RemoteDeviceNameDialogFragment dialog = (RemoteDeviceNameDialogFragment) captor.getValue();
+        assertThat(dialog).isNotNull();
+    }
+}
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 0000000000000000000000000000000000000000..0aeff2d730850898f48486ed6be76b2da8e0c9a8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.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 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 static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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;
+
+@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
+    private LocalBluetoothAdapter mLocalAdapter;
+    @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, mLocalAdapter);
+    }
+
+    @Test
+    public void testUpdateDeviceName_showSummaryWithDeviceName() {
+        mController.updateDeviceName(mPreference, DEVICE_NAME);
+
+        final CharSequence summary = mPreference.getSummary();
+        assertThat(summary.toString())
+                .isEqualTo("Visible as 'Nightshade' to other devices");
+        assertThat(mPreference.isSelectable()).isFalse();
+    }
+
+    @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);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index 8a651a726e0054acc0f1e9d57722db9fc4dad61d..d60571c0f0339ea146fdbecb81b63e83a9729388 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -15,6 +15,7 @@
  */
 package com.android.settings.bluetooth;
 
+import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.os.UserManager;
@@ -136,4 +137,13 @@ public class BluetoothDevicePreferenceTest {
 
         assertThat(mPreference.shouldHideSecondTarget()).isFalse();
     }
+
+    @Test
+    public void imagingDeviceIcon_isICSettingsPrint() {
+        when(mCachedBluetoothDevice.getBtClass()).thenReturn(
+                new BluetoothClass(BluetoothClass.Device.Major.IMAGING));
+        mPreference.onDeviceAttributesChanged();
+        assertThat(mPreference.getIcon()).isEqualTo(
+                mContext.getDrawable(R.drawable.ic_settings_print));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..cde95cd5b169e3934cdc57c0cee26ef2113813fc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.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.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.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Fragment;
+import android.app.FragmentTransaction;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
+
+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 BluetoothDeviceRenamePreferenceControllerTest {
+
+    private static final String DEVICE_NAME = "Nightshade";
+
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Fragment mFragment;
+    @Mock
+    private FragmentTransaction mFragmentTransaction;
+    @Mock
+    private PreferenceScreen mScreen;
+    private Context mContext;
+    private Preference mPreference;
+    private BluetoothDeviceRenamePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        mPreference = new Preference(mContext);
+        mPreference.setKey(BluetoothDeviceRenamePreferenceController.PREF_KEY);
+
+        mController = new BluetoothDeviceRenamePreferenceController(
+                mContext, mFragment, mLocalAdapter);
+    }
+
+    @Test
+    public void testUpdateDeviceName_showSummaryWithDeviceName() {
+        mController.updateDeviceName(mPreference, DEVICE_NAME);
+
+        final CharSequence summary = mPreference.getSummary();
+
+        assertThat(summary.toString()).isEqualTo(DEVICE_NAME);
+    }
+
+    @Test
+    public void testHandlePreferenceTreeClick_startDialogFragment() {
+        when(mFragment.getFragmentManager().beginTransaction()).thenReturn(mFragmentTransaction);
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mFragmentTransaction).add(any(), anyString());
+        verify(mFragmentTransaction).commit();
+    }
+
+    @Test
+    public void displayPreference_shouldFindPreferenceWithMatchingPrefKey() {
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mController.mPreference.getKey()).isEqualTo(mController.getPreferenceKey());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
index d2df35a1a5681a1ffcbc9879a8dfa4ea45c25d2c..2d64396bb8c7a911d47c2f9fb2cf884357e5e581 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
@@ -41,7 +41,6 @@ import static org.mockito.Matchers.any;
 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/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..7713aaf8fb1cf05fe5f632920225c22e3c3ab3c3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.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 static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.preference.Preference;
+import android.text.TextUtils;
+
+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;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BluetoothFilesPreferenceControllerTest {
+    private Context mContext;
+    private BluetoothFilesPreferenceController mController;
+    private Preference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mController = new BluetoothFilesPreferenceController(mContext);
+        mPreference = new Preference(mContext);
+        mPreference.setKey(BluetoothFilesPreferenceController.KEY_RECEIVED_FILES);
+    }
+
+    @Test
+    public void testHandlePreferenceTreeClick_sendBroadcast() {
+        mController.handlePreferenceTreeClick(mPreference);
+
+        final Intent intent = ShadowApplication.getInstance().getNextStartedActivity();
+        assertThat(intent).isNotNull();
+        assertThat(intent.getAction()).isEqualTo(
+                BluetoothFilesPreferenceController.ACTION_OPEN_FILES);
+
+        final Bundle bundle = intent.getExtras();
+        assertThat(bundle.getInt(BluetoothFilesPreferenceController.EXTRA_DIRECTION)).isEqualTo(1);
+        assertThat(bundle.getBoolean(
+                BluetoothFilesPreferenceController.EXTRA_SHOW_ALL_FILES)).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
index a1b5f2b9eb16a43aebb9fa343933ba83b5a6f062..9634661c9befb8d97ece27cc0042d6744c1ba20d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothMasterSwitchPreferenceControllerTest.java
@@ -16,12 +16,16 @@
 
 package com.android.settings.bluetooth;
 
+import android.app.Fragment;
 import android.content.Context;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 
+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.testutils.FakeFeatureFactory;
 import com.android.settings.widget.MasterSwitchPreference;
 import com.android.settingslib.bluetooth.BluetoothCallback;
 import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -36,7 +40,10 @@ 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.eq;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -52,17 +59,26 @@ public class BluetoothMasterSwitchPreferenceControllerTest {
     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
@@ -82,7 +98,7 @@ public class BluetoothMasterSwitchPreferenceControllerTest {
         mController.onPause();
 
         verify(mBluetoothManager.getEventManager()).unregisterCallback(
-            any(BluetoothCallback.class));
+                any(BluetoothCallback.class));
     }
 
     @Test
@@ -111,5 +127,4 @@ public class BluetoothMasterSwitchPreferenceControllerTest {
 
         verify(mPreference).setSummary("test summary");
     }
-
 }
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 0000000000000000000000000000000000000000..d1d493544030058e2a5ca760763f06218e1132b3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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;
+        mFragment.mAlwaysDiscoverable = new AlwaysDiscoverable(mContext, mLocalAdapter);
+    }
+
+    @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 243f1dbea6127defdf8587862619f34172fa4985..7a6ae79e2f9e34e2b141e034bb17898c9b4997ec 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -15,17 +15,31 @@
  */
 package com.android.settings.bluetooth;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.app.AlertDialog;
 import android.content.Context;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.CheckBox;
 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.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -36,16 +50,9 @@ import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.FragmentTestUtil;
 
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doNothing;
-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)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows=ShadowEventLogWriter.class)
 public class BluetoothPairingDialogTest {
 
     private static final String FILLER = "text that goes in a view";
@@ -130,12 +137,24 @@ public class BluetoothPairingDialogTest {
         when(controller.getDeviceVariantMessageHintId())
                 .thenReturn(BluetoothPairingController.INVALID_DIALOG_TYPE);
 
+        Context context = spy(ShadowApplication.getInstance().getApplicationContext());
+        InputMethodManager imm = mock(InputMethodManager.class);
+        doReturn(imm).when(context).getSystemService(Context.INPUT_METHOD_SERVICE);
+
         // build the fragment
-        BluetoothPairingDialogFragment frag = makeFragment();
+        BluetoothPairingDialogFragment frag = spy(new BluetoothPairingDialogFragment());
+        when(frag.getContext()).thenReturn(context);
+        setupFragment(frag);
+        AlertDialog alertDialog = frag.getmDialog();
 
         // check that the pin/passkey input field is visible to the user
-        View view = frag.getmDialog().findViewById(R.id.text);
+        View view = alertDialog.findViewById(R.id.text);
         assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
+
+        // check that showSoftInput was called to make input method appear when the dialog was shown
+        assertThat(view.isFocused()).isTrue();
+        assertThat(imm.isActive());
+        verify(imm).showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
     }
 
     @Test
@@ -393,8 +412,7 @@ public class BluetoothPairingDialogTest {
         verify(dialogActivity, times(1)).dismiss();
     }
 
-    private BluetoothPairingDialogFragment makeFragment() {
-        BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
+    private void setupFragment(BluetoothPairingDialogFragment frag) {
         assertThat(frag.isPairingControllerSet()).isFalse();
         frag.setPairingController(controller);
         assertThat(frag.isPairingDialogActivitySet()).isFalse();
@@ -403,6 +421,11 @@ public class BluetoothPairingDialogTest {
         assertThat(frag.getmDialog()).isNotNull();
         assertThat(frag.isPairingControllerSet()).isTrue();
         assertThat(frag.isPairingDialogActivitySet()).isTrue();
+    }
+
+    private BluetoothPairingDialogFragment makeFragment() {
+        BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
+        setupFragment(frag);
         return frag;
     }
 }
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 0000000000000000000000000000000000000000..4459f6197e489b7eb3678ed0cd6a9f6d729f9e7f
--- /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/BluetoothSettingsSummaryProviderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
index 10ae8f86ad071f8eedfce98340760827269c24bf..0061ee52ea1ca577be9a711be876ac5d9aae2293 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSettingsSummaryProviderTest.java
@@ -33,7 +33,6 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 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 9c746185559688bf0e4fef41f0bbd0545a4338d7..c772560d717499d9621041b6457e16b1c83cd736 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 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 ad2bc3da85bdd56e682176fcfb13390a167cb97e..e3f00d807b62bf2a6250030c711504aaf0ac54d5 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
@@ -44,9 +44,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static org.mockito.Matchers.anyString;
+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.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -133,6 +135,36 @@ public class BluetoothSummaryUpdaterTest {
                 mContext.getString(R.string.disconnected));
     }
 
+    @Test
+    public void onBluetoothStateChanged_ConnectedDisabledEnabled_shouldSendDisconnectedSummary() {
+        final boolean[] connected = {false};
+        final List<CachedBluetoothDevice> devices = new ArrayList<>();
+        devices.add(mock(CachedBluetoothDevice.class));
+        doAnswer(invocation -> connected[0]).when(devices.get(0)).isConnected();
+        when(mBluetoothManager.getCachedDeviceManager().getCachedDevicesCopy())
+                .thenReturn(devices);
+        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_DISCONNECTED);
+        prepareConnectedDevice(false);
+
+        mSummaryUpdater.register(true);
+        verify(mListener).onSummaryChanged(mContext.getString(R.string.disconnected));
+
+        connected[0] = true;
+        when(mBtAdapter.getConnectionState()).thenReturn(BluetoothAdapter.STATE_CONNECTED);
+        mSummaryUpdater.onConnectionStateChanged(null /* device */,
+                BluetoothAdapter.STATE_CONNECTED);
+        verify(mListener).onSummaryChanged(
+                mContext.getString(R.string.bluetooth_connected_summary, DEVICE_NAME));
+
+        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_OFF);
+        verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disabled));
+
+        connected[0] = false;
+        mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_TURNING_ON);
+        verify(mListener, times(2)).onSummaryChanged(mContext.getString(R.string.disconnected));
+        verify(mListener, times(4)).onSummaryChanged(anyString());
+    }
+
     @Test
     public void onConnectionStateChanged_connected_shouldSendConnectedMessage() {
         final List<CachedBluetoothDevice> devices = new ArrayList<>();
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 0000000000000000000000000000000000000000..c205c5023d6dec69fb4b6bb75f4944edbf460ba3
--- /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/DevicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3294ffd04057ac07f118f4508c1ff382577daa39
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/DevicePickerFragmentTest.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 static org.mockito.Mockito.verify;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class DevicePickerFragmentTest {
+    @Mock
+    private LocalBluetoothAdapter mLocalAdapter;
+    @Mock
+    private BluetoothProgressCategory mAvailableDevicesCategory;
+    private DevicePickerFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mFragment = new DevicePickerFragment();
+
+        mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
+    }
+
+    @Test
+    public void testScanningStateChanged_started_setProgressStarted() {
+        mFragment.mScanEnabled = true;
+
+        mFragment.onScanningStateChanged(true);
+
+        verify(mAvailableDevicesCategory).setProgress(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..21bc868ed4928c589fd06d03877af3ff902012c4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowDialog;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class ForgetDeviceDialogFragmentTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private CachedBluetoothDevice mCachedDevice;
+
+    private ForgetDeviceDialogFragment mFragment;
+    private Context mContext;
+    private Activity mActivity;
+    private AlertDialog mDialog;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        FakeFeatureFactory.setupForTest(mContext);
+        String deviceAddress = "55:66:77:88:99:AA";
+        when(mCachedDevice.getAddress()).thenReturn(deviceAddress);
+        mFragment = spy(ForgetDeviceDialogFragment.newInstance(deviceAddress));
+        doReturn(mCachedDevice).when(mFragment).getDevice(any());
+        mActivity = Robolectric.setupActivity(Activity.class);
+        mActivity.getFragmentManager().beginTransaction().add(mFragment, null).commit();
+        mDialog = (AlertDialog) ShadowDialog.getLatestDialog();
+    }
+
+    @Test
+    public void cancelDialog() {
+        mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).performClick();
+        verify(mCachedDevice, never()).unpair();
+        assertThat(mActivity.isFinishing()).isFalse();
+    }
+
+    @Test
+    public void confirmDialog() {
+        mDialog.getButton(AlertDialog.BUTTON_POSITIVE).performClick();
+        verify(mCachedDevice).unpair();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8ef4e6df5cb8878791f8ca23dca2788378a7a9e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+
+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.ShadowDialog;
+import org.robolectric.util.FragmentTestUtil;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class RemoteDeviceNameDialogFragmentTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private CachedBluetoothDevice mCachedDevice;
+
+    private RemoteDeviceNameDialogFragment mFragment;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        FakeFeatureFactory.setupForTest(mContext);
+
+        String deviceAddress = "55:66:77:88:99:AA";
+        when(mCachedDevice.getAddress()).thenReturn(deviceAddress);
+        mFragment = spy(RemoteDeviceNameDialogFragment.newInstance(mCachedDevice));
+        doReturn(mCachedDevice).when(mFragment).getDevice(any());
+    }
+
+    /**
+     * Helper method to set the mock device's name and show the dialog.
+     *
+     * @param deviceName what name to set
+     * @return the dialog created
+     */
+    AlertDialog startDialog(String deviceName) {
+        when(mCachedDevice.getName()).thenReturn(deviceName);
+        FragmentTestUtil.startFragment(mFragment);
+        return (AlertDialog) ShadowDialog.getLatestDialog();
+    }
+
+    @Test
+    public void deviceNameDisplayIsCorrect() {
+        String deviceName = "ABC Corp Headphones";
+        AlertDialog dialog = startDialog(deviceName);
+        EditText editText = (EditText) dialog.findViewById(R.id.edittext);
+        assertThat(editText.getText().toString()).isEqualTo(deviceName);
+
+        // Make sure that the "rename" button isn't enabled since the text hasn't changed yet, but
+        // the "cancel" button should be enabled.
+        Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        assertThat(positiveButton.isEnabled()).isFalse();
+        Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        assertThat(negativeButton.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void deviceNameEditSucceeds() {
+        String deviceNameInitial = "ABC Corp Headphones";
+        String deviceNameModified = "My Headphones";
+        AlertDialog dialog = startDialog(deviceNameInitial);
+
+        // Before modifying the text the "rename" button should be disabled but the cancel button
+        // should be enabled.
+        Button positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+        Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        assertThat(negativeButton.isEnabled()).isTrue();
+        assertThat(positiveButton.isEnabled()).isFalse();
+
+        // Once we modify the text, the positive button should be clickable, and clicking it should
+        // cause a call to change the name.
+        EditText editText = (EditText) dialog.findViewById(R.id.edittext);
+        editText.setText(deviceNameModified);
+        assertThat(positiveButton.isEnabled()).isTrue();
+        positiveButton.performClick();
+        verify(mCachedDevice).setName(deviceNameModified);
+    }
+
+    @Test
+    public void deviceNameEditThenCancelDoesntRename() {
+        String deviceNameInitial = "ABC Corp Headphones";
+        String deviceNameModified = "My Headphones";
+        AlertDialog dialog = startDialog(deviceNameInitial);
+
+        // Modifying the text but then hitting cancel should not cause the name to change.
+        Button negativeButton = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
+        assertThat(negativeButton.isEnabled()).isTrue();
+        EditText editText = (EditText) dialog.findViewById(R.id.edittext);
+        editText.setText(deviceNameModified);
+        negativeButton.performClick();
+        verify(mCachedDevice, never()).setName(anyString());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java b/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java
deleted file mode 100644
index 1d907914dfd9382680fe883d0f41ba12b78ac4a6..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/conditional/ConditionAdapterUtilsTest.java
+++ /dev/null
@@ -1,72 +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.conditional;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-import com.android.settings.dashboard.DashboardAdapter;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
-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 com.android.settings.R;
-
-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 ConditionAdapterUtilsTest{
-    @Mock
-    private Condition mCondition;
-    private DashboardAdapter.DashboardItemHolder mViewHolder;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        final CharSequence[] actions = new CharSequence[2];
-        when(mCondition.getActions()).thenReturn(actions);
-
-        final View view = LayoutInflater.from(mContext).inflate(R.layout.condition_card, new
-                LinearLayout(mContext), true);
-        mViewHolder = new DashboardAdapter.DashboardItemHolder(view);
-    }
-
-    @Test
-    public void testBindView_isExpanded_returnVisible() {
-        ConditionAdapterUtils.bindViews(mCondition, mViewHolder, true, null, null);
-        assertThat(mViewHolder.itemView.findViewById(R.id.detail_group).getVisibility())
-                .isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void testBindView_isNotExpanded_returnGone() {
-        ConditionAdapterUtils.bindViews(mCondition, mViewHolder, false, null, null);
-        assertThat(mViewHolder.itemView.findViewById(R.id.detail_group).getVisibility())
-                .isEqualTo(View.GONE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 65763ec063034729d23d986ddb12a48936c4f94d..dbeecaa2b939abacbad726d0a8834476e8063607 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -17,11 +17,15 @@ package com.android.settings.connecteddevice;
 
 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.R;
 import com.android.settings.nfc.NfcPreferenceController;
 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;
 
@@ -35,12 +39,17 @@ import org.robolectric.annotation.Config;
 
 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;
 
@@ -64,7 +73,8 @@ public class ConnectedDeviceDashboardFragmentTest {
     @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());
@@ -73,7 +83,8 @@ public class ConnectedDeviceDashboardFragmentTest {
     @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);
@@ -83,7 +94,8 @@ public class ConnectedDeviceDashboardFragmentTest {
     @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);
@@ -102,4 +114,43 @@ public class ConnectedDeviceDashboardFragmentTest {
 
         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 d1af70c460f216df5b9f0ec3facaeee014e9d5d0..7edde6e064bace9702a3863f6671578433ded2c0 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/UsbModePreferenceControllerTest.java
@@ -23,8 +23,6 @@ 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.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 9f182a912ee04df4031bfdc37ff85b9bc16dc8b3..9bf73cea278850da50eed24c60dadbfa35b11aa5 100644
--- a/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/DynamicAvailabilityPreferenceControllerTest.java
@@ -22,7 +22,7 @@ import android.support.v7.preference.PreferenceScreen;
 
 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/core/codeinspection/CodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
index 2f786f8acf40c4a07d87f757e859030877383f5a..91046fe51d0eb3b3ffcb891cc457b91a540e2437 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.io.InputStreamReader;
 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 class CodeInspector {
      */
     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 @@ public abstract class CodeInspector {
         }
         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 ed4e50c7b722c2f6367922c0c60cd79e62d35675..4455549db12b7034f2dc487411174d48f7d0eb15 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 @@ public class InstrumentableFragmentCodeInspector extends CodeInspector {
             }
             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 @@ public class InstrumentableFragmentCodeInspector extends CodeInspector {
         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/SharedPreferenceLoggerTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
index f89b381e9730ade85802b47c4218f0a353c56821..ec644a6cfdea91f5aac494580e36572b9fcb384c 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/SharedPreferenceLoggerTest.java
@@ -23,16 +23,29 @@ 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 @@ public class SharedPreferenceLoggerTest {
     @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 @@ public class SharedPreferenceLoggerTest {
         mMetricsFeature = mFactory.metricsFeatureProvider;
 
         mSharedPrefLogger = new SharedPreferencesLogger(mContext, TEST_TAG);
+        mNamePairMatcher = pairMatches(FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, String.class);
     }
 
     @Test
@@ -72,7 +87,8 @@ public class SharedPreferenceLoggerTest {
         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 @@ public class SharedPreferenceLoggerTest {
         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 @@ public class SharedPreferenceLoggerTest {
         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 @@ public class SharedPreferenceLoggerTest {
         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 81b244df8a84c742ebd36e055d3b791feb5fbd66..1a47a66f25ee2ee2953a3f494ec8fa46b2dd5f32 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/VisibilityLoggerMixinTest.java
@@ -15,6 +15,17 @@
  */
 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;
@@ -31,16 +42,6 @@ import org.mockito.Mock;
 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 @@ public class VisibilityLoggerMixinTest {
         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 @@ public class VisibilityLoggerMixinTest {
         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 @@ public class VisibilityLoggerMixinTest {
         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 @@ public class VisibilityLoggerMixinTest {
         mMixin.onPause();
 
         verify(mMetricsFeature, never())
-                .hidden(any(Context.class), anyInt());
+                .hidden(nullable(Context.class), anyInt());
     }
 
     @Test
@@ -107,7 +108,7 @@ public class VisibilityLoggerMixinTest {
         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 12dc9bb0305891b416a14042f20c9e8a2462473b..0000000000000000000000000000000000000000
--- 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.testutils.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 ab15451785198da69cf5775967dbe00ba2e40a6a..4d81320a9f7f540b8e2afc84f239f8a9a1fdf7d1 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
@@ -15,20 +15,45 @@
  */
 package com.android.settings.dashboard;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Icon;
+import android.os.Bundle;
+import android.support.v7.widget.RecyclerView;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.conditional.Condition;
+import com.android.settings.dashboard.conditional.ConditionAdapter;
+import com.android.settings.dashboard.suggestions.SuggestionAdapter;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 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;
@@ -43,14 +68,9 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 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 +82,7 @@ import static org.mockito.Mockito.when;
 public class DashboardAdapterTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
+    private SettingsActivity mContext;
     @Mock
     private View mView;
     @Mock
@@ -75,14 +95,16 @@ public class DashboardAdapterTest {
     private ArgumentCaptor<String> mActionPackageCaptor = ArgumentCaptor.forClass(String.class);
     private FakeFeatureFactory mFactory;
     private DashboardAdapter mDashboardAdapter;
-    private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
-    private DashboardData.SuggestionHeaderData mSuggestionHeaderData;
+    private DashboardAdapter.SuggestionAndConditionHeaderHolder mSuggestionHolder;
+    private DashboardData.SuggestionConditionHeaderData mSuggestionHeaderData;
+    private List<Condition> mConditionList;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        when(mFactory.dashboardFeatureProvider.shouldTintIcon()).thenReturn(true);
         when(mFactory.suggestionsFeatureProvider
                 .getSuggestionIdentifier(any(Context.class), any(Tile.class)))
                 .thenAnswer(invocation -> {
@@ -94,22 +116,17 @@ public class DashboardAdapterTest {
         when(mResources.getQuantityString(any(int.class), any(int.class), any()))
                 .thenReturn("");
 
-        mDashboardAdapter = new DashboardAdapter(mContext, null, null);
-        mSuggestionHeaderData = new DashboardData.SuggestionHeaderData(true, 1, 0);
+        mConditionList = new ArrayList<>();
+        mConditionList.add(mCondition);
+        when(mCondition.shouldShow()).thenReturn(true);
+        mDashboardAdapter = new DashboardAdapter(mContext, null, mConditionList, null, null);
+        mSuggestionHeaderData = new DashboardData.SuggestionConditionHeaderData(mConditionList, 1);
         when(mView.getTag()).thenReturn(mCondition);
     }
 
-    @Test
-    public void testSetConditions_AfterSetConditions_ExpandedConditionNull() {
-        mDashboardAdapter.onExpandClick(mView);
-        assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isEqualTo(mCondition);
-        mDashboardAdapter.setConditions(null);
-        assertThat(mDashboardAdapter.mDashboardData.getExpandedCondition()).isNull();
-    }
-
     @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 +141,7 @@ public class DashboardAdapterTest {
 
     @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,9 +158,8 @@ public class DashboardAdapterTest {
 
     @Test
     public void testSuggestionsLogs_Expanded() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
-        mDashboardAdapter.onBindSuggestionHeader(
-                mSuggestionHolder, mSuggestionHeaderData);
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         verify(mFactory.metricsFeatureProvider, times(3)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
@@ -160,9 +176,8 @@ public class DashboardAdapterTest {
 
     @Test
     public void testSuggestionsLogs_ExpandedAndPaused() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
-        mDashboardAdapter.onBindSuggestionHeader(
-                mSuggestionHolder, mSuggestionHeaderData);
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         mDashboardAdapter.onPause();
         verify(mFactory.metricsFeatureProvider, times(6)).action(
@@ -183,10 +198,9 @@ public class DashboardAdapterTest {
 
     @Test
     public void testSuggestionsLogs_ExpandedAfterPause() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
         mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionHeader(
-                mSuggestionHolder, mSuggestionHeaderData);
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         verify(mFactory.metricsFeatureProvider, times(7)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
@@ -208,10 +222,9 @@ public class DashboardAdapterTest {
 
     @Test
     public void testSuggestionsLogs_ExpandedAfterPauseAndPausedAgain() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1", "pkg2", "pkg3"}));
+        setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3"));
         mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionHeader(
-                mSuggestionHolder, mSuggestionHeaderData);
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         mDashboardAdapter.onPause();
         verify(mFactory.metricsFeatureProvider, times(10)).action(
@@ -237,9 +250,8 @@ public class DashboardAdapterTest {
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShown() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
-        mDashboardAdapter.onBindSuggestionHeader(
-                mSuggestionHolder, mSuggestionHeaderData);
+        setupSuggestions(makeSuggestions("pkg1"));
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         verify(mFactory.metricsFeatureProvider, times(1)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
@@ -254,9 +266,8 @@ public class DashboardAdapterTest {
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAndPaused() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
-        mDashboardAdapter.onBindSuggestionHeader(
-                mSuggestionHolder, mSuggestionHeaderData);
+        setupSuggestions(makeSuggestions("pkg1"));
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         mDashboardAdapter.onPause();
         verify(mFactory.metricsFeatureProvider, times(2)).action(
@@ -273,10 +284,9 @@ public class DashboardAdapterTest {
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPause() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        setupSuggestions(makeSuggestions("pkg1"));
         mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionHeader(
-                mSuggestionHolder, mSuggestionHeaderData);
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         verify(mFactory.metricsFeatureProvider, times(3)).action(
                 any(Context.class), mActionCategoryCaptor.capture(),
@@ -293,10 +303,9 @@ public class DashboardAdapterTest {
 
     @Test
     public void testSuggestionsLogs_ExpandedWithLessThanDefaultShownAfterPauseAndPausedAgain() {
-        setUpSuggestions(makeSuggestions(new String[]{"pkg1"}));
+        setupSuggestions(makeSuggestions("pkg1"));
         mDashboardAdapter.onPause();
-        mDashboardAdapter.onBindSuggestionHeader(
-                mSuggestionHolder, mSuggestionHeaderData);
+        mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
         mSuggestionHolder.itemView.callOnClick();
         mDashboardAdapter.onPause();
         verify(mFactory.metricsFeatureProvider, times(4)).action(
@@ -313,7 +322,162 @@ public class DashboardAdapterTest {
         assertThat(mActionCategoryCaptor.getAllValues().toArray()).isEqualTo(expectedActions);
     }
 
-    private List<Tile> makeSuggestions(String[] pkgNames) {
+    @Test
+    public void testSuggestioDismissed_notOnlySuggestion_updateSuggestionOnly() {
+        final DashboardAdapter adapter =
+                spy(new DashboardAdapter(mContext, null, null, null, null));
+        final List<Tile> suggestions = makeSuggestions("pkg1", "pkg2", "pkg3");
+        adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+
+        final RecyclerView data = mock(RecyclerView.class);
+        when(data.getResources()).thenReturn(mResources);
+        when(data.getContext()).thenReturn(mContext);
+        when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
+        final View itemView = mock(View.class);
+        when(itemView.findViewById(R.id.data)).thenReturn(data);
+        final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
+                new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
+
+        adapter.onBindConditionAndSuggestion(
+                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
+
+        final DashboardData dashboardData = adapter.mDashboardData;
+        reset(adapter); // clear interactions tracking
+
+        final Tile suggestionToRemove = suggestions.get(1);
+        adapter.onSuggestionDismissed(suggestionToRemove);
+
+        assertThat(adapter.mDashboardData).isEqualTo(dashboardData);
+        assertThat(suggestions.size()).isEqualTo(2);
+        assertThat(suggestions.contains(suggestionToRemove)).isFalse();
+        verify(adapter, never()).notifyDashboardDataChanged(any());
+    }
+
+    @Test
+    public void testSuggestionDismissed_moreThanTwoSuggestions_defaultMode_shouldNotCrash() {
+        final RecyclerView data = new RecyclerView(RuntimeEnvironment.application);
+        final View itemView = mock(View.class);
+        when(itemView.findViewById(R.id.data)).thenReturn(data);
+        final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
+                new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
+        final List<Tile> suggestions =
+                makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4");
+        final DashboardAdapter adapter = spy(new DashboardAdapter(mContext, null /*savedInstance */,
+                null /* conditions */, null /* suggestionParser */, null /* callback */));
+        adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+        adapter.onBindConditionAndSuggestion(
+                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
+        // default mode, only displaying 2 suggestions
+
+        adapter.onSuggestionDismissed(suggestions.get(1));
+
+        // verify operations that access the lists will not cause ConcurrentModificationException
+        assertThat(holder.data.getAdapter().getItemCount()).isEqualTo(1);
+        adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+        // should not crash
+    }
+
+    @Test
+    public void testSuggestioDismissed_onlySuggestion_updateDashboardData() {
+        DashboardAdapter adapter =
+                spy(new DashboardAdapter(mContext, null, null, null, null));
+        final List<Tile> suggestions = makeSuggestions("pkg1");
+        adapter.setCategoriesAndSuggestions(new ArrayList<>(), suggestions);
+        final DashboardData dashboardData = adapter.mDashboardData;
+        reset(adapter); // clear interactions tracking
+
+        adapter.onSuggestionDismissed(suggestions.get(0));
+
+        assertThat(adapter.mDashboardData).isNotEqualTo(dashboardData);
+        verify(adapter).notifyDashboardDataChanged(any());
+    }
+
+    @Test
+    public void testSetCategoriesAndSuggestions_iconTinted() {
+        TypedArray mockTypedArray = mock(TypedArray.class);
+        doReturn(mockTypedArray).when(mContext).obtainStyledAttributes(any(int[].class));
+        doReturn(0x89000000).when(mockTypedArray).getColor(anyInt(), anyInt());
+
+        List<Tile> packages = makeSuggestions("pkg1");
+        Icon mockIcon = mock(Icon.class);
+        packages.get(0).isIconTintable = true;
+        packages.get(0).icon = mockIcon;
+
+        mDashboardAdapter.setCategoriesAndSuggestions(Collections.emptyList(), packages);
+
+        verify(mockIcon).setTint(eq(0x89000000));
+    }
+
+    @Test
+    public void testSetCategoriesAndSuggestions_limitSuggestionSize() {
+        List<Tile> packages =
+                makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4", "pkg5", "pkg6", "pkg7");
+        mDashboardAdapter.setCategoriesAndSuggestions(Collections.emptyList(), packages);
+
+        assertThat(mDashboardAdapter.mDashboardData.getSuggestions().size())
+                .isEqualTo(DashboardAdapter.MAX_SUGGESTION_TO_SHOW);
+    }
+
+    @Test
+    public void testBindConditionAndSuggestion_shouldSetSuggestionAdapterAndNoCrash() {
+        mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null);
+        final List<Tile> suggestions = makeSuggestions("pkg1");
+        final List<DashboardCategory> categories = new ArrayList<>();
+        final DashboardCategory category = mock(DashboardCategory.class);
+        final List<Tile> tiles = new ArrayList<>();
+        tiles.add(mock(Tile.class));
+        category.tiles = tiles;
+        mDashboardAdapter.setCategoriesAndSuggestions(categories, suggestions);
+
+        final RecyclerView data = mock(RecyclerView.class);
+        when(data.getResources()).thenReturn(mResources);
+        when(data.getContext()).thenReturn(mContext);
+        when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
+        final View itemView = mock(View.class);
+        when(itemView.findViewById(R.id.data)).thenReturn(data);
+        final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
+                new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
+
+        mDashboardAdapter.onBindConditionAndSuggestion(
+                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
+
+        verify(data).setAdapter(any(SuggestionAdapter.class));
+        // should not crash
+    }
+
+    @Test
+    public void testBindConditionAndSuggestion_emptySuggestion_shouldSetConditionAdapter() {
+        final Bundle savedInstance = new Bundle();
+        savedInstance.putInt(DashboardAdapter.STATE_SUGGESTION_CONDITION_MODE,
+                DashboardData.HEADER_MODE_FULLY_EXPANDED);
+        mDashboardAdapter = new DashboardAdapter(mContext, savedInstance, mConditionList,
+                null /* SuggestionParser */, null /* SuggestionDismissController.Callback */);
+
+        final List<Tile> suggestions = new ArrayList<>();
+        final List<DashboardCategory> categories = new ArrayList<>();
+        final DashboardCategory category = mock(DashboardCategory.class);
+        categories.add(category);
+        final List<Tile> tiles = new ArrayList<>();
+        tiles.add(mock(Tile.class));
+        category.tiles = tiles;
+        mDashboardAdapter.setCategoriesAndSuggestions(categories, suggestions);
+
+        final RecyclerView data = mock(RecyclerView.class);
+        when(data.getResources()).thenReturn(mResources);
+        when(data.getContext()).thenReturn(mContext);
+        when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
+        final View itemView = mock(View.class);
+        when(itemView.findViewById(R.id.data)).thenReturn(data);
+        final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
+                new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
+
+        mDashboardAdapter.onBindConditionAndSuggestion(
+                holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
+
+        verify(data).setAdapter(any(ConditionAdapter.class));
+    }
+
+    private List<Tile> makeSuggestions(String... pkgNames) {
         final List<Tile> suggestions = new ArrayList<>();
         for (String pkgName : pkgNames) {
             Tile suggestion = new Tile();
@@ -324,11 +488,11 @@ public class DashboardAdapterTest {
         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));
+        final Context context = RuntimeEnvironment.application;
+        mSuggestionHolder = new DashboardAdapter.SuggestionAndConditionHeaderHolder(
+                LayoutInflater.from(context).inflate(
+                        R.layout.suggestion_condition_header, new RelativeLayout(context), true));
     }
-
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
index abea5653482e772a78852599d8a9eb46194bbdf1..fdbbefb260626b6fa829efdb8cd448999b737cec 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
@@ -88,17 +88,19 @@ public class DashboardDataTest {
         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)
                 .build();
 
         mDashboardDataWithTwoConditions = new DashboardData.Builder()
                 .setConditions(twoItemsConditions)
                 .setCategories(categories)
                 .setSuggestions(suggestions)
+                .setSuggestionConditionMode(DashboardData.HEADER_MODE_FULLY_EXPANDED)
                 .build();
 
         mDashboardDataWithNoItems = new DashboardData.Builder()
@@ -110,23 +112,28 @@ public class DashboardDataTest {
 
     @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 Object[] expectedObjects = {
+            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) {
-                // SuggestionHeaderData is created inside when build, we can only use isEqualTo
-                assertThat(mDashboardDataWithOneConditions.getItemEntityByPosition(i))
-                        .isEqualTo(expectedObjects[i]);
+            final Object item = mDashboardDataWithOneConditions.getItemEntityByPosition(i);
+            if (item instanceof List) {
+                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 +141,7 @@ public class DashboardDataTest {
     @Test
     public void testGetPositionByEntity_selfInstance_returnPositionFound() {
         final int position = mDashboardDataWithOneConditions
-                .getPositionByEntity(mTestCondition);
+                .getPositionByEntity(mDashboardDataWithOneConditions.getConditions());
         assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
     }
 
@@ -171,16 +178,18 @@ public class DashboardDataTest {
     @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_ResultDataOneChanged() {
         //Build testResultData
         final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
+        // Item in position 2 is the condition container containing the list of conditions, which
+        // gets 1 more item
         testResultData.add(new ListUpdateResult.ResultData(
-                ListUpdateResult.ResultData.TYPE_OPERATION_INSERT, 1, 1));
+            ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 1, 1));
 
         testDiffUtil(mDashboardDataWithOneConditions,
                 mDashboardDataWithTwoConditions, testResultData);
@@ -191,36 +200,11 @@ public class DashboardDataTest {
         //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, 0, 5));
 
         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 +340,11 @@ public class DashboardDataTest {
 
                 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 b8cc17f313347744e1397481d1753ad1db4a66d6..2791da3f6a7bc8239fd988c0d3e78627f3e9b1d1 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.app.Activity;
 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;
@@ -364,4 +365,16 @@ public class DashboardFeatureProviderImplTest {
     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 6b22f7b54494947ad794d8e056566f4d51d69565..d102ab4cd349aedb3456582ed218795b182b4976 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 android.content.Context;
 
 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 9421d5c5c1d370d220f752a75d449a60a60e916f..2d32949512882fb0bc927fa8e1c6d7853c89172b 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -15,6 +15,15 @@
  */
 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;
@@ -43,15 +52,6 @@ import org.robolectric.util.ReflectionHelpers;
 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 @@ public class DashboardFragmentTest {
         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 @@ public class DashboardFragmentTest {
 
     @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 @@ public class DashboardFragmentTest {
         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/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
index 957a2754068d13acae6c4f8a7155df706384481e..32657b8d090f2d640e43209cbff71b7ba72bf785 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
@@ -24,6 +24,7 @@ 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.mockito.MockitoAnnotations;
 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,10 @@ public class DashboardSummaryTest {
         mSummary.onCategoriesChanged();
         verify(mSummary).rebuildUI();
     }
+
+    @Test
+    public void onSuggestionDismissed_shouldNotRebuildUI() {
+        mSummary.onSuggestionDismissed(mock(Tile.class));
+        verify(mSummary, never()).rebuildUI();
+    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
index 2d57d64ca33b58f2572417b008591eb59f7bc69e..6fe60cf5124040eebd98e536458c94b735f989c8 100644
--- a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
@@ -40,9 +40,10 @@ import org.robolectric.util.ReflectionHelpers;
 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 @@ public class ProgressiveDisclosureTest {
 
     @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 @@ public class ProgressiveDisclosureTest {
 
     @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 @@ public class ProgressiveDisclosureTest {
 
     @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 @@ public class ProgressiveDisclosureTest {
 
     @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 @@ public class ProgressiveDisclosureTest {
 
     @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 @@ public class ProgressiveDisclosureTest {
 
         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 @@ public class ProgressiveDisclosureTest {
         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 @@ public class ProgressiveDisclosureTest {
         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 @@ public class ProgressiveDisclosureTest {
         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 @@ public class ProgressiveDisclosureTest {
 
         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/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d943fe3ec7442be1fc999317a4c5cb5bd91f1532
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.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.dashboard.conditional;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+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.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);
+    }
+
+    @Test
+    public void onBindViewHolder_shouldSetListener() {
+        final View view = LayoutInflater.from(mContext).inflate(
+            R.layout.condition_tile, 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 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();
+    }
+
+    @Test
+    public void onSwiped_nullCondition_shouldNotCrash() {
+        final RecyclerView recyclerView = new RecyclerView(mContext);
+        final View view = LayoutInflater.from(mContext).inflate(
+                R.layout.condition_tile, new LinearLayout(mContext), true);
+        final DashboardAdapter.DashboardItemHolder viewHolder =
+                new DashboardAdapter.DashboardItemHolder(view);
+        mConditionAdapter = new ConditionAdapter(
+                mContext, mOneCondition, DashboardData.HEADER_MODE_SUGGESTION_EXPANDED);
+        mConditionAdapter.addDismissHandling(recyclerView);
+
+        // do not bind viewholder to simulate the null condition scenario
+        mConditionAdapter.mSwipeCallback.onSwiped(viewHolder, 0);
+        // no crash
+    }
+
+}
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 0000000000000000000000000000000000000000..bd3650b74a7981cc2429c0589f1b8b35a43480c8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Icon;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ContextThemeWrapper;
+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.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.DashboardAdapter;
+import com.android.settings.testutils.FakeFeatureFactory;
+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.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+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.spy;
+import static org.mockito.Mockito.when;
+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;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private SettingsActivity mActivity;
+
+    private Context mContext;
+    private SuggestionAdapter mSuggestionAdapter;
+    private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
+    private List<Tile> mOneSuggestion;
+    private List<Tile> mTwoSuggestions;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        FakeFeatureFactory.setupForTest(mActivity);
+
+        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);
+    }
+
+    @Test
+    public void onBindViewHolder_shouldSetListener() {
+        final View view = spy(LayoutInflater.from(mContext).inflate(
+            R.layout.suggestion_tile, new LinearLayout(mContext), true));
+        mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
+        mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
+
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+
+        verify(view).setOnClickListener(any(View.OnClickListener.class));
+    }
+
+    @Test
+    public void onBindViewHolder_shouldInflateRemoteView() {
+        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;
+        setupSuggestions(mActivity, packages);
+
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+
+        assertThat(textView.getParent()).isSameAs(mSuggestionHolder.itemView);
+        mSuggestionHolder.itemView.performClick();
+
+        verify(mActivity).startSuggestion(any(Intent.class));
+    }
+
+    @Test
+    public void onBindViewHolder_primaryViewShouldHandleClick() {
+        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;
+        setupSuggestions(mActivity, packages);
+
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+        mSuggestionHolder.itemView.performClick();
+
+        assertThat(ShadowApplication.getInstance().getNextStartedActivity()).isNull();
+        verify(mActivity, never()).startSuggestion(any(Intent.class));
+
+        primary.performClick();
+
+        verify(mActivity).startSuggestion(any(Intent.class));
+    }
+
+    @Test
+    public void onBindViewHolder_viewsShouldClearOnRebind() {
+        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;
+        setupSuggestions(mActivity, packages);
+
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+        mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
+
+        ViewGroup itemView = (ViewGroup) mSuggestionHolder.itemView;
+        assertThat(itemView.getChildCount()).isEqualTo(1);
+    }
+
+    private void setupSuggestions(Context context, List<Tile> suggestions) {
+        mSuggestionAdapter = new SuggestionAdapter(context, suggestions, new ArrayList<>());
+        mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
+                new FrameLayout(RuntimeEnvironment.application),
+                mSuggestionAdapter.getItemViewType(0));
+    }
+
+    private List<Tile> makeSuggestions(String... pkgNames) {
+        final List<Tile> suggestions = new ArrayList<>();
+        for (String pkgName : pkgNames) {
+            Tile suggestion = new Tile();
+            suggestion.intent = new Intent("action");
+            suggestion.intent.setComponent(new ComponentName(pkgName, "cls"));
+            suggestions.add(suggestion);
+            suggestion.icon = mock(Icon.class);
+        }
+        return suggestions;
+    }
+
+}
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 a9ba357e6a643ab558be0f70355881a59d28da0e..ca9faf56d51171df28ed1eefb5c241757d8197b5 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
@@ -16,6 +16,15 @@
 
 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;
@@ -24,8 +33,8 @@ 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.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.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.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 {
@@ -85,10 +86,19 @@ public class SuggestionDismissControllerTest {
                 .isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
     }
 
+    @Test
+    public void getSwipeDirs_isSuggestionTileCard_shouldReturnDirection() {
+        final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
+        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_remote_container);
+
+        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);
+        when(vh.getItemViewType()).thenReturn(R.layout.condition_tile);
 
         assertThat(mController.getSwipeDirs(mRecyclerView, vh))
                 .isEqualTo(0);
@@ -101,7 +111,7 @@ public class SuggestionDismissControllerTest {
         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 c083b87668278eeddc61d1cde4fd3b8210e35766..df25a507cd5d484212477e197c6ddbd358965937 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -16,17 +16,44 @@
 
 package com.android.settings.dashboard.suggestions;
 
+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.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.hardware.fingerprint.FingerprintManager;
 
 import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.R;
+import com.android.settings.Settings.AmbientDisplaySuggestionActivity;
+import com.android.settings.Settings.AmbientDisplayPickupSuggestionActivity;
+import com.android.settings.Settings.DoubleTapPowerSuggestionActivity;
+import com.android.settings.Settings.DoubleTwistSuggestionActivity;
+import com.android.settings.Settings.SwipeToNotificationSuggestionActivity;
 import com.android.settings.TestConfig;
+import com.android.settings.gestures.DoubleTapPowerSettings;
+import com.android.settings.gestures.DoubleTapScreenSettings;
+import com.android.settings.gestures.PickupGestureSettings;
+import com.android.settings.gestures.SwipeToNotificationSettings;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.SuggestionParser;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.drawer.Tile;
-
+import com.android.settingslib.suggestions.SuggestionParser;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,26 +63,25 @@ 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.anyBoolean;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-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 SuggestionFeatureProviderImplTest {
 
+    private static final String DOUBLE_TWIST_SENSOR_NAME = "double_twist_sensor_name";
+    private static final String DOUBLE_TWIST_SENSOR_VENDOR = "double_twist_sensor_vendor";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
     private SuggestionParser mSuggestionParser;
     @Mock
     private Tile mSuggestion;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private FingerprintManager mFingerprintManager;
+    @Mock
+    private SharedPreferences mSharedPreferences;
 
     private FakeFeatureFactory mFactory;
     private SuggestionFeatureProviderImpl mProvider;
@@ -65,13 +91,178 @@ public class SuggestionFeatureProviderImplTest {
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        // Explicit casting to object due to MockitoCast bug
+        when((Object) mContext.getSystemService(FingerprintManager.class))
+                .thenReturn(mFingerprintManager);
         when(mContext.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
+
         mSuggestion.intent = new Intent().setClassName("pkg", "cls");
         mSuggestion.category = "category";
 
         mProvider = new SuggestionFeatureProviderImpl(mContext);
     }
 
+    @Test
+    @Config(shadows = SettingsShadowResources.class)
+    public void isSuggestionCompleted_doubleTapPower_trueWhenNotAvailable() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, false);
+
+        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
+                new ComponentName(RuntimeEnvironment.application,
+                        DoubleTapPowerSuggestionActivity.class))).isTrue();
+    }
+
+    @Test
+    @Config(shadows = SettingsShadowResources.class)
+    public void isSuggestionCompleted_doubleTapPower_falseWhenNotVisited() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
+        // No stored value in shared preferences if not visited yet.
+
+        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
+                new ComponentName(RuntimeEnvironment.application,
+                        DoubleTapPowerSuggestionActivity.class))).isFalse();
+    }
+
+    @Test
+    @Config(shadows = SettingsShadowResources.class)
+    public void isSuggestionCompleted_doubleTapPower_trueWhenVisited() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true);
+        mProvider.getSharedPrefs(RuntimeEnvironment.application).edit().putBoolean(
+                DoubleTapPowerSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+
+        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
+                new ComponentName(RuntimeEnvironment.application,
+                        DoubleTapPowerSuggestionActivity.class))).isTrue();
+    }
+
+    @Test
+    @Config(shadows = SettingsShadowResources.class)
+    public void isSuggestionCompleted_doubleTwist_trueWhenNotAvailable() {
+        SettingsShadowResources.overrideResource(
+                R.string.gesture_double_twist_sensor_name, "nonexistant name");
+        SettingsShadowResources.overrideResource(
+                R.string.gesture_double_twist_sensor_vendor, "nonexistant vendor");
+
+        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
+                new ComponentName(RuntimeEnvironment.application,
+                        DoubleTwistSuggestionActivity.class))).isTrue();
+    }
+
+    @Test
+    @Config(shadows = SettingsShadowResources.class)
+    public void isSuggestionCompleted_ambientDisplay_falseWhenNotVisited() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_dozeComponent, "foo");
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_dozeDoubleTapSensorType, "bar");
+        // No stored value in shared preferences if not visited yet.
+
+        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
+                new ComponentName(RuntimeEnvironment.application,
+                        AmbientDisplaySuggestionActivity.class))).isFalse();
+    }
+
+    @Test
+    @Config(shadows = SettingsShadowResources.class)
+    public void isSuggestionCompleted_ambientDisplay_trueWhenVisited() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_dozeComponent, "foo");
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_dozeDoubleTapSensorType, "bar");
+        mProvider.getSharedPrefs(RuntimeEnvironment.application).edit().putBoolean(
+                DoubleTapScreenSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+
+        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
+                new ComponentName(RuntimeEnvironment.application,
+                        AmbientDisplaySuggestionActivity.class))).isTrue();
+    }
+
+    @Test
+    @Config(shadows = SettingsShadowResources.class)
+    public void isSuggestionCompleted_ambientDisplayPickup_falseWhenNotVisited() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_dozeComponent, "foo");
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_dozePulsePickup, true);
+        // No stored value in shared preferences if not visited yet.
+
+        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
+                new ComponentName(RuntimeEnvironment.application,
+                        AmbientDisplaySuggestionActivity.class))).isFalse();
+    }
+
+    @Test
+    @Config(shadows = SettingsShadowResources.class)
+    public void isSuggestionCompleted_ambientDisplayPickup_trueWhenVisited() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_dozeComponent, "foo");
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_dozePulsePickup, true);
+        mProvider.getSharedPrefs(RuntimeEnvironment.application).edit().putBoolean(
+                PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, true).commit();
+
+        assertThat(mProvider.isSuggestionCompleted(RuntimeEnvironment.application,
+                new ComponentName(RuntimeEnvironment.application,
+                        AmbientDisplayPickupSuggestionActivity.class))).isTrue();
+    }
+
+    @Test
+    public void isSuggestionCompleted_swipeToNotification_trueWhenNotHardwareNotAvailable() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
+        when(mContext.getResources().
+                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
+                .thenReturn(true);
+
+        assertThat(mProvider.isSuggestionCompleted(mContext,
+                new ComponentName(mContext, SwipeToNotificationSuggestionActivity.class))).isTrue();
+    }
+
+    @Test
+    public void isSuggestionCompleted_swipeToNotification_trueWhenNotAvailable() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
+        when(mContext.getResources().
+                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
+                .thenReturn(false);
+
+        assertThat(mProvider.isSuggestionCompleted(mContext,
+                new ComponentName(mContext, SwipeToNotificationSuggestionActivity.class))).isTrue();
+    }
+
+    @Test
+    public void isSuggestionCompleted_swipeToNotification_falseWhenNotVisited() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
+        when(mContext.getResources().
+                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
+                .thenReturn(true);
+        // No stored value in shared preferences if not visited yet.
+
+        assertThat(mProvider.isSuggestionCompleted(mContext,
+                new ComponentName(mContext,
+                        SwipeToNotificationSuggestionActivity.class))).isFalse();
+    }
+
+    @Test
+    public void isSuggestionCompleted_swipeToNotification_trueWhenVisited() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
+        when(mContext.getResources().
+                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
+                .thenReturn(true);
+        when(mContext.getSharedPreferences(anyString(), anyInt())).thenReturn(mSharedPreferences);
+        when(mSharedPreferences.getBoolean(
+                SwipeToNotificationSettings.PREF_KEY_SUGGESTION_COMPLETE, false)).thenReturn(true);
+
+        assertThat(mProvider.isSuggestionCompleted(mContext,
+                new ComponentName(mContext, SwipeToNotificationSuggestionActivity.class))).isTrue();
+    }
+
     @Test
     public void dismissSuggestion_noParserOrSuggestion_noop() {
         mProvider.dismissSuggestion(mContext, null, null);
@@ -107,6 +298,15 @@ public class SuggestionFeatureProviderImplTest {
                 .isNotEmpty();
     }
 
+    @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()))
@@ -120,7 +320,6 @@ public class SuggestionFeatureProviderImplTest {
         verify(mContext, never()).getPackageManager();
     }
 
-
     @Test
     public void dismissSuggestion_noContext_shouldDoNothing() {
         mProvider.dismissSuggestion(null, mSuggestionParser, mSuggestion);
@@ -144,6 +343,26 @@ public class SuggestionFeatureProviderImplTest {
                 .setComponentEnabledSetting(mSuggestion.intent.getComponent(),
                         PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                         PackageManager.DONT_KILL_APP);
-        verify(mSuggestionParser).markCategoryDone(mSuggestion.category);
+    }
+
+    private void stubFingerprintSupported(boolean enabled) {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(enabled);
+    }
+
+    @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/SuggestionsChecksTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
index 5f3c0f0c38bea71b2e836229edf94096f10ed5d0..028df05f7f4a2408c6599e9108b810b70dc53dde 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionsChecksTest.java
@@ -31,8 +31,8 @@ import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
 
 import com.android.settings.Settings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settingslib.drawer.Tile;
 
 import org.junit.Before;
@@ -78,6 +78,7 @@ public class SuggestionsChecksTest {
     public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintAdded() {
         stubFingerprintSupported(true);
         when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         Tile tile = createFingerprintTile();
         assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
     }
@@ -86,10 +87,20 @@ public class SuggestionsChecksTest {
     public void testFingerprintEnrollmentIntroductionIsNotCompleteWhenNoFingerprintAdded() {
         stubFingerprintSupported(true);
         when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(false);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         Tile tile = createFingerprintTile();
         assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isFalse();
     }
 
+    @Test
+    public void testFingerprintEnrollmentIntroductionIsCompleteWhenHardwareNotDetected() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(false);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
+        Tile tile = createFingerprintTile();
+        assertThat(mSuggestionsChecks.isSuggestionComplete(tile)).isTrue();
+    }
+
 
     @Test
     public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintNotSupported() {
@@ -102,6 +113,7 @@ public class SuggestionsChecksTest {
     public void testFingerprintEnrollmentIntroductionIsCompleteWhenFingerprintDisabled() {
         stubFingerprintSupported(true);
         when(mFingerprintManager.hasEnrolledFingerprints()).thenReturn(false);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(), anyInt()))
                 .thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT);
 
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 0000000000000000000000000000000000000000..05efa9f805c0e3c2dfef08e9851b33dba335a47b
--- /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/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 77e0fe9ad9d3aeaf574c615b894013bfaf012a83..e4ad5b5998456bf9273fa2f8d0a54ff70cbcc2c3 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -27,6 +27,7 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.ShadowDataUsageSummary;
 import com.android.settingslib.NetworkPolicyEditor;
 
 import org.junit.Before;
@@ -149,27 +150,50 @@ public class DataUsageSummaryTest {
     }
 
     @Test
+    @Config(shadows = ShadowDataUsageSummary.class)
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = RuntimeEnvironment.application;
+        ShadowDataUsageSummary.IS_WIFI_SUPPORTED = true;
+        ShadowDataUsageSummary.IS_MOBILE_DATA_SUPPORTED = true;
         final List<String> niks = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
                 .getNonIndexableKeys(context);
         final List<String> keys = new ArrayList<>();
 
         keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage_wifi));
         keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage));
+        keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.data_usage_cellular));
 
         assertThat(keys).containsAllIn(niks);
     }
 
     @Test
-    @Config(shadows = ShadowConnectivityManager.class)
-    public void testNonIndexableKeys_hasMobileData_restrictedAccessesAdded() {
-        ShadowConnectivityManager.setIsNetworkSupported(true);
+    @Config(shadows = ShadowDataUsageSummary.class)
+    public void testNonIndexableKeys_hasMobileData_hasWifi_allNonIndexableKeysAdded() {
+        ShadowDataUsageSummary.IS_WIFI_SUPPORTED = false;
+        ShadowDataUsageSummary.IS_MOBILE_DATA_SUPPORTED = false;
         List<String> keys = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
                 .getNonIndexableKeys(mContext);
 
-        assertThat(keys).contains(DataUsageSummary.KEY_RESTRICT_BACKGROUND);
+        // Mobile data keys
+        assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_CATEGORY);
+        assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_DATA_USAGE_TOGGLE);
+        assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_DATA_USAGE);
+        assertThat(keys).contains(DataUsageSummary.KEY_MOBILE_BILLING_CYCLE);
+
+        // Wifi keys
+        assertThat(keys).contains(DataUsageSummary.KEY_WIFI_DATA_USAGE);
         assertThat(keys).contains(DataUsageSummary.KEY_NETWORK_RESTRICTIONS);
-        ShadowConnectivityManager.setIsNetworkSupported(false);
+        assertThat(keys).contains(DataUsageSummary.KEY_WIFI_USAGE_TITLE);
+    }
+
+    @Test
+    @Config(shadows = ShadowDataUsageSummary.class)
+    public void testNonIndexableKeys_noMobile_noWifi_limitedNonIndexableKeys() {
+        ShadowDataUsageSummary.IS_WIFI_SUPPORTED = true;
+        ShadowDataUsageSummary.IS_MOBILE_DATA_SUPPORTED = true;
+        List<String> keys = DataUsageSummary.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+
+        assertThat(keys).containsExactly(DataUsageSummary.KEY_WIFI_USAGE_TITLE);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java
index f9d2acf2b731e1dd220b94a5fa6f2ac51b64dfc2..f20e50c3e12806269483ef7a0008cde9299cc297 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.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.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.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 @@ public class UnrestrictedDataAccessTest {
     @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/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
index aac1e80bbfca8cfee067941b5d395fe02e16cba4..843c753d9a655cdbe38e2f730da3fcf4ef1bcb02 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
@@ -21,9 +21,9 @@ import android.content.Intent;
 
 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/ZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
index 554cda648aee78b8e92008513ed985c7903c869d..92807e9fcf3e15bdf2b8ff5e654c82b3d3857c63 100644
--- a/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/ZonePickerTest.java
@@ -16,6 +16,11 @@
 
 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;
@@ -33,11 +38,6 @@ import org.robolectric.Robolectric;
 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 @@ public class ZonePickerTest {
 
         // 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 c5ba42d59ff39fcc442146a9274be2a5aa690fb2..38c4ab21e9d88e2d2108fa0aa1acbc2e6dc54cee 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
@@ -71,6 +71,7 @@ public class AutomaticStorageManagerSwitchBarControllerTest {
         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 8ca79026d8848a1d4e59f91024399c727537a765..f703b263604e6e60ed64657abf7b42ae6bbcdfd7 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
@@ -39,11 +39,9 @@ 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.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 94302099b8da92f695dca4b6dacee5233bc2b099..3b3b482fa41473258de946d78998802d63426de7 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
@@ -27,7 +27,6 @@ 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;
@@ -37,7 +36,6 @@ import static org.mockito.Matchers.any;
 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/development/DevelopmentSettingsDisabledActivityTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..59276465ac84393887f8b5009c8c957f5bb44d0e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDisabledActivityTest.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.development;
+
+
+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 DevelopmentSettingsDisabledActivityTest {
+
+    @Test
+    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/DevelopmentSettingsTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsTest.java
index e2527ce95a21d21bc42ab82aaeb9c0b30ea557c5..8e4b74d21e2d0df5eef8af42af6b31ea6cd57bfb 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 @@ package com.android.settings.development;
 
 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.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.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 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.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 DevelopmentSettingsTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -90,4 +99,38 @@ public class DevelopmentSettingsTest {
 
         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 e9c762a3bda3efac9aac1729d7c628dded7480a2..2f0f261fda8e4548f8d589346ed6da984a96bc89 100644
--- a/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/TelephonyMonitorPreferenceControllerTest.java
@@ -33,8 +33,6 @@ import org.mockito.Answers;
 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/deviceinfo/BasebandVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
index 8d00361e31956099c8bcfb01d4e0d76c19630976..3bba438ab52435b75c9b52c9064ed05762c7f91a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BasebandVersionPreferenceControllerTest.java
@@ -30,7 +30,6 @@ import org.mockito.Answers;
 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 c8f40364889b721ebfa215dc30f720871f7455b1..7601f8ae191e76322b09e1445570064ee7a5f861 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -29,9 +29,9 @@ import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.development.DevelopmentSettings;
 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.Mock;
 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/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
index 669f4c2070b80d3a3d59244225b66413542b99ee..5a4d9888dffbeac363ff470d6f60ee1e1a35caaa 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FirmwareVersionPreferenceControllerTest.java
@@ -22,7 +22,7 @@ import android.support.v7.preference.PreferenceScreen;
 
 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/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
index fe8fa9c167aaaa2375908a767c973ed5e9aab41f..5e95a6161027676c11458d41c87fff844a04ae3a 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;
@@ -41,12 +47,6 @@ import org.robolectric.util.ReflectionHelpers;
 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 @@ public class StorageSettingsTest {
         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/UsbBackendTest.java b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
index e7a70eff5cbb2b4533e1021b45412fd164396cb1..ce384a5d973e9812863d2d43f780875df2f462f5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/UsbBackendTest.java
@@ -16,8 +16,13 @@
 
 package com.android.settings.deviceinfo;
 
+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.IntentFilter;
 import android.content.pm.PackageManager;
 import android.hardware.usb.UsbManager;
 
@@ -27,17 +32,10 @@ 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;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class UsbBackendTest {
@@ -70,13 +68,7 @@ public class UsbBackendTest {
         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/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index 04078bc2b80c00bd1c3b39b8eb9142bbdbdc5bf5..faf8b394da3568e9cc1b0c3c310ad625a0b039fa 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 @@ package com.android.settings.deviceinfo.storage;
 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;
@@ -169,4 +168,23 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest {
 
         verify(transaction, never()).add(any(), eq(ActivationWarningFragment.TAG));
     }
+
+    @Config(shadows = {SettingsShadowSystemProperties.class})
+    @Test
+    public void togglingOnShouldTriggerWarningFragmentIfEnabledByDefaultAndDisabledByPolicy() {
+        FragmentTransaction transaction = mock(FragmentTransaction.class);
+        when(mFragmentManager.beginTransaction()).thenReturn(transaction);
+        SettingsShadowSystemProperties.set(
+                AutomaticStorageManagementSwitchPreferenceController
+                        .STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY,
+                "true");
+        Settings.Secure.putInt(
+                mContext.getContentResolver(),
+                Settings.Secure.AUTOMATIC_STORAGE_MANAGER_TURNED_OFF_BY_POLICY,
+                1);
+
+        mController.onSwitchToggled(true);
+
+        verify(transaction).add(any(), eq(ActivationWarningFragment.TAG));
+    }
 }
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 5139bb3520879f2b4bb5ec466a9616a2b4a8ecb8..0d6a4d7988d3adc7e0dba4cc001db68b928f048c 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;
@@ -119,7 +120,7 @@ public class StorageItemPreferenceControllerTest {
 
         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 @@ public class StorageItemPreferenceControllerTest {
 
         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 @@ public class StorageItemPreferenceControllerTest {
 
         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 @@ public class StorageItemPreferenceControllerTest {
 
     @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 @@ public class StorageItemPreferenceControllerTest {
 
         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 @@ public class StorageItemPreferenceControllerTest {
 
         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 @@ public class StorageItemPreferenceControllerTest {
         assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
 
         verify(mFragment.getFragmentManager().beginTransaction()).add(
-                any(PrivateVolumeSettings.SystemInfoFragment.class), anyString());
+                nullable(PrivateVolumeSettings.SystemInfoFragment.class), nullable(String.class));
     }
 
     @Test
@@ -297,19 +298,19 @@ public class StorageItemPreferenceControllerTest {
     @Test
     public void settingUserIdAppliesNewIcons() {
         StorageItemPreference audio = spy(new StorageItemPreference(mContext));
-        audio.setIcon(R.drawable.ic_photo_library_vd_theme_24);
+        audio.setIcon(R.drawable.ic_media_stream);
         StorageItemPreference video = spy(new StorageItemPreference(mContext));
-        video.setIcon(R.drawable.ic_photo_library_vd_theme_24);
+        video.setIcon(R.drawable.ic_local_movies);
         StorageItemPreference image = spy(new StorageItemPreference(mContext));
-        image.setIcon(R.drawable.ic_photo_library_vd_theme_24);
+        image.setIcon(R.drawable.ic_photo_library);
         StorageItemPreference games = spy(new StorageItemPreference(mContext));
-        games.setIcon(R.drawable.ic_photo_library_vd_theme_24);
+        games.setIcon(R.drawable.ic_videogame_vd_theme_24);
         StorageItemPreference apps = spy(new StorageItemPreference(mContext));
-        apps.setIcon(R.drawable.ic_photo_library_vd_theme_24);
+        apps.setIcon(R.drawable.ic_storage_apps);
         StorageItemPreference system = spy(new StorageItemPreference(mContext));
-        system.setIcon(R.drawable.ic_photo_library_vd_theme_24);
+        system.setIcon(R.drawable.ic_system_update_vd_theme_24);
         StorageItemPreference files = spy(new StorageItemPreference(mContext));
-        files.setIcon(R.drawable.ic_photo_library_vd_theme_24);
+        files.setIcon(R.drawable.ic_folder_vd_theme_24);
         PreferenceScreen screen = mock(PreferenceScreen.class);
         when(screen.findPreference(
                 eq(StorageItemPreferenceController.AUDIO_KEY))).thenReturn(audio);
@@ -329,13 +330,13 @@ public class StorageItemPreferenceControllerTest {
 
         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 @@ public class StorageItemPreferenceControllerTest {
         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 @@ public class StorageItemPreferenceControllerTest {
         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 @@ public class StorageItemPreferenceControllerTest {
         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 @@ public class StorageItemPreferenceControllerTest {
         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 @@ public class StorageItemPreferenceControllerTest {
         // 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 cea71bd618e27d4a7173431365499e80afa09384..bd40240a636160ebd8f46c8f9db772d55cb46942 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
@@ -39,8 +39,10 @@ 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.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,7 +56,11 @@ import static com.android.settings.TestUtils.KILOBYTE;
 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;
@@ -65,6 +71,8 @@ public class StorageSummaryDonutPreferenceControllerTest {
 
     @Before
     public void setUp() throws Exception {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_headlineFontFamily, "");
         mContext = spy(RuntimeEnvironment.application.getApplicationContext());
         FakeFeatureFactory.setupForTest(mContext);
         mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
@@ -79,6 +87,11 @@ public class StorageSummaryDonutPreferenceControllerTest {
         mHolder = PreferenceViewHolder.createInstanceForTests(view);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void testEmpty() throws Exception {
         mController.updateBytes(0, 32 * GIGABYTE);
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 0000000000000000000000000000000000000000..386980709da76afe52c3dcdcc186c96494aa1eae
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.TestConfig;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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;
+    boolean mCallbackInvoked;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, mConfig,
+                () -> { mCallbackInvoked = true; });
+    }
+
+    @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_callback() throws Exception {
+        assertThat(mCallbackInvoked).isFalse();
+        mController.onPreferenceChange(mSwitchPreference, true);
+        assertThat(mCallbackInvoked).isTrue();
+    }
+
+    @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.alwaysOnAvailableForUser(anyInt()))
+                .thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_unavailable() throws Exception {
+        when(mConfig.alwaysOnAvailableForUser(anyInt()))
+                .thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void testPreferenceController_ProperResultPayloadType() {
+        assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testSetValue_updatesCorrectly() {
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 0);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, 1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testGetValue_correctValueReturned() {
+        int currentValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ALWAYS_ON, currentValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
+}
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 0000000000000000000000000000000000000000..242a05d4fae402ac82bd344f30d2594bfd68ba51
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.support.v14.preference.SwitchPreference;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+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);
+    }
+
+    @Test
+    public void testPreferenceController_ProperResultPayloadType() {
+        assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testSetValue_updatesCorrectly() {
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ENABLED, 0);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.DOZE_ENABLED, 1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testGetValue_correctValueReturned() {
+        int currentValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_ENABLED, currentValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
+}
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 0000000000000000000000000000000000000000..2933517cc11c478307ea5e1bd7175afdd57e76bb
--- /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 ed2b5c1b338a2e1a71281e8c03d485461a86724f..02f46f248fa8b0fde611f349074b74b622996db8 100644
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -16,12 +16,15 @@
 
 package com.android.settings.display;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
 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.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;
@@ -78,13 +81,25 @@ public class AutoBrightnessPreferenceControllerTest {
     }
 
     @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 0000000000000000000000000000000000000000..6d9cbab317c32564bd711ad24b8b28364483bfe9
--- /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/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d35adef76409846705af1fdde603b5bb1a4d07ab
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.reset;
+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_shouldSetSummaryToAutoBrightness() {
+        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_shouldSetSummaryToScreenBrightness() {
+        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%");
+    }
+
+    @Test
+    public void updateState_brightnessOutOfRange_shouldSetSummaryInRange() {
+        // VR mode
+        doReturn(true).when(mController).isInVrMode();
+
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, 105);
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("100%");
+
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_FOR_VR, -20);
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("0%");
+
+        // Auto mode
+        doReturn(false).when(mController).isInVrMode();
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
+                System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);
+
+        reset(mPreference);
+        System.putFloat(mContentResolver, System.SCREEN_AUTO_BRIGHTNESS_ADJ, 1.5f);
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("100%");
+
+        System.putFloat(mContentResolver, System.SCREEN_AUTO_BRIGHTNESS_ADJ, -1.5f);
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("0%");
+
+        // Manual mode
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS_MODE,
+                System.SCREEN_BRIGHTNESS_MODE_MANUAL);
+
+        reset(mPreference);
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, 115);
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("100%");
+
+        System.putInt(mContentResolver, System.SCREEN_BRIGHTNESS, -10);
+        mController.updateState(mPreference);
+        verify(mPreference).setSummary("0%");
+    }
+}
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 0000000000000000000000000000000000000000..00d910eb82c0df63a9ac7ccada9c72f70ead7143
--- /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 7a7f40088ddfa11324bebc65b3cd05f587dd9fc4..3d99f658391307e9cae4675cf3e7c79afaa2b329 100644
--- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -22,19 +22,24 @@ 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.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 @@ import static org.mockito.Mockito.when;
 @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).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).setValue("Theme1");
+        verify(mPreference)
+                .setSummary(RuntimeEnvironment.application.getString(R.string.default_theme));
+        verify(mPreference).setValue(null);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1419ad551daf8697b5c7b1bacc44e05163b03014
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.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.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.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+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.TestConfig;
+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.annotation.Config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class WallpaperPreferenceControllerTest {
+
+    private static final String WALLPAPER_PACKAGE = "TestPkg";
+    private static final String WALLPAPER_CLASS = "TestCls";
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+
+    private WallpaperPreferenceController mController;
+
+    @Before
+    public void setUp() throws PackageManager.NameNotFoundException {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getString(R.string.config_wallpaper_picker_package))
+                .thenReturn(WALLPAPER_PACKAGE);
+        when(mContext.getString(R.string.config_wallpaper_picker_class))
+                .thenReturn(WALLPAPER_CLASS);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        mController = new WallpaperPreferenceController(mContext);
+    }
+
+    @Test
+    public void isAvailable_wallpaerPickerEnabled_shouldReturnTrue() {
+        final List<ResolveInfo> resolveInfos = new ArrayList<>();
+        resolveInfos.add(mock(ResolveInfo.class));
+        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
+                .thenReturn(resolveInfos);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaerPickerDisbled_shouldReturnFalseAndNoCrash() {
+        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt())).thenReturn(null);
+
+        assertThat(mController.isAvailable()).isFalse();
+
+        final List<ResolveInfo> resolveInfos = new ArrayList<>();
+        when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
+                .thenReturn(resolveInfos);
+
+        assertThat(mController.isAvailable()).isFalse();
+        // should not crash
+    }
+}
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 0000000000000000000000000000000000000000..bd25d92064b7f851e9b8d46ff09272fe21c811e4
--- /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 0000000000000000000000000000000000000000..e3493a17af07b799c1331922a1c3c55ea1f4b534
--- /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 0000000000000000000000000000000000000000..73526e5db994f9e7d454fe123f9bf158be59d5aa
--- /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 0000000000000000000000000000000000000000..444591a6b64d86543181c56f3ed01b37f3a038eb
--- /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 0000000000000000000000000000000000000000..bafc2d40c744c893872f9cf0335a592babe74cee
--- /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 0000000000000000000000000000000000000000..2acf82b34cfc2b7e7e43fb64f4ba988940b6b62d
--- /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/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index d506a8eca2f0f00281dbf23c4087becfd5ccce46..474b278afdada0824d27df882b0379f8a81b851e 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -231,6 +231,7 @@ public final class EnterprisePrivacyFeatureProviderImplTest {
 
     @Test
     public void testGetMaximumFailedPasswordsForWipeInCurrentUser() {
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(null);
         when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
         when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, MY_USER_ID))
                 .thenReturn(10);
@@ -238,6 +239,10 @@ public final class EnterprisePrivacyFeatureProviderImplTest {
 
         when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(OWNER);
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
+
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
+        assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index ab4ef4bb886210b847013a927fd7cddce92a724b..bb21bf7c56122e25023fde2dcdcff407c73028bb 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;
@@ -44,14 +52,7 @@ 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.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 @@ public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
             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 @@ public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
     @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 @@ public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
         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/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
index 44bf4141ecc13609a2690c3f4904b74dea354c1f..344914a4941b0d2729aab0940291f1f0dc90349b 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -25,15 +25,16 @@ import static org.robolectric.RuntimeEnvironment.application;
 
 import android.content.ComponentName;
 import android.content.Intent;
+import android.hardware.fingerprint.FingerprintManager;
 import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
 import android.os.CancellationSignal;
 import android.widget.Button;
 
-import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
-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.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
 import com.android.settings.testutils.shadow.ShadowEventLogWriter;
@@ -92,20 +93,26 @@ public class FingerprintEnrollFindSensorTest {
     }
 
     @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());
+    public void enrollFingerprint_shouldProceed() {
+        EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
 
-        Button nextButton = mActivity.findViewById(R.id.next_button);
-        nextButton.performClick();
-        callbackCaptor.getValue().onEnrollmentProgress(123);
-        nextButton.performClick();
+        enrollmentCallback.onEnrollmentProgress(123);
+        enrollmentCallback.onEnrollmentError(FingerprintManager.FINGERPRINT_ERROR_CANCELED, "test");
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
+        IntentForResult startedActivity =
+                shadowActivity.getNextStartedActivityForResult();
+        assertThat(startedActivity).named("Next activity 1").isNotNull();
+        assertThat(startedActivity.intent.getComponent())
+                .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
+    }
+
+    @Test
+    public void enrollFingerprintTwice_shouldStartOneEnrolling() {
+        EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
+
+        enrollmentCallback.onEnrollmentProgress(123);
+        enrollmentCallback.onEnrollmentProgress(123);  // A second enroll should be a no-op
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
@@ -118,4 +125,45 @@ public class FingerprintEnrollFindSensorTest {
         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);
+        enrollmentCallback.onEnrollmentError(FingerprintManager.FINGERPRINT_ERROR_CANCELED, "test");
+
+        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));
+    }
+
+    @Test
+    public void clickSkip_shouldReturnResultSkip() {
+        Button skipButton = mActivity.findViewById(R.id.skip_button);
+        skipButton.performClick();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
+        assertThat(shadowActivity.getResultCode()).named("result code")
+                .isEqualTo(FingerprintEnrollBase.RESULT_SKIP);
+    }
+
+    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 3e46e7b73c15a1a5dd7e471eefee6ffda41f9c8c..7b7e440ef69bf80d629d837374f8c2c50ee47802 100644
--- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoViewTest.java
@@ -27,7 +27,6 @@ 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/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..bf2dfaedfffc34eae862a675f0bea400eb5069a0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fingerprint;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+
+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.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowKeyguardManager;
+import org.robolectric.util.ActivityController;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                ShadowEventLogWriter.class,
+                ShadowLockPatternUtils.class,
+                ShadowUserManager.class
+        })
+public class FingerprintSuggestionActivityTest {
+
+    @Mock
+    private UserInfo mUserInfo;
+
+    private ActivityController<FingerprintSuggestionActivity> mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        final Intent intent = new Intent();
+        mController = Robolectric.buildActivity(FingerprintSuggestionActivity.class, intent);
+
+        ShadowUserManager.getShadow().setUserInfo(0, mUserInfo);
+    }
+
+    @Test
+    public void testKeyguardSecure_shouldFinishWithFingerprintResultSkip() {
+        getShadowKeyguardManager().setIsKeyguardSecure(true);
+
+        mController.create().resume();
+
+        final Button cancelButton = mController.get().findViewById(R.id.fingerprint_cancel_button);
+        assertThat(cancelButton.getText().toString()).isEqualTo("Cancel");
+        assertThat(cancelButton.getVisibility()).named("Cancel visible").isEqualTo(View.VISIBLE);
+        cancelButton.performClick();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
+        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
+        assertThat(shadowActivity.getResultCode()).named("Result code")
+                .isEqualTo(Activity.RESULT_CANCELED);
+    }
+
+    private ShadowKeyguardManager getShadowKeyguardManager() {
+        return Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..801ee5dbfb2fb1d6259c807670f558f5ba4431cc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.fingerprint;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.KeyguardManager;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment;
+import com.android.settings.password.SetupSkipDialog;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+
+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.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowKeyguardManager;
+import org.robolectric.util.ActivityController;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                ShadowEventLogWriter.class,
+                ShadowLockPatternUtils.class,
+                ShadowUserManager.class
+        })
+public class SetupFingerprintEnrollIntroductionTest {
+
+    @Mock
+    private UserInfo mUserInfo;
+
+    private ActivityController<SetupFingerprintEnrollIntroduction> mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        final Intent intent = new Intent();
+        mController = Robolectric.buildActivity(SetupFingerprintEnrollIntroduction.class, intent);
+
+        ShadowUserManager.getShadow().setUserInfo(0, mUserInfo);
+    }
+
+    @Test
+    public void testKeyguardNotSecure_shouldFinishWithSetupSkipDialogResultSkip() {
+        getShadowKeyguardManager().setIsKeyguardSecure(false);
+
+        mController.create().resume();
+
+        final Button skipButton = mController.get().findViewById(R.id.fingerprint_cancel_button);
+        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+        skipButton.performClick();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
+        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
+        assertThat(shadowActivity.getResultCode()).named("Result code")
+                .isEqualTo(SetupSkipDialog.RESULT_SKIP);
+    }
+
+    @Test
+    public void testKeyguardSecure_shouldFinishWithFingerprintResultSkip() {
+        getShadowKeyguardManager().setIsKeyguardSecure(true);
+
+        mController.create().resume();
+
+        final Button skipButton = mController.get().findViewById(R.id.fingerprint_cancel_button);
+        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+        skipButton.performClick();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
+        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
+        assertThat(shadowActivity.getResultCode()).named("Result code")
+                .isEqualTo(FingerprintEnrollBase.RESULT_SKIP);
+    }
+
+    @Test
+    public void testBackKeyPress_shouldSetIntentDataIfLockScreenAdded() {
+        getShadowKeyguardManager().setIsKeyguardSecure(false);
+
+        mController.create().resume();
+        getShadowKeyguardManager().setIsKeyguardSecure(true);
+        SetupFingerprintEnrollIntroduction activity = mController.get();
+        activity.onBackPressed();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+        assertThat(shadowActivity.getResultIntent()).isNotNull();
+        assertThat(shadowActivity.getResultIntent().hasExtra(
+                SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isTrue();
+    }
+
+    @Test
+    public void testBackKeyPress_shouldNotSetIntentDataIfLockScreenPresentBeforeLaunch() {
+        getShadowKeyguardManager().setIsKeyguardSecure(true);
+
+        mController.create().resume();
+        SetupFingerprintEnrollIntroduction activity = mController.get();
+        activity.onBackPressed();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+        assertThat(shadowActivity.getResultIntent()).isNull();
+    }
+
+    @Test
+    public void testCancelClicked_shouldSetIntentDataIfLockScreenAdded() {
+        getShadowKeyguardManager().setIsKeyguardSecure(false);
+
+        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
+        final Button skipButton = activity.findViewById(R.id.fingerprint_cancel_button);
+        getShadowKeyguardManager().setIsKeyguardSecure(true);
+        skipButton.performClick();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+        assertThat(shadowActivity.getResultIntent()).isNotNull();
+        assertThat(shadowActivity.getResultIntent().hasExtra(
+                SetupChooseLockGenericFragment.EXTRA_PASSWORD_QUALITY)).isTrue();
+    }
+
+    @Test
+    public void testCancelClicked_shouldNotSetIntentDataIfLockScreenPresentBeforeLaunch() {
+        getShadowKeyguardManager().setIsKeyguardSecure(true);
+
+        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
+        final Button skipButton = activity.findViewById(R.id.fingerprint_cancel_button);
+        skipButton.performClick();
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+        assertThat(shadowActivity.getResultIntent()).isNull();
+    }
+
+    @Test
+    public void testOnResultFromFindSensor_shouldNotSetIntentDataIfLockScreenPresentBeforeLaunch() {
+        getShadowKeyguardManager().setIsKeyguardSecure(true);
+        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
+        activity.onActivityResult(FingerprintEnrollIntroduction.FINGERPRINT_FIND_SENSOR_REQUEST,
+                FingerprintEnrollBase.RESULT_FINISHED, null);
+        assertThat(Shadows.shadowOf(activity).getResultIntent()).isNull();
+    }
+
+    @Test
+    public void testOnResultFromFindSensor_shouldSetIntentDataIfLockScreenAdded() {
+        getShadowKeyguardManager().setIsKeyguardSecure(false);
+        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
+        getShadowKeyguardManager().setIsKeyguardSecure(true);
+        activity.onActivityResult(FingerprintEnrollIntroduction.FINGERPRINT_FIND_SENSOR_REQUEST,
+                FingerprintEnrollBase.RESULT_FINISHED, null);
+        assertThat(Shadows.shadowOf(activity).getResultIntent()).isNotNull();
+    }
+
+    @Test
+    public void testOnResultFromFindSensor_shouldNotSetIntentDataIfLockScreenNotAdded() {
+        getShadowKeyguardManager().setIsKeyguardSecure(false);
+        SetupFingerprintEnrollIntroduction activity = mController.create().resume().get();
+        activity.onActivityResult(FingerprintEnrollIntroduction.FINGERPRINT_FIND_SENSOR_REQUEST,
+                FingerprintEnrollBase.RESULT_FINISHED, null);
+        assertThat(Shadows.shadowOf(activity).getResultIntent()).isNull();
+    }
+
+
+    private ShadowKeyguardManager getShadowKeyguardManager() {
+        return Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 799e296b28d42a3dbca5065978627131b6c8cbe9..61815f1735eb746b8552e3eb83944250eb3e4f2f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -18,20 +18,21 @@ package com.android.settings.fuelgauge;
 
 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.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.AppOpsManager;
 import android.app.Fragment;
+import android.app.LoaderManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
@@ -39,20 +40,27 @@ import android.graphics.drawable.Drawable;
 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.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalySummaryPreferenceController;
 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,21 +68,25 @@ import org.mockito.Answers;
 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.util.ReflectionHelpers;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @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;
@@ -82,12 +94,10 @@ public class AdvancedPowerUsageDetailTest {
     private static final long PHONE_FOREGROUND_TIME_MS = 250 * 1000;
     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
@@ -106,13 +116,28 @@ public class AdvancedPowerUsageDetailTest {
     private BatteryStats.Uid mUid;
     @Mock
     private PackageManager mPackageManager;
+    @Mock
+    private AppOpsManager mAppOpsManager;
+    @Mock
+    private LoaderManager mLoaderManager;
+    @Mock
+    private AnomalySummaryPreferenceController mAnomalySummaryPreferenceController;
+    @Mock
+    private BatteryStats.Timer mTimer;
+    private Context mContext;
+    private Preference mForegroundPreference;
+    private Preference mBackgroundPreference;
+    private Preference mPowerUsagePreference;
     private AdvancedPowerUsageDetail mFragment;
     private FakeFeatureFactory mFeatureFactory;
     private SettingsActivity mTestActivity;
+    private List<Anomaly> mAnomalies;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
         FakeFeatureFactory.setupForTest(mContext);
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
 
@@ -120,21 +145,27 @@ public class AdvancedPowerUsageDetailTest {
         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(
-                ApplicationsState.AppEntry.class));
-        doReturn(mAppHeaderController).when(mAppHeaderController).setLabel(anyString());
-        doReturn(mAppHeaderController).when(mAppHeaderController).setLabel(any(
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+        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).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();
@@ -142,6 +173,8 @@ public class AdvancedPowerUsageDetailTest {
                 eq(BatteryStats.Uid.PROCESS_STATE_BACKGROUND), anyLong(), anyInt());
         doReturn(FOREGROUND_TIME_US).when(mUid).getProcessStateTime(
                 eq(BatteryStats.Uid.PROCESS_STATE_TOP), anyLong(), anyInt());
+        doReturn(mTimer).when(mUid).getForegroundActivityTimer();
+        doReturn(FOREGROUND_TIME_US).when(mTimer).getTotalTimeLocked(anyLong(), anyInt());
         ReflectionHelpers.setField(mBatteryEntry, "sipper", mBatterySipper);
         mBatteryEntry.iconId = ICON_ID;
         mBatterySipper.uidObj = mUid;
@@ -154,18 +187,34 @@ public class AdvancedPowerUsageDetailTest {
 
         mTestActivity = spy(new SettingsActivity());
         doReturn(mPackageManager).when(mTestActivity).getPackageManager();
+        doReturn(mAppOpsManager).when(mTestActivity).getSystemService(Context.APP_OPS_SERVICE);
 
         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;
+        mFragment.mAnomalySummaryPreferenceController = mAnomalySummaryPreferenceController;
+
+        mAnomalies = new ArrayList<>();
+        mAnomalies.add(new Anomaly.Builder().setUid(UID).setType(
+                Anomaly.AnomalyType.WAKE_LOCK).build());
+    }
+
+    @After
+    public void reset() {
+        ShadowEntityHeaderController.reset();
     }
 
     @Test
@@ -173,8 +222,8 @@ public class AdvancedPowerUsageDetailTest {
         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
@@ -189,9 +238,9 @@ public class AdvancedPowerUsageDetailTest {
         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
@@ -206,16 +255,16 @@ public class AdvancedPowerUsageDetailTest {
         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
     public void testStartBatteryDetailPage_hasBasicData() {
         AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT);
+                mBatteryEntry, USAGE_PERCENT, mAnomalies);
 
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
         assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME)).isEqualTo(
@@ -224,6 +273,8 @@ public class AdvancedPowerUsageDetailTest {
                 FOREGROUND_TIME_MS);
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
                 USAGE_PERCENT);
+        assertThat(mBundle.getParcelableArrayList(
+                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalies);
     }
 
     @Test
@@ -232,7 +283,7 @@ public class AdvancedPowerUsageDetailTest {
         mBatterySipper.usageTimeMs = PHONE_FOREGROUND_TIME_MS;
 
         AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT);
+                mBatteryEntry, USAGE_PERCENT, null);
 
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_UID)).isEqualTo(UID);
         assertThat(mBundle.getLong(AdvancedPowerUsageDetail.EXTRA_FOREGROUND_TIME)).isEqualTo(
@@ -241,6 +292,8 @@ public class AdvancedPowerUsageDetailTest {
                 PHONE_BACKGROUND_TIME_MS);
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
                 USAGE_PERCENT);
+        assertThat(mBundle.getParcelableArrayList(
+                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isNull();
     }
 
     @Test
@@ -248,21 +301,25 @@ public class AdvancedPowerUsageDetailTest {
         mBatterySipper.mPackages = PACKAGE_NAME;
         mBatteryEntry.defaultPackageName = PACKAGE_NAME[0];
         AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT);
+                mBatteryEntry, USAGE_PERCENT, mAnomalies);
 
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
                 PACKAGE_NAME[0]);
+        assertThat(mBundle.getParcelableArrayList(
+                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isEqualTo(mAnomalies);
     }
 
     @Test
     public void testStartBatteryDetailPage_SystemApp() {
         mBatterySipper.mPackages = null;
         AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT);
+                mBatteryEntry, USAGE_PERCENT, null);
 
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_LABEL)).isEqualTo(APP_LABEL);
         assertThat(mBundle.getInt(AdvancedPowerUsageDetail.EXTRA_ICON_ID)).isEqualTo(ICON_ID);
-        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(null);
+        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isNull();
+        assertThat(mBundle.getParcelableArrayList(
+                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST)).isNull();
     }
 
     @Test
@@ -271,24 +328,23 @@ public class AdvancedPowerUsageDetailTest {
         mBatterySipper.mPackages = PACKAGE_NAME;
         doReturn(appUid).when(mBatterySipper).getUid();
         AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
-                mBatteryEntry, USAGE_PERCENT);
+                mBatteryEntry, USAGE_PERCENT, null);
 
         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]);
 
@@ -297,4 +353,61 @@ public class AdvancedPowerUsageDetailTest {
         assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_POWER_USAGE_PERCENT)).isEqualTo(
                 "0%");
     }
+
+    @Test
+    public void testStartBatteryDetailPage_defaultPackageNull_choseFromBatterySipper() {
+        mBatteryEntry.defaultPackageName = null;
+        mBatteryEntry.sipper.mPackages = PACKAGE_NAME;
+
+        AdvancedPowerUsageDetail.startBatteryDetailPage(mTestActivity, null, mBatteryStatsHelper, 0,
+                mBatteryEntry, USAGE_PERCENT, null);
+
+        assertThat(mBundle.getString(AdvancedPowerUsageDetail.EXTRA_PACKAGE_NAME)).isEqualTo(
+                PACKAGE_NAME[0]);
+    }
+
+    @Test
+    public void testInitPreference_hasCorrectSummary() {
+        Bundle bundle = new Bundle(4);
+        bundle.putLong(AdvancedPowerUsageDetail.EXTRA_BACKGROUND_TIME, BACKGROUND_TIME_MS);
+        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)");
+    }
+
+    @Test
+    public void testInitAnomalyInfo_anomalyNull_startAnomalyLoader() {
+        doReturn(null).when(mBundle).getParcelableArrayList(
+                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST);
+
+        mFragment.initAnomalyInfo();
+
+        verify(mLoaderManager).initLoader(eq(0), eq(Bundle.EMPTY), any());
+    }
+
+    @Test
+    public void testInitAnomalyInfo_anomalyExisted_updateAnomaly() {
+        doReturn(mAnomalies).when(mBundle).getParcelableArrayList(
+                AdvancedPowerUsageDetail.EXTRA_ANOMALY_LIST);
+
+        mFragment.initAnomalyInfo();
+
+        verify(mAnomalySummaryPreferenceController).updateAnomalySummaryPreference(mAnomalies);
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
index b40cb9e6858f080072bff788f3b73596114cb5cb..92df48e262a58d1dcce086713542509686a176f2 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 android.widget.Button;
 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 c3b660c031d136e738f4639685a620587729678a..a163a43989b73158525f7506e737aed0ac906262 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -32,7 +32,12 @@ 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.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;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -52,7 +57,7 @@ public class BatteryBroadcastReceiverTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
 
         mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
         mBatteryBroadcastReceiver.mBatteryLevel = BATTERY_INIT_LEVEL;
@@ -92,4 +97,19 @@ public class BatteryBroadcastReceiverTest {
         verify(mBatteryListener, never()).onBatteryChanged();
     }
 
+    @Test
+    public void testRegister_updateBatteryStatus() {
+        doReturn(mChargingIntent).when(mContext).registerReceiver(any(), any());
+
+        mBatteryBroadcastReceiver.register();
+        mBatteryBroadcastReceiver.register();
+
+        assertThat(mBatteryBroadcastReceiver.mBatteryLevel).isEqualTo(
+                Utils.getBatteryPercentage(mChargingIntent));
+        assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(
+                Utils.getBatteryStatus(mContext.getResources(), mChargingIntent));
+        // 2 times because register will force update the battery
+        verify(mBatteryListener, times(2)).onBatteryChanged();
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index a8708e034c17c43395ca16b8fcd444bb4d663554..013d379b8b167890e1215cd86e3eb97f34d630b6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -17,17 +17,13 @@
 
 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.v14.preference.PreferenceFragment;
 import android.support.v7.preference.PreferenceScreen;
+import android.support.v7.widget.RecyclerView;
 import android.widget.TextView;
 
 import com.android.settings.R;
@@ -36,8 +32,11 @@ 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;
@@ -46,43 +45,66 @@ 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.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;
     private static final String TIME_LEFT = "2h30min";
     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 mBatteryPercentText;
     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);
+        mBatteryPercentText = new TextView(mContext);
         mSummary = new TextView(mContext);
+        ShadowEntityHeaderController.setUseMock(mEntityHeaderController);
+        mSummary2 = new TextView(mContext);
 
         mBatteryIntent = new Intent();
         mBatteryIntent.putExtra(BatteryManager.EXTRA_LEVEL, BATTERY_LEVEL);
         mBatteryIntent.putExtra(BatteryManager.EXTRA_SCALE, 100);
+        mBatteryIntent.putExtra(BatteryManager.EXTRA_PLUGGED, 1);
         doReturn(mBatteryIntent).when(mContext).registerReceiver(any(), any());
 
         mBatteryLayoutPref = new LayoutPreference(mContext, R.layout.battery_header);
@@ -91,10 +113,17 @@ public class BatteryHeaderPreferenceControllerTest {
 
         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.mBatteryPercentText = mBatteryPercentText;
+        mController.mSummary1 = mSummary;
+        mController.mSummary2 = mSummary2;
+    }
+
+    @After
+    public void tearDown() {
+        ShadowEntityHeaderController.reset();
     }
 
     @Test
@@ -137,4 +166,24 @@ public class BatteryHeaderPreferenceControllerTest {
 
         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);
+    }
+
+    @Test
+    public void testQuickUpdateHeaderPreference_showBatteryLevelAndChargingState() {
+        mController.quickUpdateHeaderPreference();
+
+        assertThat(mBatteryMeterView.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
+        assertThat(mBatteryMeterView.getCharging()).isTrue();
+        assertThat(mBatteryPercentText.getText()).isEqualTo("60%");
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
index 5e208a15c1c0167f74488d24123677a5f28059a2..0d03512c8d41899baeea4e47ffc90d22c67d4788 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
@@ -15,6 +15,13 @@
  */
 package com.android.settings.fuelgauge;
 
+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.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.content.Context;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.view.LayoutInflater;
@@ -24,8 +31,8 @@ import android.widget.TextView;
 import com.android.settings.R;
 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,19 +42,15 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-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 {
+    public static final String TEST_STRING = "test";
     @Mock
     private PreferenceViewHolder mViewHolder;
     @Mock
@@ -82,7 +85,29 @@ public class BatteryHistoryPreferenceTest {
         mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
 
         verify(mViewHolder).findViewById(R.id.battery_usage);
-        verify(mTextView).setText(anyString());
+        verify(mTextView).setText(nullable(String.class));
         verify(mBatteryInfo).bindHistory(mUsageView);
     }
+
+    @Test
+    public void testSetBottomSummary_updatesBottomSummaryTextIfSet() {
+        mBatteryHistoryPreference.setBottomSummary(TEST_STRING);
+        mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
+
+        TextView view = (TextView) mViewHolder.findViewById(R.id.bottom_summary);
+        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(view.getText()).isEqualTo(TEST_STRING);
+        assertThat(mBatteryHistoryPreference.hideSummary).isFalse();
+    }
+
+    @Test
+    public void testSetBottomSummary_leavesBottomSummaryTextBlankIfNotSet() {
+        mBatteryHistoryPreference.hideBottomSummary();
+        mBatteryHistoryPreference.onBindViewHolder(mViewHolder);
+
+        TextView view = (TextView) mViewHolder.findViewById(R.id.bottom_summary);
+        assertThat(view.getVisibility()).isEqualTo(View.GONE);
+        assertThat(view.getText()).isEqualTo("");
+        assertThat(mBatteryHistoryPreference.hideSummary).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..796e63c745dacdf563a6ab94fc2afbac3985d4dc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.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.fuelgauge;
+
+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;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.BatteryManager;
+import android.os.BatteryStats;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.BatteryTestUtils;
+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;
+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 BatteryInfoLoaderTest {
+    private static final long TEST_TIME_REMAINING = 1000L;
+
+    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
+    private BatteryStatsHelper mHelper;
+    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
+    private PowerUsageFeatureProvider mProvider;
+    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
+    private BatteryStats mStats;
+
+    private Intent mDisChargingBatteryBroadcast;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        mProvider = FakeFeatureFactory
+                .setupForTest(mContext)
+                .getPowerUsageFeatureProvider(mContext);
+
+        mDisChargingBatteryBroadcast = BatteryTestUtils.getDischargingIntent();
+
+        doReturn(mContext).when(mContext).getApplicationContext();
+        when(mStats.computeBatteryTimeRemaining(anyLong())).thenReturn(TEST_TIME_REMAINING);
+        doReturn(mStats).when(mHelper).getStats();
+        doReturn(mDisChargingBatteryBroadcast).when(mContext).registerReceiver(any(), any());
+    }
+
+    @Test
+    public void test_loadInBackground_dischargingOldEstimate_dischargingLabelNotNull() {
+        BatteryInfoLoader loader = new BatteryInfoLoader(mContext, mHelper);
+
+        BatteryInfo info = loader.loadInBackground();
+
+        assertThat(info.remainingLabel).isNotNull();
+        assertThat(info.remainingTimeUs).isEqualTo(TEST_TIME_REMAINING);
+    }
+}
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 0000000000000000000000000000000000000000..9bd0b6f2d4284b2f2970770ae7b86ac47ee1daea
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -0,0 +1,299 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.ArgumentMatchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doAnswer;
+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 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 android.util.SparseIntArray;
+
+import com.android.settings.TestConfig;
+import com.android.settings.graph.UsageView;
+import com.android.settings.testutils.BatteryTestUtils;
+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;
+import org.mockito.Answers;
+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.concurrent.TimeUnit;
+
+@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 String STATUS_NOT_CHARGING = "Not charging";
+    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";
+    public static final long TEST_CHARGE_TIME_REMAINING = TimeUnit.MINUTES.toMicros(1);
+    public static final String TEST_CHARGE_TIME_REMAINING_STRINGIFIED =
+            "1m left until fully charged";
+    private Intent mDisChargingBatteryBroadcast;
+    private Intent mChargingBatteryBroadcast;
+    private Context mContext;
+    private FakeFeatureFactory mFeatureFactory;
+
+    @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);
+        mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
+
+        mDisChargingBatteryBroadcast = BatteryTestUtils.getDischargingIntent();
+
+        mChargingBatteryBroadcast = BatteryTestUtils.getChargingIntent();
+    }
+
+    @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_NOT_CHARGING);
+    }
+
+    @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);
+    }
+
+    @Test
+    public void testGetBatteryInfo_charging_usesChargeTime() {
+        doReturn(TEST_CHARGE_TIME_REMAINING)
+                .when(mBatteryStats)
+                .computeChargeTimeRemaining(anyLong());
+        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false, 1000, false);
+        assertThat(info.remainingTimeUs).isEqualTo(TEST_CHARGE_TIME_REMAINING);
+        assertThat(info.remainingLabel.toString())
+                .isEqualTo(TEST_CHARGE_TIME_REMAINING_STRINGIFIED);
+    }
+
+    @Test
+    public void testGetBatteryInfo_pluggedInWithFullBattery_onlyShowBatteryLevel() {
+        mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 100);
+
+        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
+                1000, false /* basedOnUsage */);
+
+        assertThat(info.chargeLabel).isEqualTo("100%");
+    }
+
+    // Make our battery stats return a sequence of battery events.
+    private void mockBatteryStatsHistory() {
+        // Mock out new data every time start...Locked is called.
+        doAnswer(invocation -> {
+            doAnswer(new Answer() {
+                private int count = 0;
+                private long[] times = {1000, 1500, 2000};
+                private byte[] levels = {99, 98, 97};
+
+                @Override
+                public Object answer(InvocationOnMock invocation) throws Throwable {
+                    if (count == times.length) {
+                        return false;
+                    }
+                    BatteryStats.HistoryItem record = invocation.getArgument(0);
+                    record.cmd = BatteryStats.HistoryItem.CMD_UPDATE;
+                    record.time = times[count];
+                    record.batteryLevel = levels[count];
+                    count++;
+                    return true;
+                }
+            }).when(mBatteryStats).getNextHistoryLocked(any(BatteryStats.HistoryItem.class));
+            return true;
+        }).when(mBatteryStats).startIteratingHistoryLocked();
+    }
+
+    private void assertOnlyHistory(BatteryInfo info) {
+        mockBatteryStatsHistory();
+        UsageView view = mock(UsageView.class);
+        doReturn(mContext).when(view).getContext();
+
+        info.bindHistory(view);
+        verify(view, times(1)).configureGraph(anyInt(), anyInt());
+        verify(view, times(1)).addPath(any(SparseIntArray.class));
+        verify(view, never()).addProjectedPath(any(SparseIntArray.class));
+    }
+
+    private void assertHistoryAndLinearProjection(BatteryInfo info) {
+        mockBatteryStatsHistory();
+        UsageView view = mock(UsageView.class);
+        doReturn(mContext).when(view).getContext();
+
+        info.bindHistory(view);
+        verify(view, times(2)).configureGraph(anyInt(), anyInt());
+        verify(view, times(1)).addPath(any(SparseIntArray.class));
+        ArgumentCaptor<SparseIntArray> pointsActual = ArgumentCaptor.forClass(SparseIntArray.class);
+        verify(view, times(1)).addProjectedPath(pointsActual.capture());
+
+        // Check that we have two points and the first is correct.
+        assertThat(pointsActual.getValue().size()).isEqualTo(2);
+        assertThat(pointsActual.getValue().keyAt(0)).isEqualTo(2000);
+        assertThat(pointsActual.getValue().valueAt(0)).isEqualTo(97);
+    }
+
+    private void assertHistoryAndEnhancedProjection(BatteryInfo info) {
+        mockBatteryStatsHistory();
+        UsageView view = mock(UsageView.class);
+        doReturn(mContext).when(view).getContext();
+        SparseIntArray pointsExpected = new SparseIntArray();
+        pointsExpected.append(2000, 96);
+        pointsExpected.append(2500, 95);
+        pointsExpected.append(3000, 94);
+        doReturn(pointsExpected).when(mFeatureFactory.powerUsageFeatureProvider)
+                .getEnhancedBatteryPredictionCurve(any(Context.class), anyLong());
+
+        info.bindHistory(view);
+        verify(view, times(2)).configureGraph(anyInt(), anyInt());
+        verify(view, times(1)).addPath(any(SparseIntArray.class));
+        ArgumentCaptor<SparseIntArray> pointsActual = ArgumentCaptor.forClass(SparseIntArray.class);
+        verify(view, times(1)).addProjectedPath(pointsActual.capture());
+        assertThat(pointsActual.getValue()).isEqualTo(pointsExpected);
+    }
+
+    private BatteryInfo getBatteryInfo(boolean charging, boolean enhanced, boolean estimate) {
+        if (charging && estimate) {
+            doReturn(1000L).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
+        } else {
+            doReturn(0L).when(mBatteryStats).computeChargeTimeRemaining(anyLong());
+        }
+        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext,
+                charging ? mChargingBatteryBroadcast : mDisChargingBatteryBroadcast,
+                mBatteryStats, SystemClock.elapsedRealtime() * 1000, false,
+                estimate ? 1000 : 0 /* drainTimeUs */, false);
+        doReturn(enhanced).when(mFeatureFactory.powerUsageFeatureProvider)
+                .isEnhancedBatteryPredictionEnabled(mContext);
+        return info;
+    }
+
+    @Test
+    public void testBindHistory() {
+        BatteryInfo info;
+
+        info = getBatteryInfo(false /* charging */, false /* enhanced */, false /* estimate */);
+        assertOnlyHistory(info);
+
+        info = getBatteryInfo(false /* charging */, false /* enhanced */, true /* estimate */);
+        assertHistoryAndLinearProjection(info);
+
+        info = getBatteryInfo(false /* charging */, true /* enhanced */, false /* estimate */);
+        assertOnlyHistory(info);
+
+        info = getBatteryInfo(false /* charging */, true /* enhanced */, true /* estimate */);
+        assertHistoryAndEnhancedProjection(info);
+
+        info = getBatteryInfo(true /* charging */, false /* enhanced */, false /* estimate */);
+        assertOnlyHistory(info);
+
+        info = getBatteryInfo(true /* charging */, false /* enhanced */, true /* estimate */);
+        assertHistoryAndLinearProjection(info);
+
+        info = getBatteryInfo(true /* charging */, true /* enhanced */, false /* estimate */);
+        assertOnlyHistory(info);
+
+        // Linear projection for charging even in enhanced mode.
+        info = getBatteryInfo(true /* charging */, true /* enhanced */, true /* estimate */);
+        assertHistoryAndLinearProjection(info);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
index b3afbb42f0624a05a0f90e050c47db8893589395..77e3198661ee518db1fba59798b2cb90b6571a62 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 @@ package com.android.settings.fuelgauge;
 
 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 @@ public class BatteryOptimizationPreferenceControllerTest {
         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 @@ public class BatteryOptimizationPreferenceControllerTest {
         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 afa965a4757506f71e580b801ddc4e21d24beaa1..c75a6a6377ea13edb43056d23af8e2c291e4cd83 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
@@ -17,10 +17,12 @@ package com.android.settings.fuelgauge;
 
 import android.content.Context;
 import android.os.PowerManager;
+
 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;
@@ -77,6 +79,20 @@ public class BatterySaverControllerTest {
         testUpdateStateInner(false);
     }
 
+    @Test
+    public void testOnBatteryChanged_pluggedIn_setDisable() {
+        mBatterySaverController.onBatteryChanged(true /* pluggedIn */);
+
+        verify(mBatterySaverPref).setSwitchEnabled(false);
+    }
+
+    @Test
+    public void testOnBatteryChanged_notPluggedIn_setEnable() {
+        mBatterySaverController.onBatteryChanged(false /* pluggedIn */);
+
+        verify(mBatterySaverPref).setSwitchEnabled(true);
+    }
+
     private void testOnPreferenceChangeInner(final boolean saverOn) {
         when(mPowerManager.setPowerSaveMode(saverOn)).thenReturn(true);
         when(mPowerManager.isPowerSaveMode()).thenReturn(!saverOn);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..259bcd29656ce0736ca48734c9f7d791779db05c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverReceiverTest.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;
+
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.BatteryManager;
+import android.os.PowerManager;
+
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class BatterySaverReceiverTest {
+    @Mock
+    private BatterySaverReceiver.BatterySaverListener mBatterySaverListener;
+    @Mock
+    private Context mContext;
+    private BatterySaverReceiver mBatterySaverReceiver;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mBatterySaverReceiver = new BatterySaverReceiver(mContext);
+        mBatterySaverReceiver.setBatterySaverListener(mBatterySaverListener);
+    }
+
+    @Test
+    public void testOnReceive_devicePluggedIn_pluggedInTrue() {
+        Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
+        intent.putExtra(BatteryManager.EXTRA_PLUGGED, BatteryManager.BATTERY_PLUGGED_AC);
+
+        mBatterySaverReceiver.onReceive(mContext, intent);
+
+        verify(mBatterySaverListener).onBatteryChanged(true);
+    }
+
+    @Test
+    public void testOnReceive_deviceNotPluggedIn_pluggedInFalse() {
+        Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
+        intent.putExtra(BatteryManager.EXTRA_PLUGGED, 0);
+
+        mBatterySaverReceiver.onReceive(mContext, intent);
+
+        verify(mBatterySaverListener).onBatteryChanged(false);
+    }
+
+    @Test
+    public void testOnReceive_powerSaveModeChanged_invokeCallback() {
+        Intent intent = new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGING);
+
+        mBatterySaverReceiver.onReceive(mContext, intent);
+
+        verify(mBatterySaverListener).onPowerSaveModeChanged();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1e173a2ba52ea02af6c29b189afdaa6c8b90fa1c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverSettingsTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.widget.SwitchBar;
+
+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 BatterySaverSettingsTest {
+    private Context mContext;
+    private BatterySaverSettings mBatterySaverSettings;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mBatterySaverSettings = new BatterySaverSettings();
+        mBatterySaverSettings.mSwitchBar = new SwitchBar(mContext);
+    }
+
+    @Test
+    public void testOnBatteryChanged_pluggedIn_setDisable() {
+        mBatterySaverSettings.onBatteryChanged(true /* pluggedIn */);
+
+        assertThat(mBatterySaverSettings.mSwitchBar.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void testOnBatteryChanged_notPluggedIn_setEnable() {
+        mBatterySaverSettings.onBatteryChanged(false /* pluggedIn */);
+
+        assertThat(mBatterySaverSettings.mSwitchBar.isEnabled()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
index 048ad3f08e8722b43659134a3ddfa956af5c6dd3..5f8d7cfc244bef6406c1de7fd7cede1dd9cffe15 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryStatsHelperLoaderTest.java
@@ -15,52 +15,54 @@
  */
 package com.android.settings.fuelgauge;
 
+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 android.content.Context;
-import android.os.BatteryStats;
-import android.os.Bundle;
-import android.os.UserManager;
+import android.net.ConnectivityManager;
 
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+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.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class BatteryStatsHelperLoaderTest {
     @Mock
-    private BatteryStatsHelper mBatteryStatsHelper;
-    @Mock
-    private Bundle mBundle;
+    private BatteryUtils mBatteryUtils;
     @Mock
+    private ConnectivityManager mConnectivityManager;
+
     private Context mContext;
-    @Mock
-    private UserManager mUserManager;
-    private BatteryStatsHelperLoader mLoader;
+    private BatteryStatsHelperLoader mBatteryStatsHelperLoader;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mConnectivityManager).when(mContext).getSystemService(
+                Context.CONNECTIVITY_SERVICE);
 
-        mLoader = new BatteryStatsHelperLoader(mContext, mBundle);
-        mLoader.mUserManager = mUserManager;
+        mBatteryStatsHelperLoader = spy(new BatteryStatsHelperLoader(mContext));
+        mBatteryStatsHelperLoader.mBatteryUtils = mBatteryUtils;
     }
 
     @Test
-    public void testInitBatteryStatsHelper_init() {
-        mLoader.initBatteryStatsHelper(mBatteryStatsHelper);
+    public void testLoadInBackground_loadWithoutBundle() {
+        doReturn(mContext).when(mBatteryStatsHelperLoader).getContext();
+        mBatteryStatsHelperLoader.loadInBackground();
 
-        verify(mBatteryStatsHelper).create(mBundle);
-        verify(mBatteryStatsHelper).refreshStats(BatteryStats.STATS_SINCE_CHARGED,
-                mUserManager.getUserProfiles());
+        verify(mBatteryUtils).initBatteryStatsHelper(any(), eq(null), any());
     }
+
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index c8e7ec209dcca2f318fe7f93c2687cf4c6da1924..aa19055f1b7b530cb2268d8134f0421b82eec590 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -15,13 +15,22 @@
  */
 package com.android.settings.fuelgauge;
 
+import android.app.AppOpsManager;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.os.BatteryStats;
+import android.os.Bundle;
+import android.os.Build;
 import android.os.Process;
+import android.os.SystemClock;
+import android.os.UserManager;
 import android.text.format.DateUtils;
 
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.R;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.FakeFeatureFactory;
@@ -53,7 +62,9 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.spy;
 
@@ -67,15 +78,18 @@ public class BatteryUtilsTest {
     private static final long TIME_STATE_TOP_SLEEPING = 2500 * UNIT;
     private static final long TIME_STATE_FOREGROUND = 3000 * UNIT;
     private static final long TIME_STATE_BACKGROUND = 6000 * UNIT;
-    private static final long TIME_FOREGROUND_ACTIVITY_ZERO = 0;
-    private static final long TIME_FOREGROUND_ACTIVITY = 100 * DateUtils.MINUTE_IN_MILLIS;
+    private static final long TIME_FOREGROUND_ZERO = 0;
+    private static final long TIME_FOREGROUND = 100 * DateUtils.MINUTE_IN_MILLIS;
     private static final long TIME_SINCE_LAST_FULL_CHARGE_MS = 120 * 60 * 1000;
+    private static final long TIME_SINCE_LAST_FULL_CHARGE_US =
+            TIME_SINCE_LAST_FULL_CHARGE_MS * 1000;
 
     private static final int UID = 123;
     private static final long TIME_EXPECTED_FOREGROUND = 1500;
     private static final long TIME_EXPECTED_BACKGROUND = 6000;
     private static final long TIME_EXPECTED_ALL = 7500;
     private static final double BATTERY_SCREEN_USAGE = 300;
+    private static final double BATTERY_IDLE_USAGE = 600;
     private static final double BATTERY_SYSTEM_USAGE = 600;
     private static final double BATTERY_OVERACCOUNTED_USAGE = 500;
     private static final double BATTERY_UNACCOUNTED_USAGE = 700;
@@ -87,10 +101,14 @@ public class BatteryUtilsTest {
     private static final int DISCHARGE_AMOUNT = 80;
     private static final double PERCENT_SYSTEM_USAGE = 60;
     private static final double PRECISION = 0.001;
+    private static final int SDK_VERSION = Build.VERSION_CODES.L;
+    private static final String PACKAGE_NAME = "com.android.app";
 
     @Mock
     private BatteryStats.Uid mUid;
     @Mock
+    private BatteryStats.Timer mTimer;
+    @Mock
     private BatterySipper mNormalBatterySipper;
     @Mock
     private BatterySipper mWifiBatterySipper;
@@ -106,6 +124,18 @@ public class BatteryUtilsTest {
     private BatterySipper mSystemBatterySipper;
     @Mock
     private BatterySipper mCellBatterySipper;
+    @Mock
+    private BatterySipper mIdleBatterySipper;
+    @Mock
+    private Bundle mBundle;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private AppOpsManager mAppOpsManager;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -132,6 +162,8 @@ public class BatteryUtilsTest {
                 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;
@@ -155,14 +187,21 @@ public class BatteryUtilsTest {
         mUnaccountedBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
         mUnaccountedBatterySipper.totalPowerMah = BATTERY_UNACCOUNTED_USAGE;
 
-        mBatteryUtils = BatteryUtils.getInstance(RuntimeEnvironment.application);
-        mBatteryUtils.mPowerUsageFeatureProvider = mProvider;
+        mIdleBatterySipper.drainType = BatterySipper.DrainType.IDLE;
+        mIdleBatterySipper.totalPowerMah = BATTERY_IDLE_USAGE;
 
-        mBatteryUtils = spy(new BatteryUtils(RuntimeEnvironment.application));
+        final Context shadowContext = spy(RuntimeEnvironment.application);
+        doReturn(mPackageManager).when(shadowContext).getPackageManager();
+        doReturn(mAppOpsManager).when(shadowContext).getSystemService(Context.APP_OPS_SERVICE);
+        mBatteryUtils = spy(new BatteryUtils(shadowContext));
+        mBatteryUtils.mPowerUsageFeatureProvider = mProvider;
     }
 
     @Test
     public void testGetProcessTimeMs_typeForeground_timeCorrect() {
+        doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils).getForegroundActivityTotalTimeUs(
+                eq(mUid), anyLong());
+
         final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.FOREGROUND, mUid,
                 BatteryStats.STATS_SINCE_CHARGED);
 
@@ -179,6 +218,9 @@ public class BatteryUtilsTest {
 
     @Test
     public void testGetProcessTimeMs_typeAll_timeCorrect() {
+        doReturn(TIME_STATE_FOREGROUND + 500).when(mBatteryUtils).getForegroundActivityTotalTimeUs(
+                eq(mUid), anyLong());
+
         final long time = mBatteryUtils.getProcessTimeMs(BatteryUtils.StatusType.ALL, mUid,
                 BatteryStats.STATS_SINCE_CHARGED);
 
@@ -203,6 +245,7 @@ public class BatteryUtilsTest {
         sippers.add(mUnaccountedBatterySipper);
         sippers.add(mWifiBatterySipper);
         sippers.add(mBluetoothBatterySipper);
+        sippers.add(mIdleBatterySipper);
         when(mProvider.isTypeSystem(mSystemBatterySipper))
                 .thenReturn(true);
         doNothing().when(mBatteryUtils).smearScreenBatterySipper(any(), any());
@@ -288,24 +331,35 @@ public class BatteryUtilsTest {
 
     @Test
     public void testSmearScreenBatterySipper() {
-        final BatterySipper sipperNull = createTestSmearBatterySipper(TIME_FOREGROUND_ACTIVITY_ZERO,
+        final BatterySipper sipperNull = createTestSmearBatterySipper(TIME_FOREGROUND_ZERO,
                 BATTERY_APP_USAGE, 0 /* uid */, true /* isUidNull */);
-        final BatterySipper sipperBg = createTestSmearBatterySipper(TIME_FOREGROUND_ACTIVITY_ZERO,
+        final BatterySipper sipperBg = createTestSmearBatterySipper(TIME_FOREGROUND_ZERO,
                 BATTERY_APP_USAGE, 1 /* uid */, false /* isUidNull */);
-        final BatterySipper sipperFg = createTestSmearBatterySipper(TIME_FOREGROUND_ACTIVITY,
+        final BatterySipper sipperFg = createTestSmearBatterySipper(TIME_FOREGROUND,
                 BATTERY_APP_USAGE, 2 /* uid */, false /* isUidNull */);
+        final BatterySipper sipperFg2 = createTestSmearBatterySipper(TIME_FOREGROUND,
+                BATTERY_APP_USAGE, 3 /* uid */, false /* isUidNull */);
 
         final List<BatterySipper> sippers = new ArrayList<>();
         sippers.add(sipperNull);
         sippers.add(sipperBg);
         sippers.add(sipperFg);
+        sippers.add(sipperFg2);
 
         mBatteryUtils.smearScreenBatterySipper(sippers, mScreenBatterySipper);
 
         assertThat(sipperNull.totalPowerMah).isWithin(PRECISION).of(BATTERY_APP_USAGE);
         assertThat(sipperBg.totalPowerMah).isWithin(PRECISION).of(BATTERY_APP_USAGE);
         assertThat(sipperFg.totalPowerMah).isWithin(PRECISION).of(
-                BATTERY_APP_USAGE + BATTERY_SCREEN_USAGE);
+                BATTERY_APP_USAGE + BATTERY_SCREEN_USAGE / 2);
+        assertThat(sipperFg2.totalPowerMah).isWithin(PRECISION).of(
+                BATTERY_APP_USAGE + BATTERY_SCREEN_USAGE / 2);
+    }
+
+    @Test
+    public void testCalculateRunningTimeBasedOnStatsType() {
+        assertThat(mBatteryUtils.calculateRunningTimeBasedOnStatsType(mBatteryStatsHelper,
+                BatteryStats.STATS_SINCE_CHARGED)).isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_MS);
     }
 
     @Test
@@ -331,20 +385,88 @@ public class BatteryUtilsTest {
                 mBatteryStatsHelper, currentTimeMs)).isEqualTo(TIME_SINCE_LAST_FULL_CHARGE_MS);
     }
 
-    private BatterySipper createTestSmearBatterySipper(long activityTime, double totalPowerMah,
-            int uidCode, boolean isUidNull) {
+    @Test
+    public void testGetSummaryResIdFromAnomalyType() {
+        assertThat(mBatteryUtils.getSummaryResIdFromAnomalyType(Anomaly.AnomalyType.WAKE_LOCK))
+                .isEqualTo(R.string.battery_abnormal_wakelock_summary);
+        assertThat(mBatteryUtils.getSummaryResIdFromAnomalyType(Anomaly.AnomalyType.WAKEUP_ALARM))
+                .isEqualTo(R.string.battery_abnormal_wakeup_alarm_summary);
+        assertThat(mBatteryUtils.getSummaryResIdFromAnomalyType(Anomaly.AnomalyType.BLUETOOTH_SCAN))
+                .isEqualTo(R.string.battery_abnormal_location_summary);
+    }
+
+    @Test
+    public void testGetForegroundActivityTotalTimeMs_returnMilliseconds() {
+        final long rawRealtimeUs = SystemClock.elapsedRealtime() * 1000;
+        doReturn(mTimer).when(mUid).getForegroundActivityTimer();
+        doReturn(TIME_SINCE_LAST_FULL_CHARGE_US).when(mTimer)
+                .getTotalTimeLocked(rawRealtimeUs, BatteryStats.STATS_SINCE_CHARGED);
+
+        assertThat(mBatteryUtils.getForegroundActivityTotalTimeUs(mUid, rawRealtimeUs)).isEqualTo(
+                TIME_SINCE_LAST_FULL_CHARGE_US);
+    }
+
+    @Test
+    public void testGetTargetSdkVersion_packageExist_returnSdk() throws
+            PackageManager.NameNotFoundException {
+        doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
+                PackageManager.GET_META_DATA);
+        mApplicationInfo.targetSdkVersion = SDK_VERSION;
+
+        assertThat(mBatteryUtils.getTargetSdkVersion(PACKAGE_NAME)).isEqualTo(SDK_VERSION);
+    }
+
+    @Test
+    public void testGetTargetSdkVersion_packageNotExist_returnSdkNull() throws
+            PackageManager.NameNotFoundException {
+        doThrow(new PackageManager.NameNotFoundException()).when(
+                mPackageManager).getApplicationInfo(PACKAGE_NAME, PackageManager.GET_META_DATA);
+
+        assertThat(mBatteryUtils.getTargetSdkVersion(PACKAGE_NAME)).isEqualTo(
+                BatteryUtils.SDK_NULL);
+    }
+
+    @Test
+    public void testBackgroundRestrictionOn_restrictionOn_returnTrue() {
+        doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager).checkOpNoThrow(
+                AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME);
+
+        assertThat(mBatteryUtils.isBackgroundRestrictionEnabled(SDK_VERSION, UID,
+                PACKAGE_NAME)).isTrue();
+    }
+
+    @Test
+    public void testBackgroundRestrictionOn_restrictionOff_returnFalse() {
+        doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager).checkOpNoThrow(
+                AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME);
+
+        assertThat(mBatteryUtils.isBackgroundRestrictionEnabled(SDK_VERSION, UID,
+                PACKAGE_NAME)).isFalse();
+    }
+
+    private BatterySipper createTestSmearBatterySipper(long topTime,
+            double totalPowerMah, int uidCode, boolean isUidNull) {
         final BatterySipper sipper = mock(BatterySipper.class);
         sipper.drainType = BatterySipper.DrainType.APP;
         sipper.totalPowerMah = totalPowerMah;
         doReturn(uidCode).when(sipper).getUid();
         if (!isUidNull) {
             final BatteryStats.Uid uid = mock(BatteryStats.Uid.class, RETURNS_DEEP_STUBS);
-            doReturn(activityTime).when(mBatteryUtils).getForegroundActivityTotalTimeMs(eq(uid),
-                    anyLong());
+            doReturn(topTime).when(mBatteryUtils).getProcessTimeMs(
+                    eq(BatteryUtils.StatusType.FOREGROUND), eq(uid), anyInt());
             doReturn(uidCode).when(uid).getUid();
             sipper.uidObj = uid;
         }
 
         return sipper;
     }
+
+    @Test
+    public void testInitBatteryStatsHelper_init() {
+        mBatteryUtils.initBatteryStatsHelper(mBatteryStatsHelper, mBundle, mUserManager);
+
+        verify(mBatteryStatsHelper).create(mBundle);
+        verify(mBatteryStatsHelper).refreshStats(BatteryStats.STATS_SINCE_CHARGED,
+                mUserManager.getUserProfiles());
+    }
 }
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 0000000000000000000000000000000000000000..806acf37737e3ccfb0c87afbdc42cbf3793f839a
--- /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 8831a6c479142fa01c4c9341670290ab89ec6ea0..bf89caca1ee6a56820f64dc51b38913a91c14de2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -20,22 +20,28 @@ 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.Matchers.isNull;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.UserManager;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceGroup;
 import android.support.v7.preference.PreferenceManager;
 
+import android.view.View;
 import com.android.internal.os.BatterySipper;
 import com.android.internal.os.BatterySipper.DrainType;
 import com.android.internal.os.BatteryStatsHelper;
 import com.android.settings.R;
+import com.android.settings.testutils.BatteryTestUtils;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.Utils;
@@ -81,14 +87,19 @@ public class PowerUsageAdvancedTest {
     private PackageManager mPackageManager;
     @Mock
     private UserManager mUserManager;
+    @Mock
+    private BatteryHistoryPreference mHistPref;
+    @Mock
+    private PreferenceGroup mUsageListGroup;
     private PowerUsageAdvanced mPowerUsageAdvanced;
     private PowerUsageData mPowerUsageData;
     private Context mShadowContext;
+    private Intent mDischargingBatteryIntent;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mShadowContext = RuntimeEnvironment.application;
+        mShadowContext = spy(RuntimeEnvironment.application);
         mPowerUsageAdvanced = spy(new PowerUsageAdvanced());
 
         List<BatterySipper> batterySippers = new ArrayList<>();
@@ -101,6 +112,8 @@ public class PowerUsageAdvancedTest {
         batterySippers.add(new BatterySipper(DrainType.WIFI, new FakeUid(FAKE_UID_1),
                 TYPE_WIFI_USAGE));
 
+        mDischargingBatteryIntent = BatteryTestUtils.getDischargingIntent();
+        doReturn(mDischargingBatteryIntent).when(mShadowContext).registerReceiver(any(), any());
         when(mBatteryStatsHelper.getStats().getDischargeAmount(anyInt())).thenReturn(
                 DISCHARGE_AMOUNT);
         when(mBatteryStatsHelper.getUsageList()).thenReturn(batterySippers);
@@ -115,7 +128,7 @@ public class PowerUsageAdvancedTest {
         mPowerUsageAdvanced.setUserManager(mUserManager);
         mPowerUsageAdvanced.setBatteryUtils(BatteryUtils.getInstance(mShadowContext));
 
-        mPowerUsageData = new PowerUsageData(UsageType.APP);
+        mPowerUsageData = new PowerUsageData(UsageType.SYSTEM);
         mMaxBatterySipper.totalPowerMah = TYPE_BLUETOOTH_USAGE;
         mMaxBatterySipper.drainType = DrainType.BLUETOOTH;
         mNormalBatterySipper.drainType = DrainType.SCREEN;
@@ -320,9 +333,16 @@ public class PowerUsageAdvancedTest {
     }
 
     @Test
-    public void testShouldHideSummary_typeNormal_returnFalse() {
+    public void testShouldHideSummary_typeApp_returnTrue() {
         mPowerUsageData.usageType = UsageType.APP;
 
+        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
+    }
+
+    @Test
+    public void testShouldHideSummary_typeNormal_returnFalse() {
+        mPowerUsageData.usageType = UsageType.SYSTEM;
+
         assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isFalse();
     }
 
@@ -352,4 +372,26 @@ public class PowerUsageAdvancedTest {
         assertThat(mPowerUsageAdvanced.calculateHiddenPower(powerUsageDataList)).isWithin(
                 PRECISION).of(unaccountedPower);
     }
+
+    @Test
+    public void testRefreshUi_addsSubtextWhenAppropriate() {
+        // Mock out all the battery stuff
+        mPowerUsageAdvanced.mHistPref = mHistPref;
+        mPowerUsageAdvanced.mStatsHelper = mBatteryStatsHelper;
+        doReturn(new ArrayList<PowerUsageData>())
+                .when(mPowerUsageAdvanced).parsePowerUsageData(any());
+        doReturn("").when(mPowerUsageAdvanced).getString(anyInt());
+        mPowerUsageAdvanced.mUsageListGroup = mUsageListGroup;
+
+        // refresh the ui and check that text was not updated when enhanced prediction disabled
+        when(mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(any()))
+                .thenReturn(false);
+        mPowerUsageAdvanced.refreshUi();
+        verify(mHistPref, never()).setBottomSummary(any());
+
+        // refresh the ui and check that text was updated when enhanced prediction enabled
+        when(mPowerUsageFeatureProvider.isEnhancedBatteryPredictionEnabled(any())).thenReturn(true);
+        mPowerUsageAdvanced.refreshUi();
+        verify(mHistPref, atLeastOnce()).setBottomSummary(any());
+    }
 }
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 0000000000000000000000000000000000000000..c992d0aef6380e17f4dfd70401739233ff2c4a01
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.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.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.Matchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+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.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceManager;
+import android.util.IconDrawableFactory;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+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 NAME_APP_3 = "app3";
+    private static final String PACKAGE_NAME_1 = "com.android.app1";
+    private static final String PACKAGE_NAME_2 = "com.android.app2";
+    private static final String PACKAGE_NAME_3 = "com.android.app3";
+    private static final int USER_ID = 1;
+
+    @Mock
+    private SettingsActivity mSettingsActivity;
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private Drawable mDrawable1;
+    @Mock
+    private Drawable mDrawable2;
+    @Mock
+    private Drawable mDrawable3;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private IconDrawableFactory mIconDrawableFactory;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
+    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.WAKEUP_ALARM)
+                .setPackageName(PACKAGE_NAME_2)
+                .setDisplayName(NAME_APP_2)
+                .build();
+        mAnomalyList.add(anomaly2);
+        Anomaly anomaly3 = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
+                .setPackageName(PACKAGE_NAME_3)
+                .setDisplayName(NAME_APP_3)
+                .build();
+        mAnomalyList.add(anomaly3);
+
+        mFragment = spy(new PowerUsageAnomalyDetails());
+        mFragment.mAbnormalListGroup = mAbnormalListGroup;
+        mFragment.mAnomalies = mAnomalyList;
+        mFragment.mBatteryUtils = new BatteryUtils(mContext);
+        mFragment.mPackageManager = mPackageManager;
+        mFragment.mIconDrawableFactory = mIconDrawableFactory;
+        doReturn(mPreferenceManager).when(mFragment).getPreferenceManager();
+        doReturn(mContext).when(mPreferenceManager).getContext();
+    }
+
+    @Test
+    public void testRefreshUi_displayCorrectTitleAndSummary() {
+        final List<Preference> testPreferences = new ArrayList<>();
+        final ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(
+                Preference.class);
+        Answer<Void> prefCallable = new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                testPreferences.add(preferenceCaptor.getValue());
+                return null;
+            }
+        };
+        doAnswer(prefCallable).when(mAbnormalListGroup).addPreference(preferenceCaptor.capture());
+
+        mFragment.refreshUi();
+
+        final Preference wakelockPreference = testPreferences.get(0);
+        assertThat(wakelockPreference.getTitle()).isEqualTo(NAME_APP_1);
+        assertThat(wakelockPreference.getSummary()).isEqualTo("Keeping device awake");
+        final Preference wakeupPreference = testPreferences.get(1);
+        assertThat(wakeupPreference.getTitle()).isEqualTo(NAME_APP_2);
+        assertThat(wakeupPreference.getSummary()).isEqualTo("Waking up device in background");
+        final Preference bluetoothPreference = testPreferences.get(2);
+        assertThat(bluetoothPreference.getTitle()).isEqualTo(NAME_APP_3);
+        assertThat(bluetoothPreference.getSummary()).isEqualTo("Requesting location frequently");
+    }
+
+    @Test
+    public void testRefreshUi_iconCorrect() {
+        doReturn(mDrawable1).when(mFragment).getBadgedIcon(eq(PACKAGE_NAME_1), anyInt());
+        doReturn(mDrawable2).when(mFragment).getBadgedIcon(eq(PACKAGE_NAME_2), anyInt());
+        doReturn(mDrawable3).when(mFragment).getBadgedIcon(eq(PACKAGE_NAME_3), anyInt());
+
+        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, mDrawable3);
+    }
+
+    @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);
+    }
+
+    @Test
+    public void testGetBadgedIcon_usePackageNameAndUserId() throws
+            PackageManager.NameNotFoundException {
+        doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME_1,
+                PackageManager.GET_META_DATA);
+
+        mFragment.getBadgedIcon(PACKAGE_NAME_1, USER_ID);
+
+        // Verify that it uses the correct user id
+        verify(mIconDrawableFactory).getBadgedIcon(mApplicationInfo, USER_ID);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index d60cd0da7ffcc49633c38a08f1f8dcb115b2864b..d76d64b89f12035c752728773e310bcb6bc17686 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -15,16 +15,40 @@
  */
 package com.android.settings.fuelgauge;
 
+import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADDITIONAL_BATTERY_INFO;
+import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_HIGH_POWER_APPS;
+import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_TOGGLE_APPS;
+
+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.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.LoaderManager;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.PowerManager;
+import android.support.v7.preference.PreferenceGroup;
 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;
+import android.view.View;
 import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -33,45 +57,32 @@ import com.android.internal.os.BatteryStatsHelper;
 import com.android.internal.os.BatteryStatsImpl;
 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.Utils;
 import com.android.settings.applications.LayoutPreference;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.XmlTestUtils;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settings.testutils.shadow.ShadowDynamicIndexableContentMonitor;
-import com.android.settings.testutils.XmlTestUtils;
 
 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.Robolectric;
 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;
-import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_TOGGLE_APPS;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  * Unit tests for {@link PowerUsageSummary}.
  */
@@ -88,6 +99,7 @@ public class PowerUsageSummaryTest {
     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 =
@@ -102,6 +114,8 @@ public class PowerUsageSummaryTest {
     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;
@@ -134,7 +148,17 @@ public class PowerUsageSummaryTest {
     @Mock
     private SettingsActivity mSettingsActivity;
     @Mock
+    private LoaderManager mLoaderManager;
+    @Mock
+    private ContentResolver mContentResolver;
+    @Mock
     private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PreferenceGroup mAppListGroup;
+    @Mock
+    private AnomalyDetectionPolicy mAnomalyDetectionPolicy;
+    @Mock
+    private BatteryHeaderPreferenceController mBatteryHeaderPreferenceController;
 
     private List<BatterySipper> mUsageList;
     private Context mRealContext;
@@ -144,6 +168,7 @@ public class PowerUsageSummaryTest {
     private PowerGaugePreference mPreference;
     private PowerGaugePreference mScreenUsagePref;
     private PowerGaugePreference mLastFullChargePref;
+    private SparseArray<List<Anomaly>> mAnomalySparseArray;
 
     @Before
     public void setUp() {
@@ -162,6 +187,7 @@ public class PowerUsageSummaryTest {
         mBatteryMeterView = new BatteryMeterView(mRealContext);
         mBatteryMeterView.mDrawable = new BatteryMeterView.BatteryMeterDrawable(mRealContext, 0);
         doNothing().when(mFragment).restartBatteryStatsLoader();
+        doReturn(mock(LoaderManager.class)).when(mFragment).getLoaderManager();
 
         when(mFragment.getActivity()).thenReturn(mSettingsActivity);
         when(mAdditionalBatteryInfoMenu.getItemId())
@@ -201,6 +227,7 @@ public class PowerUsageSummaryTest {
         mFragment.mScreenUsagePref = mScreenUsagePref;
         mFragment.mLastFullChargePref = mLastFullChargePref;
         mFragment.mBatteryUtils = spy(new BatteryUtils(mRealContext));
+        mFragment.mAppListGroup = mAppListGroup;
     }
 
     @Test
@@ -313,11 +340,10 @@ public class PowerUsageSummaryTest {
         doReturn(mRealContext.getText(R.string.battery_screen_usage)).when(mFragment).getText(
                 R.string.battery_screen_usage);
         doReturn(mRealContext).when(mFragment).getContext();
-        final String expectedSummary = "Screen usage 2m";
 
         mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
 
-        assertThat(mPreference.getSummary().toString()).isEqualTo(expectedSummary);
+        assertThat(mPreference.getSummary().toString()).isEqualTo("Screen usage 2m");
     }
 
     @Test
@@ -325,11 +351,21 @@ public class PowerUsageSummaryTest {
         mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
         doReturn(true).when(mFragment.mBatteryUtils).shouldHideSipper(mNormalBatterySipper);
         doReturn(mRealContext).when(mFragment).getContext();
-        final String expectedSummary = "2m";
 
         mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
 
-        assertThat(mPreference.getSummary().toString()).isEqualTo(expectedSummary);
+        assertThat(mPreference.getSummary().toString()).isEqualTo("2m");
+    }
+
+    @Test
+    public void testSetUsageSummary_timeMoreThanOneMinute_notApp_setUsedSummary() {
+        mNormalBatterySipper.usageTimeMs = 2 * DateUtils.MINUTE_IN_MILLIS;
+        mNormalBatterySipper.drainType = BatterySipper.DrainType.PHONE;
+        doReturn(mRealContext).when(mFragment).getContext();
+
+        mFragment.setUsageSummary(mPreference, mNormalBatterySipper);
+
+        assertThat(mPreference.getSummary().toString()).isEqualTo("2m");
     }
 
     private void testToggleAllApps(final boolean isShowApps) {
@@ -399,12 +435,6 @@ public class PowerUsageSummaryTest {
         assertThat(percent).isWithin(PRECISION).of(POWER_USAGE_PERCENTAGE);
     }
 
-    @Test
-    public void testCalculateRunningTimeBasedOnStatsType() {
-        assertThat(mFragment.calculateRunningTimeBasedOnStatsType()).isEqualTo(
-                TIME_SINCE_LAST_FULL_CHARGE_MS);
-    }
-
     @Test
     public void testNonIndexableKeys_MatchPreferenceKeys() {
         final Context context = RuntimeEnvironment.application;
@@ -432,6 +462,47 @@ public class PowerUsageSummaryTest {
         assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
     }
 
+    @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() {
+        doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+        doReturn(mAnomalyDetectionPolicy).when(mFragment).getAnomalyDetectionPolicy();
+        when(mAnomalyDetectionPolicy.isAnomalyDetectionEnabled()).thenReturn(true);
+
+        mFragment.restartAnomalyDetectionIfPossible();
+
+        verify(mLoaderManager).restartLoader(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();
@@ -444,6 +515,68 @@ public class PowerUsageSummaryTest {
         assertThat(mFragment.mShowAllApps).isTrue();
     }
 
+    @Test
+    public void testRefreshAnomalyIcon_containsAnomaly_showAnomalyIcon() {
+        PowerGaugePreference preference = new PowerGaugePreference(mRealContext);
+        final String key = mFragment.extractKeyFromUid(UID);
+        preference.setKey(key);
+        doReturn(preference).when(mAppListGroup).findPreference(key);
+        mFragment.mAnomalySparseArray = new SparseArray<>();
+        mFragment.mAnomalySparseArray.append(UID, null);
+
+        mFragment.refreshAnomalyIcon();
+
+        assertThat(preference.showAnomalyIcon()).isTrue();
+    }
+
+    @Test
+    public void testShouldHideSipper_typeOvercounted_returnTrue() {
+        mNormalBatterySipper.drainType = BatterySipper.DrainType.OVERCOUNTED;
+
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    }
+
+    @Test
+    public void testShouldHideSipper_typeUnaccounted_returnTrue() {
+        mNormalBatterySipper.drainType = BatterySipper.DrainType.UNACCOUNTED;
+
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isTrue();
+    }
+
+    @Test
+    public void testShouldHideSipper_typeNormal_returnFalse() {
+        mNormalBatterySipper.drainType = BatterySipper.DrainType.APP;
+
+        assertThat(mFragment.shouldHideSipper(mNormalBatterySipper)).isFalse();
+    }
+
+    @Test
+    public void testDebugMode() {
+        doReturn(true).when(mFeatureFactory.powerUsageFeatureProvider).isEstimateDebugEnabled();
+
+        mFragment.restartBatteryInfoLoader();
+        ArgumentCaptor<View.OnLongClickListener> listener = ArgumentCaptor.forClass(
+                View.OnLongClickListener.class);
+        verify(mSummary1).setOnLongClickListener(listener.capture());
+
+        // Calling the listener should disable it.
+        listener.getValue().onLongClick(mSummary1);
+        verify(mSummary1).setOnLongClickListener(null);
+
+        // Restarting the loader should reset the listener.
+        mFragment.restartBatteryInfoLoader();
+        verify(mSummary1, times(2)).setOnLongClickListener(any(View.OnLongClickListener.class));
+    }
+
+    @Test
+    public void testRestartBatteryStatsLoader_notClearHeader_quickUpdateNotInvoked() {
+        mFragment.mBatteryHeaderPreferenceController = mBatteryHeaderPreferenceController;
+
+        mFragment.restartBatteryStatsLoader(false /* clearHeader */);
+
+        verify(mBatteryHeaderPreferenceController, never()).quickUpdateHeaderPreference();
+    }
+
     public static class TestFragment extends PowerUsageSummary {
 
         private Context mContext;
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 0000000000000000000000000000000000000000..914cc2f514defcd463521edaf426cc06c6277222
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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"
+            + ",bluetooth_scan_enabled=true"
+            + ",bluetooth_scan_threshold=2000";
+    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);
+        assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue();
+        assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(2000);
+    }
+
+    @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).isFalse();
+        assertThat(anomalyDetectionPolicy.wakeupAlarmThreshold).isEqualTo(60);
+        assertThat(anomalyDetectionPolicy.bluetoothScanDetectionEnabled).isTrue();
+        assertThat(anomalyDetectionPolicy.bluetoothScanThreshold).isEqualTo(
+                30 * DateUtils.MINUTE_IN_MILLIS);
+    }
+
+    @Test
+    public void testIsAnomalyDetectorEnabled() {
+        AnomalyDetectionPolicy anomalyDetectionPolicy = createAnomalyPolicyWithConfig();
+
+        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+                Anomaly.AnomalyType.WAKE_LOCK)).isFalse();
+        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+                Anomaly.AnomalyType.WAKEUP_ALARM)).isTrue();
+        assertThat(anomalyDetectionPolicy.isAnomalyDetectorEnabled(
+                Anomaly.AnomalyType.BLUETOOTH_SCAN)).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, false);
+        doReturn(true).when(mKeyValueListParserWrapper).getBoolean(
+                AnomalyDetectionPolicy.KEY_BLUETOOTH_SCAN_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 0000000000000000000000000000000000000000..1111804dd8d3b4f5e791c8d9f54612dbbaabcb6d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Build;
+
+import com.android.settings.R;
+import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+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.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 {
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final String DISPLAY_NAME = "app";
+    private static final int UID = 111;
+
+    @Mock
+    private AnomalyUtils mAnomalyUtils;
+    @Mock
+    private AnomalyAction mAnomalyAction;
+    private Anomaly mWakeLockAnomaly;
+    private Anomaly mWakeupAlarmAnomaly;
+    private Anomaly mWakeupAlarmAnomaly2;
+    private Anomaly mBluetoothAnomaly;
+    private AnomalyDialogFragment mAnomalyDialogFragment;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mWakeLockAnomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .build();
+        mWakeupAlarmAnomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .build();
+        mWakeupAlarmAnomaly2 = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .setTargetSdkVersion(Build.VERSION_CODES.O)
+                .build();
+        mBluetoothAnomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .build();
+    }
+
+    @Test
+    public void testOnCreateDialog_hasCorrectData() {
+        mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeLockAnomaly,
+                0 /* metricskey */);
+        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
+
+        assertThat(mAnomalyDialogFragment.mAnomaly).isEqualTo(mWakeLockAnomaly);
+    }
+
+    @Test
+    public void testOnCreateDialog_wakelockAnomaly_fireForceStopDialog() {
+        mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeLockAnomaly,
+                0 /* metricskey */);
+
+        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
+
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+
+        assertThat(shadowDialog.getMessage()).isEqualTo(
+                mContext.getString(R.string.dialog_stop_message, mWakeLockAnomaly.displayName));
+        assertThat(shadowDialog.getTitle()).isEqualTo(
+                mContext.getString(R.string.dialog_stop_title));
+        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
+                mContext.getString(R.string.dialog_stop_ok));
+        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
+                mContext.getString(R.string.dlg_cancel));
+    }
+
+    @Test
+    public void testOnCreateDialog_wakeupAlarmAnomalyPriorO_fireStopAndBackgroundCheckDialog() {
+        mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeupAlarmAnomaly,
+                0 /* metricskey */);
+
+        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
+
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+
+        assertThat(shadowDialog.getMessage()).isEqualTo(
+                mContext.getString(R.string.dialog_background_check_message,
+                        mWakeLockAnomaly.displayName));
+        assertThat(shadowDialog.getTitle()).isEqualTo(
+                mContext.getString(R.string.dialog_background_check_title));
+        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
+                mContext.getString(R.string.dialog_background_check_ok));
+        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
+                mContext.getString(R.string.dlg_cancel));
+    }
+
+    @Test
+    public void testOnCreateDialog_wakeupAlarmAnomalyTargetingO_fireForceStopDialog() {
+        mAnomalyDialogFragment = AnomalyDialogFragment.newInstance(mWakeupAlarmAnomaly2,
+                0 /* metricskey */);
+
+        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
+
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+
+        assertThat(shadowDialog.getMessage()).isEqualTo(
+                mContext.getString(R.string.dialog_stop_message_wakeup_alarm,
+                        mWakeLockAnomaly.displayName));
+        assertThat(shadowDialog.getTitle()).isEqualTo(
+                mContext.getString(R.string.dialog_stop_title));
+        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
+                mContext.getString(R.string.dialog_stop_ok));
+        assertThat(dialog.getButton(DialogInterface.BUTTON_NEGATIVE).getText()).isEqualTo(
+                mContext.getString(R.string.dlg_cancel));
+    }
+
+    @Test
+    public void testOnCreateDialog_bluetoothAnomaly_fireLocationCheckDialog() {
+        mAnomalyDialogFragment = spy(AnomalyDialogFragment.newInstance(mBluetoothAnomaly,
+                0 /* metricskey */));
+        mAnomalyDialogFragment.mAnomalyUtils = mAnomalyUtils;
+        doReturn(mAnomalyAction).when(mAnomalyUtils).getAnomalyAction(any());
+        doNothing().when(mAnomalyDialogFragment).initAnomalyUtils();
+        doReturn(Anomaly.AnomalyActionType.LOCATION_CHECK).when(mAnomalyAction).getActionType();
+
+        FragmentTestUtil.startFragment(mAnomalyDialogFragment);
+
+        final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
+        ShadowAlertDialog shadowDialog = shadowOf(dialog);
+
+        assertThat(shadowDialog.getMessage()).isEqualTo(
+                mContext.getString(R.string.dialog_location_message,
+                        mWakeLockAnomaly.displayName));
+        assertThat(shadowDialog.getTitle()).isEqualTo(
+                mContext.getString(R.string.dialog_location_title));
+        assertThat(dialog.getButton(DialogInterface.BUTTON_POSITIVE).getText()).isEqualTo(
+                mContext.getString(R.string.dialog_location_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 0000000000000000000000000000000000000000..48749d50860cbf04b1df953e7e35b1f5576ba845
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.fuelgauge.anomaly.checker.BluetoothScanAnomalyDetector;
+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 BluetoothScanAnomalyDetector mBluetoothScanAnomalyDetector;
+    @Mock
+    private AnomalyDetectionPolicy mAnomalyDetectionPolicy;
+    @Mock
+    private UserManager mUserManager;
+    private Anomaly mWakeLockAnomaly;
+    private Anomaly mWakeupAlarmAnomaly;
+    private Anomaly mBluetoothScanAnomaly;
+    private List<Anomaly> mWakeLockAnomalies;
+    private List<Anomaly> mWakeupAlarmAnomalies;
+    private List<Anomaly> mBluetoothScanAnomalies;
+    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());
+
+        mBluetoothScanAnomalies = new ArrayList<>();
+        mBluetoothScanAnomaly = createAnomaly(Anomaly.AnomalyType.BLUETOOTH_SCAN);
+        mBluetoothScanAnomalies.add(mBluetoothScanAnomaly);
+        doReturn(mBluetoothScanAnomalies).when(mBluetoothScanAnomalyDetector).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);
+        doReturn(mBluetoothScanAnomalyDetector).when(
+                mAnomalyLoader.mAnomalyUtils).getAnomalyDetector(
+                Anomaly.AnomalyType.BLUETOOTH_SCAN);
+
+        List<Anomaly> anomalies = mAnomalyLoader.loadInBackground();
+
+        assertThat(anomalies).containsExactly(mWakeLockAnomaly, mWakeupAlarmAnomaly,
+                mBluetoothScanAnomaly);
+    }
+
+    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,
+                mBluetoothScanAnomaly);
+    }
+}
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 0000000000000000000000000000000000000000..c0157aee50fb0a078ec79cd09d6223809858c345
--- /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 0000000000000000000000000000000000000000..72d8b6918660093a17eb513549b5b89e9d240a19
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.fuelgauge.BatteryUtils;
+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 = "appName";
+    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);
+        when(mSettingsActivity.getApplicationContext()).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.getTitle()).isEqualTo("appName draining battery");
+        assertThat(mPreference.getSummary()).isEqualTo("Keeping device awake");
+    }
+
+    @Test
+    public void testUpdateAnomalySummaryPreference_multipleAnomalies_showCorrectSummary() {
+        mAnomalyList.add(createTestAnomaly());
+        mAnomalyList.add(createTestAnomaly());
+
+        mAnomalySummaryPreferenceController.updateAnomalySummaryPreference(mAnomalyList);
+
+        assertThat(mPreference.getTitle()).isEqualTo("Apps draining battery");
+        assertThat(mPreference.getSummary()).isEqualTo("2 apps misbehaving");
+    }
+
+    @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 0000000000000000000000000000000000000000..13a5b31d745b893be3bea3382d4c734b121257ae
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyTest.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.fuelgauge.anomaly;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Build;
+
+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;
+
+@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 int SDK_VERSION = Build.VERSION_CODES.L;
+    private static long WAKE_LOCK_TIME_MS = 1500;
+    private static String PACKAGE_NAME = "com.android.settings";
+    private static String DISPLAY_NAME = "settings";
+    private static long BLUETOOTH_TIME_MS = 2555555;
+    private static int WAKEUP_ALARM_COUNT = 100;
+
+    private Anomaly mAnomaly;
+
+    @Before
+    public void setUp() {
+        mAnomaly = new Anomaly.Builder()
+                .setType(TYPE)
+                .setUid(UID)
+                .setWakeLockTimeMs(WAKE_LOCK_TIME_MS)
+                .setPackageName(PACKAGE_NAME)
+                .setDisplayName(DISPLAY_NAME)
+                .setTargetSdkVersion(SDK_VERSION)
+                .setBackgroundRestrictionEnabled(true)
+                .setBluetoothScanningTimeMs(BLUETOOTH_TIME_MS)
+                .setWakeupAlarmCount(WAKEUP_ALARM_COUNT)
+                .build();
+    }
+
+    @Test
+    public void testBuilder_buildCorrectly() {
+        assertThat(mAnomaly.type).isEqualTo(TYPE);
+        assertThat(mAnomaly.uid).isEqualTo(UID);
+        assertThat(mAnomaly.wakelockTimeMs).isEqualTo(WAKE_LOCK_TIME_MS);
+        assertThat(mAnomaly.packageName).isEqualTo(PACKAGE_NAME);
+        assertThat(mAnomaly.displayName).isEqualTo(DISPLAY_NAME);
+        assertThat(mAnomaly.targetSdkVersion).isEqualTo(SDK_VERSION);
+        assertThat(mAnomaly.backgroundRestrictionEnabled).isTrue();
+        assertThat(mAnomaly.wakeupAlarmCount).isEqualTo(WAKEUP_ALARM_COUNT);
+        assertThat(mAnomaly.bluetoothScanningTimeMs).isEqualTo(BLUETOOTH_TIME_MS);
+    }
+
+    @Test
+    public void testToString() {
+        assertThat(mAnomaly.toString()).isEqualTo(
+                "type=wakelock uid=111 package=com.android.settings displayName=settings"
+                        + " wakelockTimeMs=1500 wakeupAlarmCount=100 bluetoothTimeMs=2555555");
+    }
+}
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 0000000000000000000000000000000000000000..8cd5a063b72c13ce0e5c5472e0096383b6a59347
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.os.Build;
+
+import com.android.settings.fuelgauge.anomaly.action.StopAndBackgroundCheckAction;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+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() {
+        Anomaly anomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                .build();
+        assertThat(mAnomalyUtils.getAnomalyAction(anomaly)).isInstanceOf(
+                ForceStopAction.class);
+    }
+
+    @Test
+    public void testGetAnomalyDetector_typeWakeLock_returnWakeLockDetector() {
+        assertThat(mAnomalyUtils.getAnomalyDetector(Anomaly.AnomalyType.WAKE_LOCK)).isInstanceOf(
+                WakeLockAnomalyDetector.class);
+    }
+
+    @Test
+    public void testGetAnomalyAction_typeWakeUpAlarmTargetO_returnForceStop() {
+        Anomaly anomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .setTargetSdkVersion(Build.VERSION_CODES.O)
+                .build();
+        assertThat(mAnomalyUtils.getAnomalyAction(anomaly)).isInstanceOf(
+                ForceStopAction.class);
+    }
+
+    @Test
+    public void testGetAnomalyAction_typeWakeUpAlarmTargetPriorOAndBgOff_returnStopAndBackground() {
+        Anomaly anomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .setTargetSdkVersion(Build.VERSION_CODES.L)
+                .setBackgroundRestrictionEnabled(false)
+                .build();
+        assertThat(mAnomalyUtils.getAnomalyAction(anomaly)).isInstanceOf(
+                StopAndBackgroundCheckAction.class);
+    }
+
+    @Test
+    public void testGetAnomalyAction_typeWakeUpAlarmTargetPriorOAndBgOn_returnForceStop() {
+        Anomaly anomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .setTargetSdkVersion(Build.VERSION_CODES.L)
+                .setBackgroundRestrictionEnabled(true)
+                .build();
+        assertThat(mAnomalyUtils.getAnomalyAction(anomaly)).isInstanceOf(
+                ForceStopAction.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/AnomalyActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..8db1a8c36c6d4da88986bb127eeeedbd1796e0ac
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/AnomalyActionTest.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.fuelgauge.anomaly.action;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.util.Pair;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+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;
+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 AnomalyActionTest {
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final int UID = 111;
+    private static final int ACTION_KEY = 2;
+    private static final int METRIC_KEY = 3;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private AppOpsManager mAppOpsManagerr;
+    private Anomaly mAnomaly;
+    private TestAnomalyAction mTestAnomalyAction;
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        doReturn(mAppOpsManagerr).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
+
+        mAnomaly = new Anomaly.Builder()
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .build();
+        mTestAnomalyAction = new TestAnomalyAction(mContext);
+    }
+
+    @Test
+    public void testHandlePositiveAction_logAction() {
+        mTestAnomalyAction.handlePositiveAction(mAnomaly, METRIC_KEY);
+
+        verify(mFeatureFactory.metricsFeatureProvider).action(mContext, ACTION_KEY, PACKAGE_NAME,
+                Pair.create(MetricsProto.MetricsEvent.FIELD_CONTEXT, METRIC_KEY));
+    }
+
+    /**
+     * Test class for {@link AnomalyAction}
+     */
+    public class TestAnomalyAction extends AnomalyAction {
+        public TestAnomalyAction(Context context) {
+            super(context);
+            mActionMetricKey = ACTION_KEY;
+        }
+
+        @Override
+        public boolean isActionActive(Anomaly anomaly) {
+            return false;
+        }
+
+        @Override
+        public int getActionType() {
+            return 0;
+        }
+    }
+}
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 0000000000000000000000000000000000000000..7e5fc4ac81773bd35004688fb8dd30c4da79735b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.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.fuelgauge.anomaly.action;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.os.Build;
+
+import com.android.settings.fuelgauge.BatteryUtils;
+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;
+    private static final int SDK_VERSION = Build.VERSION_CODES.L;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private AppOpsManager mAppOpsManager;
+    @Mock
+    private BatteryUtils mBatteryUtils;
+    private Anomaly mAnomaly;
+    private BackgroundCheckAction mBackgroundCheckAction;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        FakeFeatureFactory.setupForTest(mContext);
+        doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
+
+        mAnomaly = new Anomaly.Builder()
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .setTargetSdkVersion(SDK_VERSION)
+                .build();
+        mBackgroundCheckAction = new BackgroundCheckAction(mContext);
+        mBackgroundCheckAction.mBatteryUtils = mBatteryUtils;
+    }
+
+    @Test
+    public void testHandlePositiveAction_forceStopPackage() {
+        mBackgroundCheckAction.handlePositiveAction(mAnomaly, 0 /* metricskey */);
+
+        verify(mAppOpsManager).setMode(AppOpsManager.OP_RUN_IN_BACKGROUND, UID, PACKAGE_NAME,
+                AppOpsManager.MODE_IGNORED);
+    }
+
+    @Test
+    public void testIsActionActive_modeAllowed_returnTrue() {
+        doReturn(false).when(mBatteryUtils).isBackgroundRestrictionEnabled(SDK_VERSION, UID,
+                PACKAGE_NAME);
+
+        assertThat(mBackgroundCheckAction.isActionActive(mAnomaly)).isTrue();
+    }
+
+    @Test
+    public void testIsActionActive_modeIgnored_returnFalse() {
+        doReturn(true).when(mBatteryUtils).isBackgroundRestrictionEnabled(SDK_VERSION, UID,
+                PACKAGE_NAME);
+
+        assertThat(mBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
+    }
+
+    @Test
+    public void testConstructor_batteryUtilsNotNull() {
+        mBackgroundCheckAction = new BackgroundCheckAction(mContext);
+
+        assertThat(mBackgroundCheckAction.mBatteryUtils).isNotNull();
+    }
+}
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 0000000000000000000000000000000000000000..89b1a161824e7de39427186782575c5dc867a910
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.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.fuelgauge.anomaly.action;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+
+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;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
+    @Mock
+    private PackageManager mPackageManager;
+    private Anomaly mAnomaly;
+    private ForceStopAction mForceStopAction;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        FakeFeatureFactory.setupForTest(mContext);
+        doReturn(mActivityManager).when(mContext).getSystemService(Context.ACTIVITY_SERVICE);
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(PACKAGE_NAME,
+                PackageManager.GET_META_DATA);
+
+        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);
+    }
+
+    @Test
+    public void testIsActionActive_appStopped_returnFalse() {
+        mApplicationInfo.flags = ApplicationInfo.FLAG_STOPPED;
+
+        assertThat(mForceStopAction.isActionActive(mAnomaly)).isFalse();
+    }
+
+    @Test
+    public void testIsActionActive_appRunning_returnTrue() {
+        mApplicationInfo.flags = 0;
+
+        assertThat(mForceStopAction.isActionActive(mAnomaly)).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..234dd123401a549054c16e37ac9887fde55c248e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.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.fuelgauge.anomaly.action;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowPermissionChecker;
+
+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, shadows =
+        ShadowPermissionChecker.class)
+public class LocationCheckActionTest {
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final int UID = 12345;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private Anomaly mAnomaly;
+    private LocationCheckAction mLocationCheckAction;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        FakeFeatureFactory.setupForTest(mContext);
+        mLocationCheckAction = new LocationCheckAction(mContext, null);
+        mAnomaly = new Anomaly.Builder()
+                .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
+                .setPackageName(PACKAGE_NAME)
+                .setUid(UID)
+                .build();
+        ShadowPermissionChecker.clear();
+    }
+
+    @Test
+    public void testIsActionActive_coarseLocationGranted_returnTrue() {
+        ShadowPermissionChecker.addPermission(Manifest.permission.ACCESS_COARSE_LOCATION, -1, UID,
+                PACKAGE_NAME, PackageManager.PERMISSION_GRANTED);
+
+        assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isTrue();
+    }
+
+    @Test
+    public void testIsActionActive_fineLocationGranted_returnTrue() {
+        ShadowPermissionChecker.addPermission(Manifest.permission.ACCESS_FINE_LOCATION, -1, UID,
+                PACKAGE_NAME, PackageManager.PERMISSION_GRANTED);
+
+        assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isTrue();
+    }
+
+    @Test
+    public void testIsActionActive_noLocationGranted_returnFalse() {
+        assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isFalse();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..c06bddd92c4723327a1e872d379e5157a626abca
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+
+import com.android.settings.TestConfig;
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+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;
+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 StopAndBackgroundActionTest {
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final int UID = 111;
+    private static final int METRICS_KEY = 3;
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private BackgroundCheckAction mBackgroundCheckAction;
+    @Mock
+    private ForceStopAction mForceStopAction;
+    private StopAndBackgroundCheckAction mStopAndBackgroundCheckAction;
+    private Anomaly mAnomaly;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mAnomaly = new Anomaly.Builder()
+                .setUid(UID)
+                .setPackageName(PACKAGE_NAME)
+                .build();
+
+        FakeFeatureFactory.setupForTest(mContext);
+        mStopAndBackgroundCheckAction = new StopAndBackgroundCheckAction(mContext, mForceStopAction,
+                mBackgroundCheckAction);
+    }
+
+    @Test
+    public void testHandlePositiveAction_stopAndBackgroundCheck() {
+        mStopAndBackgroundCheckAction.handlePositiveAction(mAnomaly, METRICS_KEY);
+
+        verify(mBackgroundCheckAction).handlePositiveAction(mAnomaly, METRICS_KEY);
+        verify(mForceStopAction).handlePositiveAction(mAnomaly, METRICS_KEY);
+    }
+
+    @Test
+    public void testIsActionActive_restrictionEnabled_returnFalse() {
+        doReturn(true).when(mForceStopAction).isActionActive(mAnomaly);
+
+        assertThat(mStopAndBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
+    }
+
+    @Test
+    public void testIsActionActive_appNotRunning_returnFalse() {
+        doReturn(true).when(mBackgroundCheckAction).isActionActive(mAnomaly);
+
+        assertThat(mStopAndBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
+    }
+
+    @Test
+    public void testIsActionActive_appStoppedAndRestrictionOn_returnFalse() {
+        assertThat(mStopAndBackgroundCheckAction.isActionActive(mAnomaly)).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f8d02ffc802781d595adc04dc181226a994e9bcf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.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.os.BatteryStats;
+import android.text.format.DateUtils;
+
+import com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+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 com.android.settings.fuelgauge.anomaly.AnomalyUtils;
+import com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+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.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 BluetoothScanAnomalyDetectorTest {
+    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 ANOMALY_BLUETOOTH_SCANNING_TIME = DateUtils.HOUR_IN_MILLIS;
+    private static final long NORMAL_BLUETOOTH_SCANNING_TIME = DateUtils.MINUTE_IN_MILLIS;
+    @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 AnomalyDetectionPolicy mPolicy;
+    @Mock
+    private AnomalyAction mAnomalyAction;
+    @Mock
+    private AnomalyUtils mAnomalyUtils;
+
+    private BluetoothScanAnomalyDetector mBluetoothScanAnomalyDetector;
+    private Context mContext;
+    private List<BatterySipper> mUsageList;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        ReflectionHelpers.setField(mPolicy, "bluetoothScanThreshold",
+                30 * DateUtils.MINUTE_IN_MILLIS);
+        doReturn(mAnomalyAction).when(mAnomalyUtils).getAnomalyAction(any());
+
+        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();
+
+        mBluetoothScanAnomalyDetector = spy(new BluetoothScanAnomalyDetector(mContext, mPolicy,
+                mAnomalyUtils));
+        mBluetoothScanAnomalyDetector.mBatteryUtils = mBatteryUtils;
+        doReturn(false).when(mBatteryUtils).shouldHideSipper(any());
+        doReturn(true).when(mAnomalyAction).isActionActive(any());
+
+        doReturn(ANOMALY_BLUETOOTH_SCANNING_TIME).when(
+                mBluetoothScanAnomalyDetector).getBluetoothUnoptimizedBgTimeMs(eq(mAnomalyUid),
+                anyLong());
+        doReturn(ANOMALY_BLUETOOTH_SCANNING_TIME).when(
+                mBluetoothScanAnomalyDetector).getBluetoothUnoptimizedBgTimeMs(eq(mTargetUid),
+                anyLong());
+        doReturn(NORMAL_BLUETOOTH_SCANNING_TIME).when(
+                mBluetoothScanAnomalyDetector).getBluetoothUnoptimizedBgTimeMs(eq(mNormalUid),
+                anyLong());
+    }
+
+    @Test
+    public void testDetectAnomalies_containsAnomaly_detectIt() {
+        doReturn(-1).when(mBatteryUtils).getPackageUid(nullable(String.class));
+        final Anomaly anomaly = createBluetoothAnomaly(ANOMALY_UID);
+        final Anomaly targetAnomaly = createBluetoothAnomaly(TARGET_UID);
+
+        List<Anomaly> mAnomalies = mBluetoothScanAnomalyDetector.detectAnomalies(
+                mBatteryStatsHelper);
+
+        assertThat(mAnomalies).containsExactly(anomaly, targetAnomaly);
+    }
+
+    @Test
+    public void testDetectAnomalies_detectTargetAnomaly_detectIt() {
+        doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
+        final Anomaly targetAnomaly = createBluetoothAnomaly(TARGET_UID);
+
+        List<Anomaly> mAnomalies = mBluetoothScanAnomalyDetector.detectAnomalies(
+                mBatteryStatsHelper, TARGET_PACKAGE_NAME);
+
+        assertThat(mAnomalies).containsExactly(targetAnomaly);
+
+    }
+
+    private Anomaly createBluetoothAnomaly(int uid) {
+        return new Anomaly.Builder()
+                .setUid(uid)
+                .setType(Anomaly.AnomalyType.BLUETOOTH_SCAN)
+                .setBluetoothScanningTimeMs(ANOMALY_BLUETOOTH_SCANNING_TIME)
+                .build();
+    }
+
+}
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 0000000000000000000000000000000000000000..d7682eac68005ffe286253cd898224fbb82d3cd5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.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 com.android.internal.os.BatterySipper;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.fuelgauge.anomaly.AnomalyUtils;
+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 com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+
+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;
+    private static final int INACTIVE_UID = 444;
+    @Mock
+    private BatteryStatsHelper mBatteryStatsHelper;
+    @Mock
+    private BatterySipper mAnomalySipper;
+    @Mock
+    private BatterySipper mTargetSipper;
+    @Mock
+    private BatterySipper mNormalSipper;
+    @Mock
+    private BatterySipper mInactiveSipper;
+    @Mock
+    private BatteryStats.Uid mAnomalyUid;
+    @Mock
+    private BatteryStats.Uid mNormalUid;
+    @Mock
+    private BatteryStats.Uid mTargetUid;
+    @Mock
+    private BatteryStats.Uid mInactiveUid;
+    @Mock
+    private BatteryUtils mBatteryUtils;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
+    @Mock
+    private AnomalyDetectionPolicy mPolicy;
+    @Mock
+    private AnomalyAction mAnomalyAction;
+    @Mock
+    private AnomalyUtils mAnomalyUtils;
+
+    private WakeLockAnomalyDetector mWakelockAnomalyDetector;
+    private Context mContext;
+    private List<BatterySipper> mUsageList;
+    private Anomaly mAnomaly;
+    private Anomaly mTargetAnomaly;
+
+    @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());
+        doReturn(true).when(mAnomalyAction).isActionActive(any());
+        doReturn(mAnomalyAction).when(mAnomalyUtils).getAnomalyAction(any());
+
+        mWakelockAnomalyDetector = spy(
+                new WakeLockAnomalyDetector(mContext, mPolicy, mAnomalyUtils));
+        mWakelockAnomalyDetector.mBatteryUtils = mBatteryUtils;
+
+        mAnomalySipper.uidObj = mAnomalyUid;
+        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
+                .getBackgroundTotalDurationMs(eq(mAnomalyUid), anyLong());
+        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector).getCurrentDurationMs(
+                eq(mAnomalyUid), anyLong());
+        doReturn(ANOMALY_UID).when(mAnomalyUid).getUid();
+
+        mNormalSipper.uidObj = mNormalUid;
+        doReturn(NORMAL_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
+                .getBackgroundTotalDurationMs(eq(mNormalUid), anyLong());
+        doReturn(0L).when(mWakelockAnomalyDetector).getCurrentDurationMs(eq(mNormalUid),
+                anyLong());
+        doReturn(NORMAL_UID).when(mNormalUid).getUid();
+
+        mTargetSipper.uidObj = mTargetUid;
+        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
+                .getBackgroundTotalDurationMs(eq(mTargetUid), anyLong());
+        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector).getCurrentDurationMs(
+                eq(mTargetUid), anyLong());
+        doReturn(TARGET_UID).when(mTargetUid).getUid();
+
+        mInactiveSipper.uidObj = mInactiveUid;
+        doReturn(ANOMALY_WAKELOCK_TIME_MS).when(mWakelockAnomalyDetector)
+                .getBackgroundTotalDurationMs(eq(mInactiveUid), anyLong());
+        doReturn(0L).when(mWakelockAnomalyDetector).getCurrentDurationMs(eq(mInactiveUid),
+                anyLong());
+        doReturn(INACTIVE_UID).when(mInactiveUid).getUid();
+
+        mUsageList = new ArrayList<>();
+        mUsageList.add(mAnomalySipper);
+        mUsageList.add(mNormalSipper);
+        mUsageList.add(mTargetSipper);
+        mUsageList.add(mInactiveSipper);
+        doReturn(mUsageList).when(mBatteryStatsHelper).getUsageList();
+
+        mAnomaly = createWakeLockAnomaly(ANOMALY_UID);
+        mTargetAnomaly = createWakeLockAnomaly(TARGET_UID);
+    }
+
+    @Test
+    public void testDetectAnomalies_containsAnomaly_detectIt() {
+        doReturn(BatteryUtils.UID_NULL).when(mBatteryUtils).getPackageUid(nullable(String.class));
+
+        List<Anomaly> mAnomalies = mWakelockAnomalyDetector.detectAnomalies(mBatteryStatsHelper);
+
+        assertThat(mAnomalies).containsExactly(mAnomaly, mTargetAnomaly);
+    }
+
+    @Test
+    public void testDetectAnomalies_containsTargetPackage_detectIt() {
+        doReturn(TARGET_UID).when(mBatteryUtils).getPackageUid(TARGET_PACKAGE_NAME);
+
+        List<Anomaly> mAnomalies = mWakelockAnomalyDetector.detectAnomalies(mBatteryStatsHelper,
+                TARGET_PACKAGE_NAME);
+
+        assertThat(mAnomalies).containsExactly(mTargetAnomaly);
+    }
+
+    @Test
+    public void testContainsThresholdFromPolicy() {
+        assertThat(mWakelockAnomalyDetector.mWakeLockThresholdMs).isEqualTo(WAKELOCK_THRESHOLD_MS);
+    }
+
+    private Anomaly createWakeLockAnomaly(int uid) {
+        return new Anomaly.Builder()
+                .setUid(uid)
+                .setType(Anomaly.AnomalyType.WAKE_LOCK)
+                .setWakeLockTimeMs(ANOMALY_WAKELOCK_TIME_MS)
+                .build();
+    }
+}
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 0000000000000000000000000000000000000000..55be734e232e9488955be427582fcb9f3703d8fc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.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.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.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.os.BatteryStats;
+import android.os.Build;
+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.fuelgauge.anomaly.AnomalyUtils;
+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 com.android.settings.fuelgauge.anomaly.action.AnomalyAction;
+
+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.target";
+    private static final String ANOMALY_PACKAGE_NAME = "com.android.anomaly";
+    private static final boolean TARGET_BACKGROUND_RESTRICTION_ON = false;
+    private static final boolean ANOMALY_BACKGROUND_RESTRICTION_ON = true;
+    private static final int TARGET_SDK = Build.VERSION_CODES.L;
+    private static final int ANOMALY_SDK = Build.VERSION_CODES.O;
+    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 =
+            1 * DateUtils.HOUR_IN_MILLIS + 10 * DateUtils.MINUTE_IN_MILLIS;
+    private static final int ANOMALY_WAKEUP_COUNT = 500;
+    private static final int NORMAL_WAKEUP_COUNT = 61;
+    private static final int ANOMALY_WAKEUP_FREQUENCY = 428; // count per hour
+    @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;
+    @Mock
+    private AnomalyAction mAnomalyAction;
+    @Mock
+    private AnomalyUtils mAnomalyUtils;
+
+    private WakeupAlarmAnomalyDetector mWakeupAlarmAnomalyDetector;
+    private Context mContext;
+    private List<BatterySipper> mUsageList;
+    private Anomaly mAnomaly;
+    private Anomaly mTargetAnomaly;
+
+    @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());
+        doReturn(true).when(mAnomalyAction).isActionActive(any());
+        doReturn(mAnomalyAction).when(mAnomalyUtils).getAnomalyAction(any());
+
+        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();
+
+        doReturn(TARGET_PACKAGE_NAME).when(mBatteryUtils).getPackageName(TARGET_UID);
+        doReturn(ANOMALY_PACKAGE_NAME).when(mBatteryUtils).getPackageName(ANOMALY_UID);
+        doReturn(TARGET_SDK).when(mBatteryUtils).getTargetSdkVersion(TARGET_PACKAGE_NAME);
+        doReturn(ANOMALY_SDK).when(mBatteryUtils).getTargetSdkVersion(ANOMALY_PACKAGE_NAME);
+        doReturn(TARGET_BACKGROUND_RESTRICTION_ON).when(mBatteryUtils)
+                .isBackgroundRestrictionEnabled(TARGET_SDK, TARGET_UID, TARGET_PACKAGE_NAME);
+        doReturn(ANOMALY_BACKGROUND_RESTRICTION_ON).when(mBatteryUtils)
+                .isBackgroundRestrictionEnabled(ANOMALY_SDK, ANOMALY_UID, ANOMALY_PACKAGE_NAME);
+
+        mAnomaly = new Anomaly.Builder()
+                .setUid(ANOMALY_UID)
+                .setPackageName(ANOMALY_PACKAGE_NAME)
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .setTargetSdkVersion(ANOMALY_SDK)
+                .setBackgroundRestrictionEnabled(ANOMALY_BACKGROUND_RESTRICTION_ON)
+                .setWakeupAlarmCount(ANOMALY_WAKEUP_FREQUENCY)
+                .build();
+        mTargetAnomaly = new Anomaly.Builder()
+                .setUid(TARGET_UID)
+                .setPackageName(TARGET_PACKAGE_NAME)
+                .setType(Anomaly.AnomalyType.WAKEUP_ALARM)
+                .setTargetSdkVersion(TARGET_SDK)
+                .setBackgroundRestrictionEnabled(TARGET_BACKGROUND_RESTRICTION_ON)
+                .setWakeupAlarmCount(ANOMALY_WAKEUP_FREQUENCY)
+                .build();
+
+        mWakeupAlarmAnomalyDetector = spy(
+                new WakeupAlarmAnomalyDetector(mContext, mPolicy, mAnomalyUtils));
+        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);
+
+        List<Anomaly> mAnomalies = mWakeupAlarmAnomalyDetector.detectAnomalies(mBatteryStatsHelper);
+
+        assertThat(mAnomalies).containsExactly(mAnomaly, mTargetAnomaly);
+    }
+
+    @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);
+
+        List<Anomaly> mAnomalies = mWakeupAlarmAnomalyDetector.detectAnomalies(mBatteryStatsHelper,
+                TARGET_PACKAGE_NAME);
+
+        assertThat(mAnomalies).containsExactly(mTargetAnomaly);
+    }
+
+    @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 7189f50a9d5c3647471e8b343abaef2c61b9b603..b2d359649cf3c887b1daf769abafc2cc2ddfaa27 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java
@@ -16,28 +16,37 @@
 
 package com.android.settings.gestures;
 
+import static android.provider.Settings.Secure.ASSIST_GESTURE_ENABLED;
+
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import android.provider.Settings.Secure;
 import com.android.settings.TestConfig;
+import com.android.settings.display.AutoBrightnessPreferenceController;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
 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 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;
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class AssistGesturePreferenceControllerTest {
@@ -54,12 +63,13 @@ public class AssistGesturePreferenceControllerTest {
         MockitoAnnotations.initMocks(this);
         FakeFeatureFactory.setupForTest(mContext);
         mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new AssistGesturePreferenceController(mContext, null, KEY_ASSIST);
+        mController = new AssistGesturePreferenceController(mContext, null, KEY_ASSIST, false);
     }
 
     @Test
     public void isAvailable_whenSupported_shouldReturnTrue() {
-        when(mFactory.assistGestureFeatureProvider.isSupported(mContext)).thenReturn(true);
+        mController.mAssistOnly = false;
+        when(mFactory.assistGestureFeatureProvider.isSensorAvailable(mContext)).thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
     }
 
@@ -74,7 +84,7 @@ public class AssistGesturePreferenceControllerTest {
         // Set the setting to be enabled.
         final Context context = ShadowApplication.getInstance().getApplicationContext();
         Settings.System.putInt(context.getContentResolver(), ASSIST_GESTURE_ENABLED, 1);
-        mController = new AssistGesturePreferenceController(context, null, KEY_ASSIST);
+        mController = new AssistGesturePreferenceController(context, null, KEY_ASSIST, false);
 
         assertThat(mController.isSwitchPrefEnabled()).isTrue();
     }
@@ -84,9 +94,44 @@ public class AssistGesturePreferenceControllerTest {
         // Set the setting to be disabled.
         final Context context = ShadowApplication.getInstance().getApplicationContext();
         Settings.System.putInt(context.getContentResolver(), ASSIST_GESTURE_ENABLED, 0);
-        mController = new AssistGesturePreferenceController(context, null, KEY_ASSIST);
+        mController = new AssistGesturePreferenceController(context, null, KEY_ASSIST, false);
 
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
     }
+
+    @Test
+    public void testPreferenceController_ProperResultPayloadType() {
+        final Context context = RuntimeEnvironment.application;
+        AssistGesturePreferenceController controller =
+                new AssistGesturePreferenceController(context, null /* lifecycle */, KEY_ASSIST,
+                        false /* assistOnly */);
+        ResultPayload payload = controller.getResultPayload();
+        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testSetValue_updatesCorrectly() {
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Secure.ASSIST_GESTURE_ENABLED, 0);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.Secure.getInt(resolver, Secure.ASSIST_GESTURE_ENABLED, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testGetValue_correctValueReturned() {
+        int currentValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.ASSIST_GESTURE_ENABLED, currentValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
 }
 
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
deleted file mode 100644
index 7d75f32feb4e8a52702788881fe5a9b5faae0b5a..0000000000000000000000000000000000000000
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSensitivityPreferenceControllerTest.java
+++ /dev/null
@@ -1,93 +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.gestures;
-
-import android.content.Context;
-import android.provider.Settings;
-
-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 org.robolectric.shadows.ShadowApplication;
-
-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;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
-public class AssistGestureSensitivityPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    private FakeFeatureFactory mFactory;
-    private AssistGestureSensitivityPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest(mContext);
-        mFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
-        mController = new AssistGestureSensitivityPreferenceController(mContext, null);
-    }
-
-    @Test
-    public void isAvailable_whenSupportedAndEnabled_shouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
-        when(mFactory.assistGestureFeatureProvider.isSupported(mContext)).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_whenSupportedAndDisabled_shouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
-        when(mFactory.assistGestureFeatureProvider.isSupported(mContext)).thenReturn(true);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_whenUnsupportedAndEnabled_shouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
-        when(mFactory.assistGestureFeatureProvider.isSupported(mContext)).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_whenUnsupportedAndDisabled_shouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
-        when(mFactory.assistGestureFeatureProvider.isSupported(mContext)).thenReturn(false);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-}
-
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
index 85307a40ad59f346b0ba4acf7305f59519bb5a6a..49fd21407e451d1d01cbd990d2cc81a9c95ad342 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.provider.SearchIndexableResource;
 
 import com.android.settings.R;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
@@ -42,11 +43,15 @@ import static org.mockito.Mockito.when;
 public class AssistGestureSettingsTest {
     @Mock
     private Context mContext;
+    private FakeFeatureFactory mFakeFeatureFactory;
+    private AssistGestureFeatureProvider mFeatureProvider;
     private AssistGestureSettings mSettings;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mFakeFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
+        mFeatureProvider = mFakeFeatureFactory.getAssistGestureFeatureProvider();
         mSettings = new AssistGestureSettings();
     }
 
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
index cc30a7461370514405d700f4a668dd3d1b7fd765..9c9a546dde8bc4e238e152de121bf8b0ba5b50aa 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -16,19 +16,25 @@
 
 package com.android.settings.gestures;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
 import android.support.v7.preference.PreferenceScreen;
 
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
 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.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
@@ -92,4 +98,44 @@ public class DoubleTapPowerPreferenceControllerTest {
 
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
     }
+
+    @Test
+    public void testPreferenceController_ProperResultPayloadType() {
+        final Context context = RuntimeEnvironment.application;
+        DoubleTapPowerPreferenceController controller =
+                new DoubleTapPowerPreferenceController(context, null /* lifecycle */,
+                        KEY_DOUBLE_TAP_POWER);
+        ResultPayload payload = controller.getResultPayload();
+        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testSetValue_updatesCorrectly() {
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED,
+                0);
+
+        InlinePayload payload = ((InlineSwitchPayload) mController.getResultPayload());
+        payload.setValue(mContext, newValue);
+        int updatedValue = Settings.Secure.getInt(resolver,
+                Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, -1);
+        updatedValue = 1 - updatedValue; // DoubleTapPower is a non-standard switch
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testGetValue_correctValueReturned() {
+        int currentValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver,
+                Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, currentValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+        newValue = 1 - newValue; // DoubleTapPower is a non-standard switch
+        assertThat(newValue).isEqualTo(currentValue);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
index 539c7dbfc4a38000dedbe1369c4490e388e7f9c2..37f52de34e546f90ee1b20277dfc25cb99f5b53d 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
@@ -16,18 +16,25 @@
 
 package com.android.settings.gestures;
 
+import android.content.ContentResolver;
 import android.content.Context;
 
+import android.provider.Settings;
 import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
 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.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;
@@ -81,4 +88,41 @@ public class DoubleTapScreenPreferenceControllerTest {
 
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
     }
+
+    @Test
+    public void testPreferenceController_ProperResultPayloadType() {
+        final Context context = RuntimeEnvironment.application;
+        DoubleTapScreenPreferenceController controller =
+                new DoubleTapScreenPreferenceController(context, null /* lifecycle */,
+                        mAmbientDisplayConfiguration, 0 /* userid */, KEY_DOUBLE_TAP_SCREEN);
+        ResultPayload payload = controller.getResultPayload();
+        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testSetValue_updatesCorrectly() {
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, 0);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.Secure.getInt(resolver,
+                Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testGetValue_correctValueReturned() {
+        int currentValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver,
+                Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, currentValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
index ad3daddab9104475c10ce3b84c89593f6517ca9f..236896a2a5a77645cd30a5e1320d83b992e90ad4 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistGestureSettingsTest.java
@@ -30,7 +30,6 @@ import org.robolectric.shadows.ShadowApplication;
 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 a06395a0775920823ea0f04caf8231f22c4643b1..f9ac02e1ad20a3d96048864f7ab147dc35ef84b2 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -39,14 +39,14 @@ import org.robolectric.shadows.ShadowApplication;
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.provider.Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import com.android.settings.testutils.shadow.ShadowDoubleTwistPreferenceController;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DoubleTwistPreferenceControllerTest {
@@ -103,24 +103,26 @@ public class DoubleTwistPreferenceControllerTest {
     }
 
     @Test
-    @Config(shadows = {ShadowSecureSettings.class})
+    @Config(shadows = {
+            ShadowDoubleTwistPreferenceController.class,
+            ShadowSecureSettings.class})
     public void onPreferenceChange_hasWorkProfile_shouldUpdateSettingForWorkProfileUser() {
         final int managedId = 2;
         ShadowSecureSettings.putIntForUser(
-            null, CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId);
+            null, Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId);
         DoubleTwistPreferenceController controller =
             spy(new DoubleTwistPreferenceController(mContext, null, KEY_DOUBLE_TWIST));
-        doReturn(managedId).when(controller).getManagedProfileUserId();
+        ShadowDoubleTwistPreferenceController.setManagedProfileId(managedId);
 
         // enable the gesture
         controller.onPreferenceChange(null, true);
         assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-            CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId)).isEqualTo(1);
+                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0, managedId)).isEqualTo(1);
 
         // disable the gesture
         controller.onPreferenceChange(null, false);
         assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-            CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1, managedId)).isEqualTo(0);
+                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1, managedId)).isEqualTo(0);
     }
 
     @Test
@@ -128,7 +130,7 @@ public class DoubleTwistPreferenceControllerTest {
         // Set the setting to be enabled.
         final Context context = ShadowApplication.getInstance().getApplicationContext();
         Settings.System.putInt(context.getContentResolver(),
-                CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
+                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
         mController = new DoubleTwistPreferenceController(context, null, KEY_DOUBLE_TWIST);
 
         assertThat(mController.isSwitchPrefEnabled()).isTrue();
@@ -139,7 +141,7 @@ public class DoubleTwistPreferenceControllerTest {
         // Set the setting to be disabled.
         final Context context = ShadowApplication.getInstance().getApplicationContext();
         Settings.System.putInt(context.getContentResolver(),
-                CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0);
+                Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0);
         mController = new DoubleTwistPreferenceController(context, null, KEY_DOUBLE_TWIST);
 
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
index 27db35040ec9e2eeb01e847fa91bd410ae7b2e19..8b4ef61a9104a2187a7556a08555debe46b595d7 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
@@ -23,8 +23,8 @@ import android.support.v7.preference.TwoStatePreference;
 
 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 d81163de3703a50bf6157362ff15c94582e0fcdd..833f016ab4a2d533e93bbcf1bf57ada38c0c2488 100644
--- a/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java
@@ -16,18 +16,25 @@
 
 package com.android.settings.gestures;
 
+import android.content.ContentResolver;
 import android.content.Context;
 
+import android.provider.Settings;
 import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
 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.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;
@@ -83,4 +90,54 @@ public class PIckupGesturePreferenceControllerTest {
 
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
     }
+
+    @Test
+    public void testCanHandleClicks_configIsSet_shouldReturnTrue() {
+        when(mAmbientDisplayConfiguration.pulseOnPickupCanBeModified(anyInt())).thenReturn(true);
+
+        assertThat(mController.canHandleClicks()).isTrue();
+    }
+
+    @Test
+    public void testCanHandleClicks_configIsNotSet_shouldReturnFalse() {
+        when(mAmbientDisplayConfiguration.pulseOnPickupCanBeModified(anyInt())).thenReturn(false);
+
+        assertThat(mController.canHandleClicks()).isFalse();
+    }
+
+    @Test
+    public void testPreferenceController_ProperResultPayloadType() {
+        final Context context = RuntimeEnvironment.application;
+        PickupGesturePreferenceController controller =
+                new PickupGesturePreferenceController(
+                        context, null, mAmbientDisplayConfiguration, 0, KEY_PICK_UP);
+        ResultPayload payload = controller.getResultPayload();
+        assertThat(payload).isInstanceOf(InlineSwitchPayload.class);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testSetValue_updatesCorrectly() {
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_PULSE_ON_PICK_UP, 0);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.Secure.getInt(resolver,
+                Settings.Secure.DOZE_PULSE_ON_PICK_UP, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testGetValue_correctValueReturned() {
+        int currentValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.DOZE_PULSE_ON_PICK_UP, currentValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
index 3ca23d41e44313542623d3aecedbbf347d8edc98..2c4a1c4e26c9cd0a18f7a02d153e9cd84edac93a 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
@@ -30,7 +30,6 @@ import org.robolectric.shadows.ShadowApplication;
 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 ac551de595883c1a555cd5e4ddd0664a12b8692a..d4fc014afb92690823a4e8496fb99dfbb38f3f0a 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
@@ -16,23 +16,36 @@
 
 package com.android.settings.gestures;
 
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.hardware.fingerprint.FingerprintManager;
 import android.provider.Settings;
 
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
 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.Answers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
 import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -41,6 +54,10 @@ public class SwipeToNotificationPreferenceControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private FingerprintManager mFingerprintManager;
 
     private SwipeToNotificationPreferenceController mController;
     private static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint";
@@ -49,10 +66,27 @@ public class SwipeToNotificationPreferenceControllerTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mController = new SwipeToNotificationPreferenceController(mContext, null, KEY_SWIPE_DOWN);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        // Explicit casting to object due to MockitoCast bug
+        when((Object) mContext.getSystemService(FingerprintManager.class))
+                .thenReturn(mFingerprintManager);
+    }
+
+    @Test
+    public void isAvailable_hardwareNotAvailable_shouldReturnFalse() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
+        when(mContext.getResources().
+                getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
+                .thenReturn(true);
+
+        assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
     public void isAvailable_configIsTrue_shouldReturnTrue() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         when(mContext.getResources().
                 getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
                 .thenReturn(true);
@@ -62,6 +96,8 @@ public class SwipeToNotificationPreferenceControllerTest {
 
     @Test
     public void isAvailable_configIsFalse_shouldReturnFalse() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         when(mContext.getResources().
                 getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys))
                 .thenReturn(false);
@@ -71,6 +107,8 @@ public class SwipeToNotificationPreferenceControllerTest {
 
     @Test
     public void testSwitchEnabled_configIsSet_shouldReturnTrue() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         // Set the setting to be enabled.
         final Context context = ShadowApplication.getInstance().getApplicationContext();
         Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 1);
@@ -81,6 +119,8 @@ public class SwipeToNotificationPreferenceControllerTest {
 
     @Test
     public void testSwitchEnabled_configIsNotSet_shouldReturnFalse() {
+        stubFingerprintSupported(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
         // Set the setting to be disabled.
         final Context context = ShadowApplication.getInstance().getApplicationContext();
         Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 0);
@@ -88,4 +128,9 @@ public class SwipeToNotificationPreferenceControllerTest {
 
         assertThat(mController.isSwitchPrefEnabled()).isFalse();
     }
+
+    private void stubFingerprintSupported(boolean enabled) {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(enabled);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
index 6373620a6bc233db55041d42c3897e45c4e5e0c4..e2ed14debc2fecb3c8124670029501fea83cb0f8 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java
@@ -35,7 +35,6 @@ import org.robolectric.shadows.ShadowApplication;
 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 0000000000000000000000000000000000000000..c9804d667f11598a39157e989c4f49a9586b215f
--- /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/graph/UsageGraphTest.java b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..fbd6fd487e5c19e24fbb4c93588f177f2d2d2ad2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.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.graph;
+
+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 android.content.res.Resources;
+import android.util.SparseIntArray;
+
+import com.android.settings.TestConfig;
+import com.android.settingslib.R;
+
+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 UsageGraphTest {
+    private UsageGraph mGraph;
+
+    @Before
+    public void setUp() {
+        // Set up a graph view of width 1000, height 200, and corner radius 5.
+        Context context = spy(RuntimeEnvironment.application);
+        Resources resources = spy(context.getResources());
+        doReturn(resources).when(context).getResources();
+        doReturn(5).when(resources).getDimensionPixelSize(R.dimen.usage_graph_line_corner_radius);
+        doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_line_width);
+        doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_dot_size);
+        doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_dot_interval);
+        doReturn(1).when(resources).getDimensionPixelSize(R.dimen.usage_graph_divider_size);
+        mGraph = spy(new UsageGraph(context, null));
+        doReturn(1000).when(mGraph).getWidth();
+        doReturn(200).when(mGraph).getHeight();
+
+        // Set the conceptual size of the graph to 500ms x 100%.
+        mGraph.setMax(500, 100);
+    }
+
+    @Test
+    public void testCalculateLocalPaths_singlePath() {
+        SparseIntArray paths = new SparseIntArray();
+        paths.append(0, 100);
+        paths.append(500, 50);
+        paths.append(501, -1);
+
+        SparseIntArray localPaths = new SparseIntArray();
+        mGraph.calculateLocalPaths(paths, localPaths);
+
+        assertThat(localPaths.size()).isEqualTo(3);
+        assertThat(localPaths.keyAt(0)).isEqualTo(0);
+        assertThat(localPaths.valueAt(0)).isEqualTo(0);
+        assertThat(localPaths.keyAt(1)).isEqualTo(1000);
+        assertThat(localPaths.valueAt(1)).isEqualTo(100);
+        assertThat(localPaths.keyAt(2)).isEqualTo(1001);
+        assertThat(localPaths.valueAt(2)).isEqualTo(-1);
+    }
+
+    @Test
+    public void testCalculateLocalPaths_multiplePaths() {
+        SparseIntArray paths = new SparseIntArray();
+        paths.append(0, 100);
+        paths.append(200, 75);
+        paths.append(201, -1);
+
+        paths.append(300, 50);
+        paths.append(500, 25);
+        paths.append(501, -1);
+
+        SparseIntArray localPaths = new SparseIntArray();
+        mGraph.calculateLocalPaths(paths, localPaths);
+
+        assertThat(localPaths.size()).isEqualTo(6);
+
+        assertThat(localPaths.keyAt(0)).isEqualTo(0);
+        assertThat(localPaths.valueAt(0)).isEqualTo(0);
+        assertThat(localPaths.keyAt(1)).isEqualTo(400);
+        assertThat(localPaths.valueAt(1)).isEqualTo(50);
+        assertThat(localPaths.keyAt(2)).isEqualTo(401);
+        assertThat(localPaths.valueAt(2)).isEqualTo(-1);
+
+        assertThat(localPaths.keyAt(3)).isEqualTo(600);
+        assertThat(localPaths.valueAt(3)).isEqualTo(100);
+        assertThat(localPaths.keyAt(4)).isEqualTo(1000);
+        assertThat(localPaths.valueAt(4)).isEqualTo(150);
+        assertThat(localPaths.keyAt(5)).isEqualTo(1001);
+        assertThat(localPaths.valueAt(5)).isEqualTo(-1);
+    }
+
+    @Test
+    public void testCalculateLocalPaths_similarPointMiddle() {
+        SparseIntArray paths = new SparseIntArray();
+        paths.append(0, 100);
+        paths.append(1, 99); // This point should be omitted.
+        paths.append(500, 50);
+        paths.append(501, -1);
+
+        SparseIntArray localPaths = new SparseIntArray();
+        mGraph.calculateLocalPaths(paths, localPaths);
+
+        assertThat(localPaths.size()).isEqualTo(3);
+        assertThat(localPaths.keyAt(0)).isEqualTo(0);
+        assertThat(localPaths.valueAt(0)).isEqualTo(0);
+        assertThat(localPaths.keyAt(1)).isEqualTo(1000);
+        assertThat(localPaths.valueAt(1)).isEqualTo(100);
+        assertThat(localPaths.keyAt(2)).isEqualTo(1001);
+        assertThat(localPaths.valueAt(2)).isEqualTo(-1);
+    }
+
+    @Test
+    public void testCalculateLocalPaths_similarPointEnd() {
+        SparseIntArray paths = new SparseIntArray();
+        paths.append(0, 100);
+        paths.append(499, 51);
+        paths.append(500, 50); // This point should be kept: it's the last one.
+        paths.append(501, -1);
+
+        SparseIntArray localPaths = new SparseIntArray();
+        mGraph.calculateLocalPaths(paths, localPaths);
+
+        assertThat(localPaths.size()).isEqualTo(4);
+        assertThat(localPaths.keyAt(0)).isEqualTo(0);
+        assertThat(localPaths.valueAt(0)).isEqualTo(0);
+        assertThat(localPaths.keyAt(1)).isEqualTo(998);
+        assertThat(localPaths.valueAt(1)).isEqualTo(98);
+        assertThat(localPaths.keyAt(2)).isEqualTo(1000);
+        assertThat(localPaths.valueAt(2)).isEqualTo(100);
+        assertThat(localPaths.keyAt(3)).isEqualTo(1001);
+        assertThat(localPaths.valueAt(3)).isEqualTo(-1);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index 7d9c9ac16c77092dc3bd970f0d3bb8de80511571..b4a4638f625f935e3eca5b72b49cd4da700f9a9a 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -16,20 +16,12 @@
 
 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;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.hardware.input.InputManager;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -43,11 +35,12 @@ 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.settings.core.lifecycle.Lifecycle;
-import com.android.settings.core.lifecycle.LifecycleObserver;
 import com.android.settings.dashboard.SummaryLoader;
+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;
@@ -61,12 +54,21 @@ 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.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
@@ -84,16 +86,18 @@ public class LanguageAndInputSettingsTest {
     @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((Object) mContext.getSystemService(AutofillManager.class))
+        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(mContext);
+        mFragment = new TestFragment(mActivity);
     }
 
     @Test
@@ -103,7 +107,8 @@ public class LanguageAndInputSettingsTest {
 
     @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 +122,8 @@ public class LanguageAndInputSettingsTest {
     @Test
 
     public void testGetPreferenceControllers_shouldAllBeCreated() {
-        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        final List<PreferenceController> controllers =
+                mFragment.getPreferenceControllers(mActivity);
 
         assertThat(controllers.isEmpty()).isFalse();
     }
@@ -149,13 +155,51 @@ public class LanguageAndInputSettingsTest {
         verify(loader).setSummary(provider, null);
     }
 
+    @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);
+        when(featureFactory.assistGestureFeatureProvider.isSensorAvailable(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);
+        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 0);
+        provider.setListening(true);
+        verify(mActivity).getString(R.string.language_input_gesture_summary_off);
+
+        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_ENABLED, 1);
+        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 0);
+        provider.setListening(true);
+        verify(mActivity).getString(
+                R.string.language_input_gesture_summary_on_with_assist);
+
+        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_ENABLED, 0);
+        ShadowSecureSettings.putInt(null, Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, 1);
+        provider.setListening(true);
+        verify(mActivity).getString(
+                R.string.language_input_gesture_summary_on_non_assist);
+    }
+
     @Test
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
+        final Resources res = spy(RuntimeEnvironment.application.getResources());
         //(InputManager) context.getSystemService(Context.INPUT_SERVICE);
         InputManager manager = mock(InputManager.class);
         when(manager.getInputDeviceIds()).thenReturn(new int[]{});
         doReturn(manager).when(context).getSystemService(Context.INPUT_SERVICE);
+        doReturn(res).when(context).getResources();
+        doReturn(false).when(res)
+            .getBoolean(com.android.internal.R.bool.config_supportSystemNavigationKeys);
         final List<String> niks = LanguageAndInputSettings.SEARCH_INDEX_DATA_PROVIDER
                 .getNonIndexableKeys(context);
         final int xmlId = (new LanguageAndInputSettings()).getPreferenceScreenResId();
diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
index 495e33aa1c54047a2fdaee248ec903dd82f7c583..602bbd128902ddff4ccb8f86b49b220136e8deda 100644
--- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
@@ -15,7 +15,6 @@ import org.mockito.Answers;
 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 b69f731c063b20573cb144a07b06b534956d53f3..c7e0e0a4433699e5fe117dce9a76217ae20f4142 100644
--- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
@@ -15,14 +15,35 @@
  */
 package com.android.settings.location;
 
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
+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.ContentResolver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.LocationManager;
+import android.provider.Settings;
 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.display.AutoBrightnessPreferenceController;
+import com.android.settings.search.InlineListPayload;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.search.ResultPayload;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -30,14 +51,10 @@ 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 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 LocationPreferenceControllerTest {
@@ -46,6 +63,7 @@ public class LocationPreferenceControllerTest {
     @Mock
     private PreferenceScreen mScreen;
 
+    private Lifecycle mLifecycle;
     private LocationPreferenceController mController;
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -54,7 +72,8 @@ public class LocationPreferenceControllerTest {
     @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 +86,7 @@ public class LocationPreferenceControllerTest {
     public void updateState_shouldSetSummary() {
         mController.updateState(mPreference);
 
-        verify(mPreference).setSummary(anyString());
+        verify(mPreference).setSummary(nullable(String.class));
     }
 
     @Test
@@ -75,58 +94,115 @@ public class LocationPreferenceControllerTest {
         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());
+    }
+
+    @Test
+    public void testPreferenceController_ProperResultPayloadType() {
+        final Context context = RuntimeEnvironment.application;
+        mController = new LocationPreferenceController(context, null /* lifecycle */);
+        ResultPayload payload = mController.getResultPayload();
+        assertThat(payload).isInstanceOf(InlineListPayload.class);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testSetValue_updatesCorrectly() {
+        int newValue = Secure.LOCATION_MODE_BATTERY_SAVING;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.Secure.getInt(resolver, Secure.LOCATION_MODE,
+                Secure.LOCATION_MODE_OFF);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testGetValue_correctValueReturned() {
+        int expectedValue = Secure.LOCATION_MODE_BATTERY_SAVING;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Secure.LOCATION_MODE, expectedValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(expectedValue);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index 0c46ed914cda1888aed086d57a3fedc2fc009c6b..66e357b53a57412b93d2da3865e539a10c664a82 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -26,7 +26,8 @@ import android.telephony.TelephonyManager;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsWrapper;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -87,6 +88,7 @@ public class MobileNetworkPreferenceControllerTest {
     }
 
     @Test
+    @Config(shadows = ShadowRestrictedLockUtilsWrapper.class)
     public void wifiOnly_prefIsNotAvailable() {
         when(mUserManager.isAdminUser()).thenReturn(true);
         when(mUserManager.hasUserRestriction(anyString(), any(UserHandle.class)))
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index aa321bdc9d2cdc0679f306233339af1101c0fa64..7471632be11cd3f3ac96924202bcd6fc6fc312a6 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -19,14 +19,18 @@ import android.content.Context;
 import android.provider.SearchIndexableResource;
 import android.view.Menu;
 
+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.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;
@@ -35,18 +39,27 @@ import org.robolectric.util.ReflectionHelpers;
 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();
     }
 
@@ -74,7 +87,7 @@ public class NetworkDashboardFragmentTest {
 
         mFragment.onCreateOptionsMenu(null, null);
 
-        verify(resetController).buildMenuItem(any(Menu.class));
+        verify(resetController).buildMenuItem(nullable(Menu.class));
     }
 
     @Test
@@ -88,4 +101,58 @@ public class NetworkDashboardFragmentTest {
 
         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/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 4ae8c2c703fe0c5e8c9bfbb176a73f30e98e31e3..b8a6d28a25307d73bbc96f3aceb790397db6a1eb 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.network;
 
-
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
@@ -77,6 +76,14 @@ public class TetherPreferenceControllerTest {
         ReflectionHelpers.setField(mController, "mPreference", mPreference);
     }
 
+    @Test
+    public void lifeCycle_onCreate_shouldInitBluetoothPan() {
+        mController.onCreate(null);
+
+        verify(mBluetoothAdapter).getProfileProxy(mContext, mController.mBtProfileServiceListener,
+                BluetoothProfile.PAN);
+    }
+
     @Test
     public void goThroughLifecycle_shouldDestoryBluetoothProfile() {
         final BluetoothPan pan = mock(BluetoothPan.class);
@@ -161,7 +168,8 @@ public class TetherPreferenceControllerTest {
         mController.onResume();
 
         verify(mContext).registerReceiver(
-            any(TetherPreferenceController.TetherBroadcastReceiver.class), any(IntentFilter.class));
+                any(TetherPreferenceController.TetherBroadcastReceiver.class),
+                any(IntentFilter.class));
     }
 
     @Test
@@ -172,7 +180,7 @@ public class TetherPreferenceControllerTest {
         mController.onPause();
 
         verify(mContext).unregisterReceiver(
-            any(TetherPreferenceController.TetherBroadcastReceiver.class));
+                any(TetherPreferenceController.TetherBroadcastReceiver.class));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
index ed424275ded47c2c41a16ac063ec5ee8378fd6bf..b7c48485c15f24646f07a2b0f136e1a6a38c14e7 100644
--- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
@@ -27,7 +27,7 @@ import android.support.v7.preference.PreferenceScreen;
 
 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/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 119ad26133cf44e082de9275ba0e01527802efff..a82daf3c09459a656a2e534dd42cf0185cabb70c 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 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 org.robolectric.annotation.Config;
 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 @@ public class PaymentSettingsTest {
         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/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
index 618574cdda4c42509b5a229e4e572895ba4aa50a..c1a7d055463f002e6a0c622cb13f79245b80935a 100644
--- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.notification;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
@@ -23,6 +24,9 @@ import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.preference.TwoStatePreference;
 
 import com.android.settings.TestConfig;
+import com.android.settings.search.InlinePayload;
+import com.android.settings.search.InlineSwitchPayload;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -35,6 +39,9 @@ import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
 import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
+
+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.never;
@@ -106,4 +113,35 @@ public class BadgingNotificationPreferenceControllerTest {
 
         verify(preference).setChecked(false);
     }
+
+    @Test
+    public void testPreferenceController_ProperResultPayloadType() {
+        assertThat(mController.getResultPayload()).isInstanceOf(InlineSwitchPayload.class);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testSetValue_updatesCorrectly() {
+        int newValue = 0;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.NOTIFICATION_BADGING, 1);
+
+        ((InlinePayload) mController.getResultPayload()).setValue(mContext, newValue);
+        int updatedValue = Settings.Secure.getInt(resolver, Settings.Secure.NOTIFICATION_BADGING,
+                1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    @Config(shadows = ShadowSecureSettings.class)
+    public void testGetValue_correctValueReturned() {
+        int currentValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, Settings.Secure.NOTIFICATION_BADGING, currentValue);
+
+        int newValue = ((InlinePayload) mController.getResultPayload()).getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
index bf3ba866556e7bb5c883656872a4a59c50928e07..58ba46bf1775eb16d7233dc8f3f5a404f3250b5d 100644
--- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
@@ -32,7 +32,6 @@ import org.mockito.Answers;
 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/MediaVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
index 31dc68341e97b3f590f5cfab777527d8d110658f..ca7fc444565710ef921b9999aecfdd63fac656a0 100644
--- a/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/MediaVolumePreferenceControllerTest.java
@@ -30,7 +30,6 @@ import org.mockito.MockitoAnnotations;
 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 8b15a0ed22b291d6c91ca3cc898011e6236090d7..d3f66b9a204d9b2f91038680cb9b527163108778 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAccessSettingsTest.java
@@ -16,6 +16,10 @@
 
 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;
@@ -31,10 +35,6 @@ import org.mockito.Mock;
 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 @@ public class NotificationAccessSettingsTest {
     @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/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
index f0eb139fea1780331b5657d81a57e927f7cb2d75..97c0d94d44539e016bb13fc6113715c0cc44fe70 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
@@ -16,11 +16,18 @@
 
 package com.android.settings.notification;
 
+import android.app.NotificationManager;
+import android.app.NotificationManager.Policy;
+import android.content.Context;
+import android.support.v7.preference.Preference;
+
+import com.android.settings.R;
 import com.android.settings.notification.NotificationBackend.AppRow;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import org.robolectric.annotation.Config;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
index 1eb935fe142e73ec133a61ad0fc004adee72b84a..307536dd0737ec4ae4232e1ef53ecea76c5ca829 100644
--- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
@@ -25,7 +25,7 @@ import android.support.v7.preference.PreferenceScreen;
 import com.android.settings.SettingsPreferenceFragment;
 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 org.robolectric.shadows.ShadowApplication;
 
 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/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
index 04e430b6ae441bbf85970c2752f67803b1406bd3..b0ab54bdc77597a38b6dd95196bb481836c7b0d5 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
@@ -36,7 +36,7 @@ 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.Mockito.doReturn;
 import static org.mockito.Mockito.when;
 
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
index bc5ddc2cb11a59506975df610e449049d2d8f35f..a1d9205db1cb29089fb2a098ca2c843d1e1c5a8e 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
@@ -16,6 +16,13 @@
 
 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.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
@@ -30,13 +37,6 @@ import org.mockito.Mock;
 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 {
@@ -55,7 +55,7 @@ public class VolumeSeekBarPreferenceControllerTest {
     @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/VolumeSeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..b091cd37bd0477839536c92893962aeb0801e80d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceTest.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.notification;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doCallRealMethod;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.media.AudioManager;
+
+import com.android.settings.TestConfig;
+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.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class VolumeSeekBarPreferenceTest {
+
+    @Mock
+    private AudioManager mAudioManager;
+    @Mock
+    private VolumeSeekBarPreference mPreference;
+    @Mock
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.AUDIO_SERVICE)).thenReturn(mAudioManager);
+        mPreference.mAudioManager = mAudioManager;
+    }
+
+    @Test
+    public void setStream_shouldSetMaxAndProgress() {
+        final int stream = 5;
+        final int max = 17;
+        final int progress = 4;
+        when(mAudioManager.getStreamMaxVolume(stream)).thenReturn(max);
+        when(mAudioManager.getStreamVolume(stream)).thenReturn(progress);
+        doCallRealMethod().when(mPreference).setStream(anyInt());
+
+        mPreference.setStream(stream);
+
+        verify(mPreference).setMax(max);
+        verify(mPreference).setProgress(progress);
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
index 38abfa42917fabc975ea6d83dbd4c0890d5ec670..0c826ed1fbc6d85fa2cf6ad6fcf54ce440a4f1b3 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;
@@ -38,16 +48,6 @@ 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.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 @@ public class WorkSoundPreferenceControllerTest {
 
     @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 @@ public class WorkSoundPreferenceControllerTest {
 
     @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 @@ public class WorkSoundPreferenceControllerTest {
 
     @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 @@ public class WorkSoundPreferenceControllerTest {
         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 @@ public class WorkSoundPreferenceControllerTest {
 
         // 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 @@ public class WorkSoundPreferenceControllerTest {
         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 @@ public class WorkSoundPreferenceControllerTest {
         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 @@ public class WorkSoundPreferenceControllerTest {
 
     @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 @@ public class WorkSoundPreferenceControllerTest {
 
     @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 @@ public class WorkSoundPreferenceControllerTest {
 
         mController.onPreferenceChange(preference, "hello");
 
-        verify(preference).setSummary(anyString());
+        verify(preference).setSummary(nullable(String.class));
     }
 
     @Test
@@ -208,9 +208,9 @@ public class WorkSoundPreferenceControllerTest {
         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 @@ public class WorkSoundPreferenceControllerTest {
         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 @@ public class WorkSoundPreferenceControllerTest {
     @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/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
index dd5c590df8f18f4befa063373b798e1b48722aea..716e2b274e52dcc5fd0470eb2c12724f50fa1625 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.notification;
 
+import android.app.NotificationManager;
 import android.content.Context;
 
 import com.android.settings.R;
@@ -29,8 +30,8 @@ import org.robolectric.RuntimeEnvironment;
 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;
+
+import static junit.framework.Assert.assertTrue;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -62,6 +63,38 @@ public class ZenModeSettingsTest {
         final String result = mBuilder.append(original, true, R.string.zen_mode_alarms);
 
         assertThat(result).contains(alarm);
+        assertThat(result).contains(original);
+        assertTrue(result.indexOf(original) < result.indexOf(alarm));
+    }
+
+    @Test
+    public void testPrepend() {
+        String original = mContext.getString(R.string.zen_mode_alarms);
+        String reminders = mContext.getString(R.string.zen_mode_reminders);
+
+        final String result = mBuilder.prepend(original, true, R.string.zen_mode_reminders);
+        assertThat(result).contains(original);
+        assertThat(result).contains(reminders);
+        assertTrue(result.indexOf(reminders) < result.indexOf(original));
+    }
+
+    @Test
+    public void testGetPrioritySettingSummary_sameOrderAsTargetPage() {
+        NotificationManager.Policy policy = new NotificationManager.Policy(
+                NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS
+                        | NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS,
+                0, 0);
+        final String result = mBuilder.getPrioritySettingSummary(policy);
+
+        String alarms = mContext.getString(R.string.zen_mode_alarms);
+        String reminders = mContext.getString(R.string.zen_mode_reminders);
+        String events = mContext.getString(R.string.zen_mode_events);
+
+        assertThat(result).contains(alarms);
+        assertThat(result).contains(reminders);
+        assertThat(result).contains(events);
+        assertTrue(result.indexOf(reminders) < result.indexOf(events) &&
+                result.indexOf(events) < result.indexOf(alarms));
     }
 
 }
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 0000000000000000000000000000000000000000..28b0264a347dc7a54bccfaf95a32fa66983a3f5e
--- /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 0000000000000000000000000000000000000000..5fa731eddc196149dd966f81b53c4496d68d5e78
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.os.UserHandle;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment;
+import com.android.settings.password.ChooseLockPassword.IntentBuilder;
+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;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.setupwizardlib.GlifLayout;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowDrawable;
+
+@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 ChooseLockPasswordTest {
+
+    @Before
+    public void setUp() throws Exception {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_headlineFontFamily, "");
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @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);
+    }
+
+    @Test
+    public void assertThat_chooseLockIconChanged_WhenFingerprintExtraSet() {
+        ShadowDrawable drawable = setActivityAndGetIconDrawable(true);
+        assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header);
+    }
+
+    @Test
+    public void assertThat_chooseLockIconNotChanged_WhenFingerprintExtraSet() {
+        ShadowDrawable drawable = setActivityAndGetIconDrawable(false);
+        assertThat(drawable.getCreatedFromResId()).isNotEqualTo(R.drawable.ic_fingerprint_header);
+    }
+
+    private ShadowDrawable setActivityAndGetIconDrawable(boolean addFingerprintExtra) {
+        ChooseLockPassword passwordActivity =
+                Robolectric.buildActivity(
+                        ChooseLockPassword.class,
+                        new IntentBuilder(application)
+                                .setUserId(UserHandle.myUserId())
+                                .setForFingerprint(addFingerprintExtra)
+                                .build())
+                        .setup().get();
+        ChooseLockPasswordFragment fragment = (ChooseLockPasswordFragment)
+                passwordActivity.getFragmentManager().findFragmentById(R.id.main_content);
+        return Shadows.shadowOf(((GlifLayout) fragment.getView()).getIcon());
+    }
+}
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 0000000000000000000000000000000000000000..b2380496ae1b953a36e29ba9d32c5f8636470c13
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 android.os.UserHandle;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
+import com.android.settings.password.ChooseLockPattern.IntentBuilder;
+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;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.setupwizardlib.GlifLayout;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowDrawable;
+
+@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);
+    }
+
+    @Test
+    public void assertThat_chooseLockIconChanged_WhenFingerprintExtraSet() {
+        ChooseLockPattern activity = createActivity(true);
+        ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
+                activity.getFragmentManager().findFragmentById(R.id.main_content);
+        ShadowDrawable drawable = Shadows.shadowOf(((GlifLayout) fragment.getView()).getIcon());
+        assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header);
+    }
+
+    private ChooseLockPattern createActivity(boolean addFingerprintExtra) {
+        return Robolectric.buildActivity(
+                ChooseLockPattern.class,
+                new IntentBuilder(application)
+                        .setUserId(UserHandle.myUserId())
+                        .setForFingerprint(addFingerprintExtra)
+                        .build())
+                .setup().get();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..20a05e3b2dc62c423793ac518edc96789ab00fd4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
@@ -0,0 +1,157 @@
+package com.android.settings.password;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.UserHandle;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.setupwizardlib.util.WizardManagerHelper;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowActivity.IntentForResult;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                ShadowUserManager.class,
+                ShadowUtils.class
+        })
+public class ChooseLockSettingsHelperTest {
+
+    @Test
+    public void testLaunchConfirmationActivityWithExternalAndChallenge() {
+
+        final int userId = UserHandle.myUserId();
+        final int request = 100;
+        final long challenge = 10000L;
+
+        final Activity activity = Robolectric.setupActivity(Activity.class);
+        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
+        helper.launchConfirmationActivityWithExternalAndChallenge(
+                request, // request
+                "title",
+                "header",
+                "description",
+                true, // external
+                challenge,
+                userId
+        );
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+        Intent startedIntent = shadowActivity.getNextStartedActivity();
+
+        assertEquals(new ComponentName("com.android.settings",
+                        ConfirmLockPattern.InternalActivity.class.getName()),
+                startedIntent.getComponent());
+        assertFalse(startedIntent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
+        assertTrue(startedIntent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
+        assertEquals(challenge, startedIntent.getLongExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
+        assertEquals(
+                true,
+                (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
+        assertEquals(true, startedIntent.getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
+        assertEquals(true, startedIntent.getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
+        assertEquals(true, startedIntent.getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false));
+        assertEquals(true, startedIntent.getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false));
+    }
+
+    @Test
+    public void testLaunchConfirmationActivityInternalAndChallenge() {
+
+        final int userId = UserHandle.myUserId();
+        final int request = 100;
+        final long challenge = 10000L;
+
+        final Activity activity = Robolectric.setupActivity(Activity.class);
+        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
+        helper.launchConfirmationActivityWithExternalAndChallenge(
+                request,
+                "title",
+                "header",
+                "description",
+                false, // external
+                challenge,
+                userId
+        );
+        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+        Intent startedIntent = shadowActivity.getNextStartedActivity();
+
+        assertEquals(new ComponentName("com.android.settings",
+                        ConfirmLockPattern.InternalActivity.class.getName()),
+                startedIntent.getComponent());
+        assertFalse(startedIntent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
+        assertTrue(startedIntent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
+        assertEquals(challenge, startedIntent.getLongExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
+        assertEquals(
+                false,
+                (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
+        assertEquals(false, startedIntent.getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
+        assertEquals(false, startedIntent.getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
+        assertEquals(false, startedIntent.getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false));
+        assertEquals(false, startedIntent.getBooleanExtra(
+                ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false));
+    }
+
+    @Test
+    public void testLaunchConfirmationActivity_internal_shouldPropagateTheme() {
+        Intent intent = new Intent()
+                .putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2);
+        Activity activity = Robolectric.buildActivity(Activity.class)
+                .withIntent(intent)
+                .get();
+        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
+        helper.launchConfirmationActivity(123, "test title", true, 0 /* userId */);
+
+        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
+        IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult();
+        assertThat(startedActivity.requestCode).isEqualTo(123);
+        assertThat(startedActivity.intent.getStringExtra(WizardManagerHelper.EXTRA_THEME))
+                .isEqualTo(WizardManagerHelper.THEME_GLIF_V2);
+    }
+
+
+    private ChooseLockSettingsHelper getChooseLockSettingsHelper(Activity activity) {
+        LockPatternUtils mockLockPatternUtils = mock(LockPatternUtils.class);
+        when(mockLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt()))
+                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+
+        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(activity);
+        helper.mLockPatternUtils = mockLockPatternUtils;
+        return helper;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..0a0734f54c01401ad77c2871bb03c7e15108cdb4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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 org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.any;
+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 android.app.AlertDialog;
+import android.app.Fragment;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEventLogWriter;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+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,
+        shadows = {
+                ShadowEventLogWriter.class,
+                ShadowUserManager.class,
+                ShadowUtils.class
+        })
+public class ChooseLockTypeDialogFragmentTest {
+    private Context mContext;
+    private TestFragment mFragment;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mFragment = new TestFragment();
+        FragmentTestUtil.startFragment(mFragment);
+    }
+
+    @Test
+    public void testThatDialog_IsShown() {
+        AlertDialog latestDialog = startLockFragment();
+        assertNotNull(latestDialog);
+        ShadowDialog shadowDialog = Shadows.shadowOf(latestDialog);
+        // verify that we are looking at the expected dialog.
+        assertEquals(shadowDialog.getTitle(),
+                mContext.getString(R.string.setup_lock_settings_options_dialog_title));
+    }
+
+    @Test
+    public void testThat_OnClickListener_IsCalled() {
+        mFragment.mDelegate = mock(OnLockTypeSelectedListener.class);
+        AlertDialog lockDialog = startLockFragment();
+        ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(lockDialog);
+        shadowAlertDialog.clickOnItem(0);
+        verify(mFragment.mDelegate, times(1)).onLockTypeSelected(any(ScreenLockType.class));
+    }
+
+    @Test
+    public void testThat_OnClickListener_IsNotCalledWhenCancelled() {
+        mFragment.mDelegate = mock(OnLockTypeSelectedListener.class);
+        AlertDialog lockDialog = startLockFragment();
+        lockDialog.dismiss();
+        verify(mFragment.mDelegate, never()).onLockTypeSelected(any(ScreenLockType.class));
+    }
+
+
+    private AlertDialog startLockFragment() {
+        ChooseLockTypeDialogFragment chooseLockTypeDialogFragment =
+                ChooseLockTypeDialogFragment.newInstance(1234);
+        chooseLockTypeDialogFragment.show(mFragment.getChildFragmentManager(), null);
+        return ShadowAlertDialog.getLatestAlertDialog();
+    }
+
+
+    public static class TestFragment extends Fragment
+            implements OnLockTypeSelectedListener{
+        OnLockTypeSelectedListener mDelegate;
+        @Override
+        public void onLockTypeSelected(ScreenLockType lock) {
+            if (mDelegate != null) {
+                mDelegate.onLockTypeSelected(lock);
+            }
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
similarity index 74%
rename from tests/robotests/src/com/android/settings/ConfirmCredentialTest.java
rename to tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
index 3bcaf1a68b024f0ec65880981ee7a56a7b99063c..d76968e86407f669ff0bcd5c3c0bb7eb2174eb21 100644
--- a/tests/robotests/src/com/android/settings/ConfirmCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
@@ -14,16 +14,17 @@
  * 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.FragmentManager;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
 import org.junit.Test;
@@ -45,11 +46,14 @@ public class ConfirmCredentialTest {
         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 0000000000000000000000000000000000000000..8beefa8c1940608d5a2e66a4bb7db54da3090e81
--- /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 5cbf3a991ffb647b9893c6a725c8aa667091060d..cb863a0863a1e092887c4cd8d7f34601d7d4805b 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.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.SetupChooseLockGeneric;
 import com.android.settings.TestConfig;
 
 import org.junit.After;
@@ -35,9 +37,6 @@ import org.robolectric.RuntimeEnvironment;
 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 c52ad33333cdb36c9419029422170a14e7ceec69..96775addb8cd4f67d5584a3ad6662abcdc0da19d 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -16,6 +16,25 @@
 
 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;
@@ -33,20 +52,6 @@ import org.mockito.Mock;
 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 0000000000000000000000000000000000000000..39a0fb66663702b0874591dce18c903691105d94
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.app.AlertDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.settings.R;
+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.SettingsRobolectricTestRunner;
+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.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowActivity.IntentForResult;
+import org.robolectric.shadows.ShadowAlertDialog;
+import org.robolectric.shadows.ShadowDialog;
+
+import java.util.Collections;
+import java.util.List;
+
+@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 {
+
+    @Before
+    public void setUp() throws Exception {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.string.config_headlineFontFamily, "");
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @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() {
+        SetupChooseLockPassword activity = createSetupChooseLockPassword();
+        Button optionsButton = activity.findViewById(R.id.screen_lock_options);
+        assertThat(optionsButton).isNotNull();
+        optionsButton.performClick();
+        assertThat(ShadowDialog.getLatestDialog()).isNotNull();
+    }
+
+    @Test
+    @Config(shadows = ShadowChooseLockGenericController.class)
+    public void createActivity_withShowOptionsButtonExtra_buttonNotVisibleIfNoVisibleLockTypes() {
+        SetupChooseLockPassword activity = createSetupChooseLockPassword();
+        Button optionsButton = activity.findViewById(R.id.screen_lock_options);
+        assertThat(optionsButton).isNotNull();
+        assertThat(optionsButton.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void allSecurityOptions_shouldBeShown_When_OptionsButtonIsClicked() {
+        SetupChooseLockPassword activity = createSetupChooseLockPassword();
+        activity.findViewById(R.id.screen_lock_options).performClick();
+        AlertDialog latestAlertDialog = ShadowAlertDialog.getLatestAlertDialog();
+        int count = Shadows.shadowOf(latestAlertDialog).getAdapter().getCount();
+        assertThat(count).named("List items shown").isEqualTo(3);
+    }
+
+    @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");
+    }
+
+    private SetupChooseLockPassword createSetupChooseLockPassword() {
+        Intent intent = SetupChooseLockPassword.modifyIntentForSetup(
+                application,
+                new IntentBuilder(application).build());
+        intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
+        return Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
+    }
+
+    @Implements(ChooseLockGenericController.class)
+    public static class ShadowChooseLockGenericController {
+        @Implementation
+        public List<ScreenLockType> getVisibleScreenLockTypes(int quality,
+                boolean includeDisabled) {
+            return Collections.emptyList();
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
index f7830f0072ff7cf49b35600790ebd9fad5d2fc0e..cf34f452d14168dd8507171a6b8919d682d275e9 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsFragmentTest.java
@@ -22,6 +22,8 @@ import static org.mockito.Mockito.when;
 
 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;
 
@@ -34,9 +36,11 @@ 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;
 
 
@@ -62,6 +66,19 @@ public class PrintSettingsFragmentTest {
                 mPrintManager);
     }
 
+    @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);
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index a204d9dbd130f9b2da33e614c28979d1b59b92b2..ff39deb6f428689e696dd0a124d32a2bf76dc28e 100644
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -60,7 +60,7 @@ public class BaseSearchIndexProviderTest {
 
     @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 0000000000000000000000000000000000000000..f7628cad1711ee21e91fb26d546a1e974ba02318
--- /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 */, 0 /* defautValue */);
+
+        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.getType()).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 31373cd467807567a195b1712f2a5a97bc969cd3..ba2b63656c0bbf90822b8ed6a4ad8949b31b7d8f 100644
--- a/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
+++ b/tests/robotests/src/com/android/settings/search/DataIntegrityTest.java
@@ -10,7 +10,6 @@ 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 88%
rename from tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
rename to tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
index f2adb190db2a7448e704c001226fbbfa302ad767..3641368cb96e9212312a715db24a080e33b7e0b7 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java
@@ -15,7 +15,22 @@
  *
  */
 
-package com.android.settings.search2;
+package com.android.settings.search;
+
+import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
+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.anyMap;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
@@ -23,6 +38,7 @@ import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ProviderInfo;
 import android.content.pm.ResolveInfo;
@@ -33,15 +49,15 @@ import android.net.Uri;
 import android.os.Build;
 import android.provider.SearchIndexableResource;
 import android.util.ArrayMap;
+
 import com.android.settings.R;
-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.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 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;
@@ -62,21 +78,6 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
-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.anyMap;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.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,
         shadows = {ShadowRunnableAsyncTask.class})
@@ -132,11 +133,12 @@ public class DatabaseIndexingManagerTest {
         mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
 
         doReturn(mPackageManager).when(mContext).getPackageManager();
+        FakeFeatureFactory.setupForTest(mContext);
     }
 
     @After
     public void cleanUp() {
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
@@ -176,15 +178,30 @@ public class DatabaseIndexingManagerTest {
     @Test
     public void testInsertRawColumn_rowInserted() {
         SearchIndexableRaw raw = getFakeRaw();
-        mManager.indexOneSearchIndexableData(mDb, localeStr, raw, null /* Non-indexable keys */);
+        mManager.indexOneSearchIndexableData(mDb, localeStr, raw,
+                new HashMap<>()/* Non-indexable keys */);
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
         assertThat(cursor.getCount()).isEqualTo(1);
     }
 
+    @Test
+    public void testInsertRawColumn_nonIndexableKey_resultIsDisabled() {
+        SearchIndexableRaw raw = getFakeRaw();
+        Map<String, Set<String>> niks = new HashMap<>();
+        Set<String> keys = new HashSet<>();
+        keys.add(raw.key);
+        niks.put(raw.intentTargetPackage, keys);
+
+        mManager.indexOneSearchIndexableData(mDb, localeStr, raw, niks);
+        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 0", null);
+        assertThat(cursor.getCount()).isEqualTo(1);
+    }
+
     @Test
     public void testInsertRawColumn_rowMatches() {
         SearchIndexableRaw raw = getFakeRaw();
-        mManager.indexOneSearchIndexableData(mDb, localeStr, raw, null /* Non-indexable keys */);
+        mManager.indexOneSearchIndexableData(mDb, localeStr, raw,
+                new HashMap<>()/* Non-indexable keys */);
         Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
         cursor.moveToPosition(0);
 
@@ -229,7 +246,10 @@ public class DatabaseIndexingManagerTest {
         // 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 +276,7 @@ public class DatabaseIndexingManagerTest {
         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 +291,7 @@ public class DatabaseIndexingManagerTest {
         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 +343,10 @@ public class DatabaseIndexingManagerTest {
         // 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 +382,7 @@ public class DatabaseIndexingManagerTest {
                 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 +406,7 @@ public class DatabaseIndexingManagerTest {
         // 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 +429,10 @@ public class DatabaseIndexingManagerTest {
         // 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 +486,10 @@ public class DatabaseIndexingManagerTest {
         // 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 +543,10 @@ public class DatabaseIndexingManagerTest {
         // 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
@@ -555,7 +588,7 @@ public class DatabaseIndexingManagerTest {
         // Locale
         assertThat(cursor.getString(0)).isEqualTo(localeStr);
         // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
+        assertThat(cursor.getInt(1)).isEqualTo(0);
         // Data Title
         assertThat(cursor.getString(2)).isEqualTo("Display size");
         // Normalized Title
@@ -594,7 +627,10 @@ public class DatabaseIndexingManagerTest {
         // 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
@@ -609,7 +645,7 @@ public class DatabaseIndexingManagerTest {
 
     @Test
     public void testResourceProvider_resourceRowMatches() {
-        SearchIndexableResource resource = getFakeResource(0);
+        SearchIndexableResource resource = getFakeResource(0 /* xml */);
         resource.className = "com.android.settings.display.ScreenZoomSettings";
 
         mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
@@ -619,7 +655,7 @@ public class DatabaseIndexingManagerTest {
         // Locale
         assertThat(cursor.getString(0)).isEqualTo(localeStr);
         // Data Rank
-        assertThat(cursor.getInt(1)).isEqualTo(rank);
+        assertThat(cursor.getInt(1)).isEqualTo(0);
         // Data Title
         assertThat(cursor.getString(2)).isEqualTo("Display size");
         // Normalized Title
@@ -659,12 +695,15 @@ public class DatabaseIndexingManagerTest {
         // 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
     public void testResourceProvider_disabledResource_rowsInserted() {
-        SearchIndexableResource resource = getFakeResource(0);
+        SearchIndexableResource resource = getFakeResource(0 /* xml */);
         resource.className = "com.android.settings.LegalSettings";
 
         mManager.indexOneSearchIndexableData(mDb, localeStr, resource,
@@ -686,10 +725,29 @@ public class DatabaseIndexingManagerTest {
         assertThat(cursor.getCount()).isEqualTo(1);
     }
 
+    @Test
+    public void testResourceProvider_nonSubsettingIntent() {
+        SearchIndexableResource resource = getFakeResource(0 /* xml */);
+        String fakeAction = "fake_action";
+        resource.className = "com.android.settings.LegalSettings";
+        resource.intentAction = fakeAction;
+        resource.intentTargetPackage = SearchIndexableResources.SUBSETTING_TARGET_PACKAGE;
+
+        mManager.indexOneSearchIndexableData(mDb, localeStr, resource, new HashMap<>());
+        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
+        cursor.moveToPosition(0);
+
+        // Intent Action
+        assertThat(cursor.getString(13)).isEqualTo(fakeAction);
+        // Target Package
+        assertThat(cursor.getString(14))
+                .isEqualTo(SearchIndexableResources.SUBSETTING_TARGET_PACKAGE);
+    }
+
     // Test new public indexing flow
 
     @Test
-    @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
+    @Config(shadows = {ShadowDatabaseIndexingUtils.class})
     public void testPerformIndexing_fullIndex_getsDataFromProviders() {
         DummyProvider provider = new DummyProvider();
         provider.onCreate();
@@ -701,7 +759,6 @@ public class DatabaseIndexingManagerTest {
 
         DatabaseIndexingManager manager =
                 spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-        doReturn(true).when(manager).isFullIndex(anyString(), anyString());
 
         manager.performIndexing();
 
@@ -712,17 +769,17 @@ public class DatabaseIndexingManagerTest {
     @Test
     @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
     public void testPerformIndexing_incrementalIndex_noDataAdded() {
+        final List<ResolveInfo> providerInfo = getDummyResolveInfo();
+        skipFullIndex(providerInfo);
         DummyProvider provider = new DummyProvider();
         provider.onCreate();
         ShadowContentResolver.registerProvider(AUTHORITY_ONE, provider);
-
         // Test that Indexables are added for Full indexing
         when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
-                .thenReturn(getDummyResolveInfo());
+                .thenReturn(providerInfo);
 
         DatabaseIndexingManager manager =
                 spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-        doReturn(false).when(manager).isFullIndex(anyString(), anyString());
 
         manager.mDataToProcess.dataToUpdate.clear();
 
@@ -748,7 +805,6 @@ public class DatabaseIndexingManagerTest {
         // Initialize the Manager
         DatabaseIndexingManager manager =
                 spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-        doReturn(true).when(manager).isFullIndex(anyString(), anyString());
 
         // Insert data point which will be dropped
         final String oldTitle = "This is French";
@@ -788,13 +844,34 @@ public class DatabaseIndexingManagerTest {
 
         DatabaseIndexingManager manager =
                 spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-        doReturn(true).when(manager).isFullIndex(anyString(), anyString());
 
         manager.performIndexing();
 
         verify(manager).updateDatabase(true /* isFullIndex */, Locale.getDefault().toString());
     }
 
+    @Test
+    @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
+    public void testPerformIndexing_onPackageChange_shouldFullIndex() {
+        final List<ResolveInfo> providers = getDummyResolveInfo();
+        final String buildNumber = Build.FINGERPRINT;
+        final String locale = Locale.getDefault().toString();
+        skipFullIndex(providers);
+
+        // This snapshot is already indexed. Should return false
+        assertThat(IndexDatabaseHelper.isFullIndex(
+                mContext, locale, buildNumber,
+                IndexDatabaseHelper.buildProviderVersionedNames(providers)))
+                .isFalse();
+
+        // Change provider version number, this should trigger full index.
+        providers.get(0).providerInfo.applicationInfo.versionCode++;
+
+        assertThat(IndexDatabaseHelper.isFullIndex(mContext, locale, buildNumber,
+                IndexDatabaseHelper.buildProviderVersionedNames(providers)))
+                .isTrue();
+    }
+
     @Test
     @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
     public void testPerformIndexing_onOta_buildNumberIsCached() {
@@ -810,7 +887,6 @@ public class DatabaseIndexingManagerTest {
 
         DatabaseIndexingManager manager =
                 spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
-        doReturn(true).when(manager).isFullIndex(anyString(), anyString());
 
         manager.performIndexing();
 
@@ -896,7 +972,10 @@ public class DatabaseIndexingManagerTest {
         // 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
@@ -977,6 +1056,13 @@ public class DatabaseIndexingManagerTest {
 
     // Util functions
 
+    private void skipFullIndex(List<ResolveInfo> providers) {
+        IndexDatabaseHelper.setLocaleIndexed(mContext, Locale.getDefault().toString());
+        IndexDatabaseHelper.setBuildIndexed(mContext, Build.FINGERPRINT);
+        IndexDatabaseHelper.setProvidersIndexed(mContext,
+                IndexDatabaseHelper.buildProviderVersionedNames(providers));
+    }
+
     private SearchIndexableRaw getFakeRaw() {
         return getFakeRaw(localeStr);
     }
@@ -1032,6 +1118,7 @@ public class DatabaseIndexingManagerTest {
         info.providerInfo.exported = true;
         info.providerInfo.authority = AUTHORITY_ONE;
         info.providerInfo.packageName = PACKAGE_ONE;
+        info.providerInfo.applicationInfo = new ApplicationInfo();
         infoList.add(info);
 
         return infoList;
@@ -1065,7 +1152,6 @@ public class DatabaseIndexingManagerTest {
     }
 
     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 7269c6b6dc45771d8d729ada9e919b7943b41a5f..d44ecff35a0199c650df9aed9e48ec1245c93d18 100644
--- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingUtilsTest.java
@@ -17,30 +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.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.core.PreferenceController;
-import com.android.settings.display.AutoBrightnessPreferenceController;
-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 {
@@ -52,7 +49,7 @@ public class DatabaseIndexingUtilsTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = ShadowApplication.getInstance().getApplicationContext();
+        mContext = RuntimeEnvironment.application;
     }
 
     @Test
@@ -69,11 +66,11 @@ public class DatabaseIndexingUtilsTest {
 
     @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
@@ -98,13 +95,13 @@ public class DatabaseIndexingUtilsTest {
 
             @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/search2/DatabaseResultLoaderTest.java b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
similarity index 56%
rename from tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
index bd4d39c75b1c1d8236af45e5f5efdfa68aaced6c..90f6e87907e9056016b98bbd09dd9f969a6aa39a 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseResultLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/DatabaseResultLoaderTest.java
@@ -15,19 +15,18 @@
  *
  */
 
-package com.android.settings.search2;
+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.search.IndexDatabaseHelper;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.After;
 import org.junit.Before;
@@ -39,8 +38,9 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
-import java.util.List;
+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;
@@ -58,15 +58,6 @@ public class DatabaseResultLoaderTest {
     @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;
 
@@ -85,357 +76,160 @@ public class DatabaseResultLoaderTest {
 
     @After
     public void cleanUp() {
-        DatabaseTestUtils.clearDb();
+        DatabaseTestUtils.clearDb(mContext);
     }
 
     @Test
     public void testMatchTitle() {
-        loader = new DatabaseResultLoader(mContext, "title", mSiteMapManager);
+        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() {
-        loader = new DatabaseResultLoader(mContext, "summary", mSiteMapManager);
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "summary",
+                mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(2);
     }
 
     @Test
     public void testMatchKeywords() {
-        loader = new DatabaseResultLoader(mContext, "keywords", mSiteMapManager);
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "keywords",
+                mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(2);
     }
 
     @Test
     public void testMatchEntries() {
-        loader = new DatabaseResultLoader(mContext, "entries", mSiteMapManager);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, "usage", mSiteMapManager);
         assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
     public void testSpecialCaseDash_matchesWordNoDash() {
         insertSpecialCase("wi-fi calling");
-        loader = new DatabaseResultLoader(mContext, "wifi", mSiteMapManager);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
+        DatabaseResultLoader 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);
-    }
+    public void testResultMatchedByMultipleQueries_duplicatesRemoved() {
+        String key = "durr";
+        insertSameValueAllFieldsCase(key);
+        DatabaseResultLoader loader = new DatabaseResultLoader(mContext, key, null);
 
-    @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);
+        assertThat(loader.loadInBackground().size()).isEqualTo(1);
     }
 
     @Test
-    public void testSpecialCaseTwoWords_firstWordMatches_ranksHigher() {
+    public void testSpecialCaseTwoWords_multipleResults() {
         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);
+        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());
@@ -457,17 +251,19 @@ public class DatabaseResultLoaderTest {
         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.DATA_KEY_REF, normalized.hashCode());
         values.put(IndexDatabaseHelper.IndexColumns.USER_ID, 0);
         values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD_TYPE, 0);
-        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, (String) null);
+        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, 0);
+        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");
@@ -486,15 +282,15 @@ public class DatabaseResultLoaderTest {
         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.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, (String) null);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, payload);
 
         mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
 
         values = new ContentValues();
-        values.put(IndexDatabaseHelper.IndexColumns.DOCID, 1);
+        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");
@@ -513,14 +309,14 @@ public class DatabaseResultLoaderTest {
         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.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, (String) null);
+        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.DOCID, 3);
         values.put(IndexDatabaseHelper.IndexColumns.LOCALE, "en-us");
         values.put(IndexDatabaseHelper.IndexColumns.DATA_RANK, 1);
         values.put(IndexDatabaseHelper.IndexColumns.DATA_TITLE, "charlie_title");
@@ -539,10 +335,40 @@ public class DatabaseResultLoaderTest {
         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.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, (String) null);
+        values.put(IndexDatabaseHelper.IndexColumns.PAYLOAD, ResultPayloadUtils.marshall(payload));
 
         mDb.replaceOrThrow(IndexDatabaseHelper.Tables.TABLE_PREFS_INDEX, null, values);
     }
diff --git a/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java b/tests/robotests/src/com/android/settings/search/DatabaseRowTest.java
index 7c2e2f365e481871674569067a40f6689a1716b0..a0d316363adda3075f3e85e69789c8283e5e2d09 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 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 @@ import static com.google.common.truth.Truth.assertThat;
 @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 @@ public class DatabaseRowTest {
     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 @@ public class DatabaseRowTest {
     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 @@ public class DatabaseRowTest {
         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 */, 1 /* default */);
+        mBuilder.setPayload(payload);
+        final DatabaseRow row = generateRow();
+        final InlineSwitchPayload unmarshalledPayload = ResultPayloadUtils
+                .unmarshall(row.payload, InlineSwitchPayload.CREATOR);
+
+        assertThat(row.payloadType).isEqualTo(ResultPayload.PayloadType.INLINE_SWITCH);
+        assertThat(unmarshalledPayload.mSettingKey).isEqualTo(URI);
+    }
 
-        assertThat(row.payload).isNull();
+    @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 */, 1 /* default */);
+        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 @@ public class DatabaseRowTest {
                 .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 f4a2528113dac23111ab6de43bde22e93317ccc6..64a658eccca789d6fb8da9ff80f17b2f74e9419b 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;
@@ -62,7 +48,6 @@ import com.android.settings.inputmethod.PhysicalKeyboardFragment;
 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.Collection;
 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 @@ public class DynamicIndexableContentMonitorTest {
         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 35486ef59f5f852e9dcf19d51048d61dbc766c59..69c2589730e07512284b333ef67cb7c2633c40f7 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 @@ package com.android.settings.search;
 
 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 @@ public class FakeIndexProvider  implements Indexable {
 
                 @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/InlineListPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..bee8d93c1be94ee46aa845279f19d4b998e228e9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/InlineListPayloadTest.java
@@ -0,0 +1,107 @@
+package com.android.settings.search;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Parcel;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class InlineListPayloadTest {
+
+    private static final String DUMMY_SETTING = "inline_list_key";
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void testConstructor_DataRetained() {
+        final String uri = "test.com";
+        final int type = ResultPayload.PayloadType.INLINE_LIST;
+        final int source = ResultPayload.SettingsSource.SYSTEM;
+        final String intentKey = "key";
+        final String intentVal = "value";
+        final Intent intent = new Intent();
+        intent.putExtra(intentKey, intentVal);
+
+        InlineListPayload payload = new InlineListPayload(uri, source,
+                intent, true /* isAvailable */, 1 /* numOptions */, 1 /* default */);
+
+        final Intent retainedIntent = payload.getIntent();
+        assertThat(payload.mSettingKey).isEqualTo(uri);
+        assertThat(payload.getType()).isEqualTo(type);
+        assertThat(payload.mSettingSource).isEqualTo(source);
+        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_LIST;
+        int source = ResultPayload.SettingsSource.SYSTEM;
+        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(source);
+        parcel.writeInt(InlineSwitchPayload.TRUE);
+        parcel.writeInt(InlineSwitchPayload.TRUE);
+        parcel.setDataPosition(0);
+
+        InlineListPayload payload = InlineListPayload
+                .CREATOR.createFromParcel(parcel);
+
+        final Intent builtIntent = payload.getIntent();
+        assertThat(payload.mSettingKey).isEqualTo(uri);
+        assertThat(payload.getType()).isEqualTo(type);
+        assertThat(payload.mSettingSource).isEqualTo(source);
+        assertThat(payload.getAvailability()).isEqualTo(ResultPayload.Availability.AVAILABLE);
+        assertThat(builtIntent.getStringExtra(intentKey)).isEqualTo(intentVal);
+    }
+
+    @Test
+    public void testInputStandardization_inputDoesntChange() {
+        InlineListPayload payload = new InlineListPayload(DUMMY_SETTING,
+                ResultPayload.SettingsSource.SYSTEM, null /* intent */, true /* isDeviceSupport */,
+                3 /* numOptions */, 0 /* default */);
+        int input = 2;
+
+        assertThat(payload.standardizeInput(input)).isEqualTo(input);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetSystem_negativeValue_throwsError() {
+        InlineListPayload payload = new InlineListPayload(DUMMY_SETTING,
+                ResultPayload.SettingsSource.SYSTEM, null /* intent */, true /* isDeviceSupport */,
+                3 /* numOptions */, 0 /* default */);
+
+        payload.setValue(mContext, -1);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetSystem_exceedsMaxValue_throwsError() {
+        int maxOptions = 4;
+        InlineListPayload payload = new InlineListPayload(DUMMY_SETTING,
+                ResultPayload.SettingsSource.SYSTEM, null /* intent */, true /* isDeviceSupport */,
+                maxOptions /* numOptions */, 0 /* default */);
+
+        payload.setValue(mContext, maxOptions + 1);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1747cca5bba3047b593bf0f2faac52ad9d6345c9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java
@@ -0,0 +1,127 @@
+package com.android.settings.search;
+
+import android.content.Context;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.os.Parcel;
+import android.provider.Settings;
+import com.android.settings.TestConfig;
+import com.android.settings.search.ResultPayload.SettingsSource;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
+import static com.google.common.truth.Truth.assertThat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class InlinePayloadTest {
+
+    private Context mContext;
+
+    private final String KEY = "key";
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void testGetSecure_returnsSecureSetting() {
+        InlinePayload payload = getDummyPayload(SettingsSource.SECURE);
+        int currentValue = 2;
+        Settings.Secure.putInt(mContext.getContentResolver(), KEY, currentValue);
+
+        int newValue = payload.getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
+
+    @Test
+    public void testGetGlobal_returnsGlobalSetting() {
+        InlinePayload payload = getDummyPayload(SettingsSource.GLOBAL);
+        int currentValue = 2;
+        Settings.Global.putInt(mContext.getContentResolver(), KEY, currentValue);
+
+        int newValue = payload.getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
+
+    @Test
+    public void testGetSystem_returnsSystemSetting() {
+        InlinePayload payload = getDummyPayload(SettingsSource.SYSTEM);
+        int currentValue = 2;
+        Settings.System.putInt(mContext.getContentResolver(), KEY, currentValue);
+
+        int newValue = payload.getValue(mContext);
+
+        assertThat(newValue).isEqualTo(currentValue);
+    }
+
+    @Test
+    public void testSetSecure_updatesSecureSetting() {
+        InlinePayload payload = getDummyPayload(SettingsSource.SECURE);
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Secure.putInt(resolver, KEY, 0);
+
+        payload.setValue(mContext, newValue);
+        int updatedValue = Settings.System.getInt(resolver, KEY, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testSetGlobal_updatesGlobalSetting() {
+        InlinePayload payload = getDummyPayload(SettingsSource.GLOBAL);
+        int newValue = 1;
+        ContentResolver resolver = mContext.getContentResolver();
+        Settings.Global.putInt(resolver, KEY, 0);
+
+        payload.setValue(mContext, newValue);
+        int updatedValue = Settings.Global.getInt(resolver, KEY, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testSetSystem_updatesSystemSetting() {
+        InlinePayload payload = getDummyPayload(SettingsSource.SECURE);
+        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, KEY, -1);
+
+        assertThat(updatedValue).isEqualTo(newValue);
+    }
+
+    private InlinePayload getDummyPayload(int source) {
+        return new ConcreteInlinePayload(KEY, source, null /* intent */,
+                true /* isDeviceSupported */);
+    }
+
+    class ConcreteInlinePayload extends InlinePayload {
+
+        public ConcreteInlinePayload(String key, @SettingsSource int source, Intent intent,
+                boolean isDeviceSupported) {
+            super(key, source, intent, isDeviceSupported, 0 /* defaultValue */);
+        }
+
+        @Override
+        public int getType() {
+            return 0;
+        }
+
+        @Override
+        protected int standardizeInput(int input) throws IllegalArgumentException {
+            return input;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
index 74a19945d0f47455fbc56578cdcbdf1b457b8ebb..b067ea689e3028c29f14ba7f835174a3d60027da 100644
--- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java
@@ -17,97 +17,131 @@
 
 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.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;
-
-        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 static final String DUMMY_SETTING = "inline_test";
+    private static final int STANDARD_ON = 1;
+    private static final int FLIPPED_ON = 0;
 
-    @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();
-        }
+    private Context mContext;
+
+    @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);
-
-        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();
+        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, 1, intent, true,
+                1 /* default */);
+        final Intent retainedIntent = payload.getIntent();
+        assertThat(payload.mSettingKey).isEqualTo(uri);
+        assertThat(payload.getType()).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.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.getType()).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 testGetSystem_flippedSetting_returnsFlippedValue() {
+        // Stores 1s as 0s, and vis versa
+        InlineSwitchPayload payload = new InlineSwitchPayload(DUMMY_SETTING, SettingsSource.SYSTEM,
+                FLIPPED_ON, null /* intent */, true, 1 /* default */);
+        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, 1 /* default */);
+        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, 1 /* default */);
+
+        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, 1 /* default */);
+
+        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 b8e461880cd0a26af4ce822ff1bbb26cfbaf647a..94ee335a45756004f2ee6a5df372e03f37b796dd 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 @@ package com.android.settings.search;
 
 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.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 java.util.ArrayList;
 
 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 @@ public class InlineSwitchViewHolderTest {
 
     @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 @@ public class InlineSwitchViewHolderTest {
 
         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,17 @@ public class InlineSwitchViewHolderTest {
 
     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 */,
+                        1 /* default */))
                 .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 79%
rename from tests/robotests/src/com/android/settings/search2/InstalledAppResultLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/InstalledAppResultLoaderTest.java
index c4921ccf9cd0f698df469383b619ecdb54771828..d0a200dbccd98a2a695c69cc559fea9a1962b971 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,14 +12,17 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF 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.UserHandle;
 import android.os.UserManager;
 
 import com.android.settings.R;
@@ -36,17 +39,23 @@ import org.junit.runner.RunWith;
 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 java.util.stream.Collectors;
 
 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;
@@ -161,6 +170,36 @@ public class InstalledAppResultLoaderTest {
         assertThat(mLoader.loadInBackground().size()).isEqualTo(1);
     }
 
+    @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()))
@@ -182,18 +221,19 @@ public class InstalledAppResultLoaderTest {
     }
 
     @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();
-
-        // 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");
+        final Set<? extends SearchResult> results = mLoader.loadInBackground();
+
+        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
@@ -349,4 +389,41 @@ public class InstalledAppResultLoaderTest {
 
         assertThat(mLoader.loadInBackground().size()).isEqualTo(0);
     }
+
+    @Test
+    public void query_appExistsInBothProfiles() {
+        final String query = "carrot";
+        final String packageName = "carrot";
+        final int user1 = 0;
+        final int user2 = 10;
+        final int uid = 67672;
+        List<UserInfo> infos = new ArrayList<>();
+        infos.add(new UserInfo(user1, "user 1", 0));
+        infos.add(new UserInfo(user2, "user 2", UserInfo.FLAG_MANAGED_PROFILE));
+
+        when(mUserManager.getProfiles(anyInt())).thenReturn(infos);
+
+        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), eq(user1)))
+                .thenReturn(Arrays.asList(
+                        ApplicationTestUtils.buildInfo(UserHandle.getUid(user1, uid) /* uid */,
+                                packageName, 0 /* flags */,
+                                0 /* targetSdkVersion */)));
+        when(mPackageManagerWrapper.getInstalledApplicationsAsUser(anyInt(), eq(user2)))
+                .thenReturn(Arrays.asList(
+                        ApplicationTestUtils.buildInfo(UserHandle.getUid(user2, uid) /* uid */,
+                                packageName, 0 /* flags */,
+                                0 /* targetSdkVersion */)));
+
+        mLoader = new InstalledAppResultLoader(mContext, mPackageManagerWrapper, query,
+                mSiteMapManager);
+
+        Set<AppSearchResult> searchResults = (Set<AppSearchResult>) mLoader.loadInBackground();
+        assertThat(searchResults).hasSize(2);
+
+        Set<Integer> uidResults = searchResults.stream().map(result -> result.info.uid).collect(
+                Collectors.toSet());
+        assertThat(uidResults).containsExactly(
+                UserHandle.getUid(user1, uid),
+                UserHandle.getUid(user2, uid));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java b/tests/robotests/src/com/android/settings/search/IntentSearchViewHolderTest.java
index cacc042dd38a6ee00b21c5e0fef85b89e91793e1..53b3ca5c3c3592f9647d34646de0842c2f124138 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.
@@ -18,10 +18,10 @@
 package com.android.settings.search;
 
 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.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -31,26 +31,19 @@ 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.graphics.drawable.Drawable;
 import android.os.UserHandle;
-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.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.search2.AppSearchResult;
-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 com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
@@ -60,7 +53,9 @@ import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -89,7 +84,7 @@ public class IntentSearchViewHolderTest {
         mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
 
         final Context context = RuntimeEnvironment.application;
-        View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
+        final View view = LayoutInflater.from(context).inflate(R.layout.search_intent_item, null);
         mHolder = new IntentSearchViewHolder(view);
 
         mIcon = context.getDrawable(R.drawable.ic_search_history);
@@ -107,7 +102,7 @@ public class IntentSearchViewHolderTest {
 
     @Test
     public void testBindViewElements_allUpdated() {
-        SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
+        final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
         mHolder.onBind(mFragment, result);
         mHolder.itemView.performClick();
 
@@ -117,12 +112,7 @@ public class IntentSearchViewHolderTest {
         assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
         assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.GONE);
 
-        verify(mFragment).onSearchResultClicked();
-        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));
+        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
     }
 
     @Test
@@ -136,10 +126,11 @@ public class IntentSearchViewHolderTest {
     @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);
@@ -153,11 +144,12 @@ public class IntentSearchViewHolderTest {
         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);
@@ -167,11 +159,12 @@ public class IntentSearchViewHolderTest {
 
     @Test
     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))
+        final String nonBreakingSpace = mContext.getString(R.string.summary_placeholder);
+        final SearchResult result = new Builder()
+                .setTitle(TITLE)
+                .setSummary(nonBreakingSpace)
+                .setPayload(new ResultPayload(null))
+                .setStableId(1)
                 .build();
 
         mHolder.onBind(mFragment, result);
@@ -181,11 +174,12 @@ public class IntentSearchViewHolderTest {
 
     @Test
     public void testBindElements_dynamicSummary_visibilityIsGone() {
-        String dynamicSummary = "%s";
-        SearchResult result = new Builder()
-                .addTitle(TITLE)
-                .addSummary(dynamicSummary)
-                .addPayload(new IntentPayload(null))
+        final String dynamicSummary = "%s";
+        final SearchResult result = new Builder()
+                .setTitle(TITLE)
+                .setSummary(dynamicSummary)
+                .setPayload(new ResultPayload(null))
+                .setStableId(1)
                 .build();
 
         mHolder.onBind(mFragment, result);
@@ -194,12 +188,11 @@ public class IntentSearchViewHolderTest {
     }
 
     @Test
-    @Ignore
     public void testBindViewElements_appSearchResult() {
         when(mPackageManager.getUserBadgedLabel(any(CharSequence.class),
                 eq(new UserHandle(USER_ID)))).thenReturn(BADGED_LABEL);
 
-        SearchResult result = getAppSearchResult(
+        final SearchResult result = getAppSearchResult(
                 TITLE, SUMMARY, mIcon, getApplicationInfo(USER_ID, TITLE, mIcon));
         mHolder.onBind(mFragment, result);
         mHolder.itemView.performClick();
@@ -210,24 +203,54 @@ public class IntentSearchViewHolderTest {
         assertThat(mHolder.breadcrumbView.getVisibility()).isEqualTo(View.GONE);
         assertThat(mHolder.titleView.getContentDescription()).isEqualTo(BADGED_LABEL);
 
-        verify(mFragment).onSearchResultClicked();
+        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
         verify(mFragment.getActivity()).startActivityAsUser(
                 any(Intent.class), eq(new UserHandle(USER_ID)));
-        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
+    public void testBindViewElements_validSubSettingIntent_shouldLaunch() {
+        final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
+        when(mPackageManager.queryIntentActivities(result.payload.getIntent(), 0 /* flags */))
+                .thenReturn(Arrays.asList(new ResolveInfo()));
+
+        mHolder.onBind(mFragment, result);
+        mHolder.itemView.performClick();
+
+        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
+        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
+        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
+        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
+        verify(mFragment).startActivity(result.payload.getIntent());
+    }
+
+    @Test
+    public void testBindViewElements_invalidSubSettingIntent_shouldNotLaunchAnything() {
+        final SearchResult result = getSearchResult(TITLE, SUMMARY, mIcon);
+        when(mPackageManager.queryIntentActivities(result.payload.getIntent(), 0 /* flags */))
+                .thenReturn(null);
+
+        mHolder.onBind(mFragment, result);
+        mHolder.itemView.performClick();
+
+        assertThat(mHolder.titleView.getText()).isEqualTo(TITLE);
+        assertThat(mHolder.summaryView.getText()).isEqualTo(SUMMARY);
+        assertThat(mHolder.summaryView.getVisibility()).isEqualTo(View.VISIBLE);
+        verify(mFragment).onSearchResultClicked(eq(mHolder), any(SearchResult.class));
+        verify(mFragment, never()).startActivity(any(Intent.class));
     }
 
     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();
     }
@@ -235,13 +258,13 @@ public class IntentSearchViewHolderTest {
     private SearchResult getAppSearchResult(
             String title, String summary, Drawable icon, ApplicationInfo applicationInfo) {
         AppSearchResult.Builder builder = new AppSearchResult.Builder();
-        builder.addTitle(title)
-                .addSummary(summary)
-                .addRank(1)
-                .addPayload(new IntentPayload(
+        builder.setTitle(title)
+                .setSummary(summary)
+                .setRank(1)
+                .setPayload(new ResultPayload(
                         new Intent().setComponent(new ComponentName("pkg", "class"))))
                 .addBreadcrumbs(new ArrayList<>())
-                .addIcon(icon);
+                .setIcon(icon);
         builder.setAppInfo(applicationInfo);
         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 17cda437ff7b6b8e920b4271661c085bdce75522..c68cbdf623d401802d69398fdf487f6caec983ff 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 @@ class MockAppLoader extends InstalledAppResultLoader {
     }
 
     @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 18d877101e8282b7f477b5dfa8ee9e6012a3324d..b28c1ed97f641add821ad1c428051c9251730eaf 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 @@ class MockDBLoader extends DatabaseResultLoader {
     }
 
     @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 77%
rename from tests/robotests/src/com/android/settings/search/IntentPayloadTest.java
rename to tests/robotests/src/com/android/settings/search/ResultPayloadTest.java
index 515b76a7f602b0a71fec44aefb3b48837df5a04b..0bb43c5b1c222aaef5941b5c716b4d829735b849 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.
@@ -21,7 +21,7 @@ import android.content.Intent;
 import android.os.Parcel;
 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 @@ import static com.google.common.truth.Truth.assertThat;
 
 @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 @@ public class IntentPayloadTest {
         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 71b294112c48692168d7b25aea56d400d95124dd..50bdb842725c62041a71625400ccf9ded3371e28 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,11 +18,9 @@
 package com.android.settings.search;
 
 import android.content.Intent;
-
 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;
@@ -34,7 +32,7 @@ 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";
@@ -43,14 +41,14 @@ public class ResultPayloadUtilsTest {
     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();
@@ -58,7 +56,7 @@ public class ResultPayloadUtilsTest {
     }
 
     @Test
-    public void testMarshallIntentPayload_NonEmptyArray() {
+    public void testMarshallResultPayload_NonEmptyArray() {
         byte[] marshalledPayload = ResultPayloadUtils.marshall(payload);
         assertThat(marshalledPayload).isNotNull();
         assertThat(marshalledPayload).isNotEmpty();
@@ -67,11 +65,11 @@ public class ResultPayloadUtilsTest {
     @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 95%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.java
index adf43e43da9df1ac455cc6161dac20a1d21f4789..780a8a5dbc9fa1dec6197818960df4fa5db3aa5c 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryLoaderTest.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;
@@ -23,7 +24,6 @@ import android.database.sqlite.SQLiteDatabase;
 
 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 @@ public class SavedQueryLoaderTest {
 
     @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 97%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.java
index b173d429451296667eee9f75643ce41e6524c274..7421d1a1e2448131560d8cff8115f8684fcf96a8 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryPayloadTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryPayloadTest.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 com.android.settings.testutils.SettingsRobolectricTestRunner;
diff --git a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
similarity index 96%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.java
index 7f0ffe72ebfdd2d06b63a8204fa993c985084994..6d49555496f09704dea1fd66ef1617fd013c7988 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryRecorderAndRemoverTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryRecorderAndRemoverTest.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;
@@ -49,7 +50,7 @@ public class SavedQueryRecorderAndRemoverTest {
 
     @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 89%
rename from tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java
rename to tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
index 1546ff370c66bbcadeb54c0e2de9f7d47eee10d1..691fcf7fae976e6350d18ed036028ba5d94ce76a 100644
--- a/tests/robotests/src/com/android/settings/search2/SavedQueryViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SavedQueryViewHolderTest.java
@@ -12,9 +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 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;
@@ -32,10 +37,6 @@ import org.mockito.MockitoAnnotations;
 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 @@ public class SavedQueryViewHolderTest {
         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 d7113fa050908e2df7ee4e2bb077113bf4a8aa8d..30ffaf8b3ec4fb3adbb430cd32e2fac2ba70b921 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 @@ package com.android.settings.search;
 import android.app.Activity;
 import android.view.Menu;
 
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.dashboard.SiteMapManager;
-import com.android.settings.search2.SearchFeatureProviderImpl;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -34,11 +33,7 @@ import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 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.verify;
 
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -57,22 +52,28 @@ public class SearchFeatureProviderImplTest {
     }
 
     @Test
-    public void testPassNull_NoError() {
-        mProvider.setUpSearchMenu(null, null);
+    public void getSiteMapManager_shouldCacheInstance() {
+        final SiteMapManager manager1 = mProvider.getSiteMapManager();
+        final SiteMapManager manager2 = mProvider.getSiteMapManager();
+
+        assertThat(manager1).isSameAs(manager2);
     }
 
     @Test
-    public void testSetUpMenu_HasItemAdded() {
-        mProvider.setUpSearchMenu(menu, mActivity);
+    public void getDatabaseSearchLoader_shouldCleanupQuery() {
+        final String query = "  space ";
+        final DatabaseResultLoader loader = mProvider.getDatabaseSearchLoader(mActivity, query);
 
-        verify(menu).add(anyInt(), anyInt(), anyInt(), anyString());
+        assertThat(loader.mQueryText).isEqualTo(query.trim());
     }
 
     @Test
-    public void getSiteMapManager_shouldCacheInstance() {
-        final SiteMapManager manager1 = mProvider.getSiteMapManager();
-        final SiteMapManager manager2 = mProvider.getSiteMapManager();
+    public void getInstalledAppSearchLoader_shouldCleanupQuery() {
+        final String query = "  space ";
+        final InstalledAppResultLoader loader =
+                mProvider.getInstalledAppSearchLoader(mActivity, query);
 
-        assertThat(manager1).isSameAs(manager2);
+        assertThat(loader.mQuery).isEqualTo(query.trim());
     }
+
 }
diff --git a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
similarity index 76%
rename from tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
rename to tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
index d01d677ac6ce0f57759067b01ab492589067d5b2..7ee3f97f3a77918607aa5f506289c507b123f2c9 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,36 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF 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.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 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.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 +50,14 @@ import org.robolectric.annotation.Config;
 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;
@@ -55,7 +67,12 @@ 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 SearchFragmentTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -69,14 +86,23 @@ public class SearchFragmentTest {
     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 +163,7 @@ public class SearchFragmentTest {
     }
 
     @Test
-    public void queryTextChange_shouldTriggerLoader() {
+    public void queryTextChange_shouldTriggerLoaderAndInitializeSearch() {
         when(mFeatureFactory.searchFeatureProvider
                 .getDatabaseSearchLoader(any(Context.class), anyString()))
                 .thenReturn(mDatabaseResultLoader);
@@ -156,6 +182,7 @@ public class SearchFragmentTest {
         when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
                 .thenReturn(true);
 
+        ReflectionHelpers.setField(fragment, "mSearchAdapter", mSearchResultsAdapter);
         fragment.onQueryTextChange(testQuery);
         activityController.get().onBackPressed();
 
@@ -170,10 +197,28 @@ public class SearchFragmentTest {
                 .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 +235,7 @@ public class SearchFragmentTest {
         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 +245,7 @@ public class SearchFragmentTest {
         verify(mFeatureFactory.searchFeatureProvider, never())
                 .getInstalledAppSearchLoader(any(Context.class), anyString());
         verify(mSavedQueryController).loadSavedQueries();
+        verify(mSearchResultsAdapter, never()).initializeSearch(anyString());
     }
 
     @Test
@@ -221,7 +268,7 @@ public class SearchFragmentTest {
                 .thenReturn(true);
 
         fragment.onAttach(null);
-        verify(mFeatureFactory.searchFeatureProvider).updateIndex(any(Context.class),
+        verify(mFeatureFactory.searchFeatureProvider).updateIndexAsync(any(Context.class),
                 any(IndexingCallback.class));
     }
 
@@ -249,7 +296,7 @@ public class SearchFragmentTest {
 
         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 +400,12 @@ public class SearchFragmentTest {
     @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 +413,43 @@ public class SearchFragmentTest {
         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 972bca182ac52c5099e0f134dfe5011f61602042..b4a91c57fba7a5a6cece274281bef8c4ea4ce151 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 android.util.Log;
 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 @@ public class SearchIndexProviderCodeInspector extends CodeInspector {
             // 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 @@ public class SearchIndexProviderCodeInspector extends CodeInspector {
             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 @@ public class SearchIndexProviderCodeInspector extends CodeInspector {
             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 @@ public class SearchIndexProviderCodeInspector extends CodeInspector {
         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/SearchResultBuilderTest.java b/tests/robotests/src/com/android/settings/search/SearchResultBuilderTest.java
index 3b6e10a7fbcf1d88a5b1fd1d09bb4db1e892a002..e601087d4b2cfb22ea7d4ccb0eac3d19b6a8aafc 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.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 @@ import static com.google.common.truth.Truth.assertThat;
 @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 @@ public class SearchResultBuilderTest {
     @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 @@ public class SearchResultBuilderTest {
 
     @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
+    @Test(expected = IllegalStateException.class)
+    public void testNoStableId_BuildSearchResultException() {
+        mBuilder.setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setRank(mRank)
+                .addBreadcrumbs(mBreadcrumbs)
+                .setIcon(mIcon)
+                .setPayload(mResultPayload);
+
+        mBuilder.build();
+    }
+
+    @Test(expected = IllegalStateException.class)
     public void testNoTitle_BuildSearchResultException() {
-        mBuilder.addSummary(mSummary)
-                .addRank(mRank)
+        mBuilder.setSummary(SUMMARY)
+                .setRank(mRank)
                 .addBreadcrumbs(mBreadcrumbs)
-                .addIcon(mIcon)
-                .addPayload(mResultPayload);
-
-        SearchResult result = null;
-        try {
-            result = mBuilder.build();
-        } catch (IllegalArgumentException e) {
-            // passes.
-        }
-        assertThat(result).isNull();
+                .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);
-
-        SearchResult result = null;
-        try {
-            result = mBuilder.build();
-        } catch (IllegalArgumentException e) {
-            // passes.
-        }
-        assertThat(result).isNull();
+                .setIcon(mIcon)
+                .setStableId(1);
+
+        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 ace29fbd6aab04ea1255c097dd62e56dd1553942..503054bb0019ae9c6a2eb111e55cdce497486d3c 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.app.Activity;
 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.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 @@ public class SearchResultsAdapterTest {
 
     @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 class SearchResultsAdapterTest {
     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 @@ public class SearchResultsAdapterTest {
 
     @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);
@@ -98,139 +112,466 @@ public class SearchResultsAdapterTest {
     }
 
     @Test
-    public void testCreateViewHolder_returnsInlineSwitchResult() {
+    public void testCreateViewHolder_returnsIntentSwitchResult() {
+        // TODO (b/62807132) test for InlineResult
         ViewGroup group = new FrameLayout(mContext);
         SearchViewHolder view = mAdapter.onCreateViewHolder(group,
                 ResultPayload.PayloadType.INLINE_SWITCH);
-        assertThat(view).isInstanceOf(InlineSwitchViewHolder.class);
+        assertThat(view).isInstanceOf(IntentSearchViewHolder.class);
     }
 
     @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<>(getDummyAppResults()),
+                InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(new HashSet<>(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<>(appResults.subList(0, 1)),
                 InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(dbResults.subList(0,1), DatabaseResultLoader.class.getName());
-        mAdapter.displaySearchResults();
+        mAdapter.addSearchResults(new HashSet<>(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<>(appResults), InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(
+                new HashSet<>(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();
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(new HashSet<>(appResults),
+                InstalledAppResultLoader.class.getName());
+        mAdapter.addSearchResults(new HashSet<>(dbResults),
+                DatabaseResultLoader.class.getName());
+        mAdapter.notifyResultsLoaded();
         // Add subset of items
-        mAdapter.addSearchResults(appResults.subList(0,1),
+        mAdapter.initializeSearch("");
+        mAdapter.addSearchResults(new HashSet<>(appResults.subList(0, 1)),
                 InstalledAppResultLoader.class.getName());
-        mAdapter.addSearchResults(dbResults.subList(0,1), DatabaseResultLoader.class.getName());
-        int count = mAdapter.displaySearchResults();
+        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<>(Long.toString(results.get(2).stableId), 0.9f)); // charlie
+        scores.add(new Pair<>(Long.toString(results.get(0).stableId), 0.8f)); // alpha
+        scores.add(new Pair<>(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 97%
rename from tests/robotests/src/com/android/settings/search2/SiteMapManagerTest.java
rename to tests/robotests/src/com/android/settings/search/SiteMapManagerTest.java
index 7de739fd8d32e55fce38058cd2c3ed55f21462c4..b441b66dc4177cc0e234cbd51ec778137dac6151 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;
@@ -25,7 +26,6 @@ import com.android.settings.SettingsActivity;
 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 @@ public class SiteMapManagerTest {
 
     @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 63ff328984f05525f9adb762787679a1cb4befe2..5d2a9776febf53758c541c2cc5af79f017516ea4 100644
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
@@ -26,7 +26,6 @@ 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 4098f1b6d442fed15015483afbbcde6f5653235c..0000000000000000000000000000000000000000
--- 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.testutils.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/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1a37decf67be30d018a882b72a3de79e626efc21
--- /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/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index 3246667911ab85b574060370601a5850dff97f0f..77ed4b07f0c98574fb1d5246f05a5fbcc49fbace 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -21,12 +21,12 @@ 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.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import com.android.settings.fingerprint.FingerprintSuggestionActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RuntimeEnvironment;
@@ -36,59 +36,68 @@ import org.robolectric.manifest.AndroidManifest;
 import org.robolectric.manifest.IntentFilterData;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 @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);
-  }
-
-  @Test
-  public void wallpaperSuggestion_isValid() {
-    assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
-        R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
-  }
-
-  @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());
+    private static final String CATEGORY_FIRST_IMPRESSION =
+            "com.android.settings.suggested.category.FIRST_IMPRESSION";
+
+    private static final String CATEGORY_SETTINGS_ONLY =
+            "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(
+                FingerprintSuggestionActivity.class.getName(),
+                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);
     }
 
-    assertThat(categories).contains("com.android.settings.suggested.category.SETTINGS_ONLY");
-  }
+    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 0000000000000000000000000000000000000000..75551e54ab4700de96d05e633b58ec0acd3a23df
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.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.support;
+
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ResolveInfo;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+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;
+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_notSupported_shouldReturnTrue() {
+        when(mMockContext.getResources()
+                .getBoolean(R.bool.config_new_device_intro_suggestion_supported))
+                .thenReturn(false);
+
+        assertThat(isSuggestionComplete(mContext))
+                .isTrue();
+    }
+
+    @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/SupportDashboardActivityTest.java b/tests/robotests/src/com/android/settings/support/SupportDashboardActivityTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2c59ba79376ba22e6e4706fc47cebe769a0b4811
--- /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/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index b9c34f3f343bc97e1b3c4a9def34b6930e9c1723..7310ae09eee1e624811aac394a70ffecef9aa3c9 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
 import android.accounts.AccountManager;
 import android.content.Context;
 import android.os.UserManager;
-import android.provider.Settings;
 
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
@@ -76,21 +75,16 @@ public class FactoryResetPreferenceControllerTest {
     @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
     public void isAvailable_nonSystemUser() {
         when(mUserManager.isAdminUser()).thenReturn(false);
-        ShadowUtils.setIsCarrierDemoUser(false);
+        ShadowUtils.setIsDemoUser(false);
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
     @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
-    public void isAvailable_carrierDemoUser() {
+    public void isAvailable_demoUser() {
         when(mUserManager.isAdminUser()).thenReturn(false);
-        ShadowUtils.setIsCarrierDemoUser(true);
-
-        final String carrierDemoModeSetting = "carrier_demo_mode";
-        when(mContext.getString(com.android.internal.R.string.config_carrierDemoModeSetting))
-                .thenReturn(carrierDemoModeSetting);
-        Settings.Secure.putInt(null, carrierDemoModeSetting, 1);
+        ShadowUtils.setIsDemoUser(true);
 
         assertThat(mController.isAvailable()).isTrue();
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..2bdab279f6a381967bf82d1a8ab4b11fdfb03d36
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/BatteryTestUtils.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.testutils;
+
+import android.content.Intent;
+import android.os.BatteryManager;
+
+public class BatteryTestUtils {
+
+    public static Intent getChargingIntent() {
+        return getCustomBatteryIntent(
+                BatteryManager.BATTERY_PLUGGED_AC,
+                50 /* level */,
+                100 /* scale */,
+                BatteryManager.BATTERY_STATUS_CHARGING);
+    }
+
+    public static Intent getDischargingIntent() {
+        return getCustomBatteryIntent(
+                0 /* plugged */,
+                10 /* level */,
+                100 /* scale */,
+                BatteryManager.BATTERY_STATUS_DISCHARGING);
+    }
+
+    public static Intent getCustomBatteryIntent(int plugged, int level, int scale, int status) {
+        Intent intent = new Intent();
+        intent.putExtra(BatteryManager.EXTRA_PLUGGED, plugged);
+        intent.putExtra(BatteryManager.EXTRA_LEVEL, level);
+        intent.putExtra(BatteryManager.EXTRA_SCALE, scale);
+        intent.putExtra(BatteryManager.EXTRA_STATUS, status);
+
+        return intent;
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java b/tests/robotests/src/com/android/settings/testutils/DatabaseTestUtils.java
index 8fbe1c9ff395408f1a04c91f473a2e52797005a6..7472996e0360cbdd93d61780a3d9e0d5ab122949 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 68333e7f834ec23729ce8760e03f8cba6d5fc1db..8be24965dbcefd77187d9c44d5c569088dcc2596 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 @@ package com.android.settings.testutils;
 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.localepicker.LocaleFeatureProvider;
 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 class FakeFeatureFactory extends FeatureFactory {
     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 @@ public class FakeFeatureFactory extends FeatureFactory {
         } catch (ClassNotFoundException e) {
             // Ignore.
         }
+        return (FakeFeatureFactory) FakeFeatureFactory.getFactory(context);
     }
 
     /**
@@ -90,6 +93,7 @@ public class FakeFeatureFactory extends FeatureFactory {
         suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class);
         userFeatureProvider = mock(UserFeatureProvider.class);
         assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
+        bluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
     }
 
     @Override
@@ -152,6 +156,11 @@ public class FakeFeatureFactory extends FeatureFactory {
         return userFeatureProvider;
     }
 
+    @Override
+    public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
+        return bluetoothFeatureProvider;
+    }
+
     @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         return assistGestureFeatureProvider;
diff --git a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java
new file mode 100644
index 0000000000000000000000000000000000000000..2305edbe24e2d02e5eba552f36ec71612d09d0be
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.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.testutils;
+
+import static com.google.common.truth.Truth.assertAbout;
+
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.support.annotation.Nullable;
+
+import com.google.common.truth.ComparableSubject;
+import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.SubjectFactory;
+
+/**
+ * Custom subject for use with {@link com.google.common.truth.Truth}, to provide a more readable
+ * error message, so that instead of "Not true that 2130706432 equals to 17170444", it will say
+ * "Not true that color/my_color equals to android:color/black".
+ *
+ * <p>Usage:
+ * <pre>{@code
+ *     ResIdSubject.assertResId(activity.getThemeResId()).isEqualTo(android.R.style.Theme_Material)
+ * }</pre>
+ */
+public class ResIdSubject extends ComparableSubject<ResIdSubject, Integer> {
+
+    public static final SubjectFactory<ResIdSubject, Integer> FACTORY =
+            new SubjectFactory<ResIdSubject, Integer>() {
+                @Override
+                public ResIdSubject getSubject(
+                        FailureStrategy failureStrategy, Integer integer) {
+                    return new ResIdSubject(failureStrategy, integer);
+                }
+            };
+
+    public static ResIdSubject assertResId(int resId) {
+        return assertAbout(ResIdSubject.FACTORY).that(resId);
+    }
+
+    public ResIdSubject(
+            FailureStrategy failureStrategy,
+            @Nullable Integer integer) {
+        super(failureStrategy, integer);
+    }
+
+    public void isEqualTo(int other) {
+        Integer subject = getSubject();
+        if (subject == null || subject != other) {
+            fail("equals to", resIdToString(other));
+        }
+    }
+
+    @Override
+    protected String getDisplaySubject() {
+        String resourceName = "<" + resIdToString(getSubject()) + ">";
+        String customName = internalCustomName();
+        if (customName != null) {
+            return customName + " " + resourceName;
+        } else {
+            return resourceName;
+        }
+    }
+
+    private static String resIdToString(int resId) {
+        return application.getResources().getResourceName(resId);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
index d22f2903725326cd5266f4b7a235a702f8ce834d..91bfff28c7baa5344a6e41ef0f8a96c8862258ce 100644
--- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -15,14 +15,9 @@
  */
 package com.android.settings.testutils;
 
-import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
-import static org.robolectric.Robolectric.getShadowsAdapter;
-
 import android.app.Fragment;
 import android.content.Intent;
 
-import com.android.settings.SettingsActivity;
-
 import org.junit.runners.model.InitializationError;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
@@ -34,6 +29,11 @@ import org.robolectric.util.ReflectionHelpers;
 
 import java.util.List;
 
+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.
@@ -67,34 +67,7 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
             @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;
             }
         };
@@ -104,6 +77,41 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
         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 f9d5439f9d18a3d24215650260c9054fa0125f4f..4f5600226fbff9932b46a3a593c11232cdad16f5 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.content.Context;
 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 0000000000000000000000000000000000000000..00aa9ec8244fc605301b05384c438f4bc1b13ca2
--- /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 cb02d3e059088129d94c6a1553da338f4decf9bb..c56438fcedf3ae454c5d4f40bbfbe681d25beef0 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -7,6 +7,7 @@ import static org.robolectric.Shadows.shadowOf;
 import static org.robolectric.internal.Shadow.directlyOn;
 
 import android.annotation.DimenRes;
+import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.content.res.Resources.Theme;
@@ -87,6 +88,15 @@ public class SettingsShadowResources extends ShadowResources {
         return directlyOn(realResources, Resources.class).getColor(id, theme);
     }
 
+    @Implementation
+    public ColorStateList getColorStateList(@ColorRes int id, @Nullable Theme theme)
+            throws NotFoundException {
+        if (id == com.android.internal.R.color.text_color_primary) {
+            return ColorStateList.valueOf(Color.WHITE);
+        }
+        return directlyOn(realResources, Resources.class).getColorStateList(id, theme);
+    }
+
     @Implementation
     public Drawable loadDrawable(TypedValue value, int id, Theme theme)
             throws NotFoundException {
@@ -137,6 +147,16 @@ public class SettingsShadowResources extends ShadowResources {
                 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/ShadowAccessibilityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..7e21f1238dff89db6e195444e1b1e4a22179394f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManager.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.accessibilityservice.AccessibilityServiceInfo;
+import android.content.ComponentName;
+import android.view.accessibility.AccessibilityManager;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Implements(AccessibilityManager.class)
+public class ShadowAccessibilityManager {
+    private static final List<AccessibilityServiceInfo> mInstalledAccessibilityList =
+            new ArrayList<>();
+
+    public static void addAccessibilityService(String serviceName) {
+        AccessibilityServiceInfo serviceInfo = new AccessibilityServiceInfo();
+        serviceInfo.setComponentName(ComponentName.unflattenFromString(serviceName));
+        mInstalledAccessibilityList.add(serviceInfo);
+    }
+
+    @Implementation
+    public List<AccessibilityServiceInfo> getInstalledAccessibilityServiceList() {
+        return mInstalledAccessibilityList;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..95d5de5e5b97e039d37ad9d53dd27990b23f12cf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityManagerWrapperImpl.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.testutils.shadow;
+
+import com.android.settings.applications.AccessibilityManagerWrapperImpl;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+/**
+ * This class provides shadow for API that is not supported in current roboletric
+ */
+@Implements(AccessibilityManagerWrapperImpl.class)
+public class ShadowAccessibilityManagerWrapperImpl {
+
+    @Implementation
+    public static boolean isAccessibilityButtonSupported() {
+        return true;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..a6cb5d07bd693c70a99a4e14581ea8a1ea9266d1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccessibilityServiceInfoWrapperImpl.java
@@ -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.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import android.content.ComponentName;
+
+import com.android.settings.applications.AccessibilityServiceInfoWrapperImpl;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+@Implements(AccessibilityServiceInfoWrapperImpl.class)
+public class ShadowAccessibilityServiceInfoWrapperImpl {
+    private static ComponentName sComponentName;
+
+    public static void setComponentName(String componentName) {
+        sComponentName = ComponentName.unflattenFromString(componentName);;
+    }
+
+    @Implementation
+    public ComponentName getComponentName() {
+        return sComponentName;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
index 36f170ab8e226a1e59557aff81bfd50f584e6eb3..2e346a2e8493cc37c5b4270f886b39871c888f42 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.testutils.shadow;
 
+import android.accounts.Account;
 import android.content.ContentResolver;
 import android.content.SyncAdapterType;
 
@@ -28,12 +29,20 @@ import org.robolectric.annotation.Implements;
 
 import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Implements(ContentResolver.class)
 public class ShadowContentResolver {
 
+    private static SyncAdapterType[] sSyncAdapterTypes = new SyncAdapterType[0];
+    private static Map<String, Integer> sSyncable = new HashMap<>();
+    private static Map<String, Boolean> sSyncAutomatically = new HashMap<>();
+    private static Map<Integer, Boolean> sMasterSyncAutomatically = new HashMap<>();
+
     @Implementation
     public static SyncAdapterType[] getSyncAdapterTypesAsUser(int userId) {
-        return new SyncAdapterType[0];
+        return sSyncAdapterTypes;
     }
 
     @Implementation
@@ -44,4 +53,44 @@ public class ShadowContentResolver {
                 .add(SearchIndexablesContract.NonIndexableKey.COLUMN_KEY_VALUE, "");
         return cursor;
     }
+
+    @Implementation
+    public static int getIsSyncableAsUser(Account account, String authority, int userId) {
+        return sSyncable.containsKey(authority) ? sSyncable.get(authority) : 1;
+    }
+
+    @Implementation
+    public static boolean getSyncAutomaticallyAsUser(Account account, String authority,
+            int userId) {
+        return sSyncAutomatically.containsKey(authority) ? sSyncAutomatically.get(authority) : true;
+    }
+
+    @Implementation
+    public static boolean getMasterSyncAutomaticallyAsUser(int userId) {
+        return sMasterSyncAutomatically.containsKey(userId)
+                ? sMasterSyncAutomatically.get(userId) : true;
+    }
+
+    public static void setSyncAdapterTypes(SyncAdapterType[] syncAdapterTypes) {
+        sSyncAdapterTypes = syncAdapterTypes;
+    }
+
+    public static void setSyncable(String authority, int syncable) {
+        sSyncable.put(authority, syncable);
+    }
+
+    public static void setSyncAutomatically(String authority, boolean syncAutomatically) {
+        sSyncAutomatically.put(authority, syncAutomatically);
+    }
+
+    public static void setMasterSyncAutomatically(int userId, boolean syncAutomatically) {
+        sMasterSyncAutomatically.put(userId, syncAutomatically);
+    }
+
+    public static void reset() {
+        sSyncable.clear();
+        sSyncAutomatically.clear();
+        sMasterSyncAutomatically.clear();
+        sSyncAdapterTypes = new SyncAdapterType[0];
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java
new file mode 100644
index 0000000000000000000000000000000000000000..34908ca39a8b945689c4d1398acbbd570167c48a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java
@@ -0,0 +1,21 @@
+package com.android.settings.testutils.shadow;
+
+import com.android.settings.datausage.DataSaverBackend;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(DataSaverBackend.class)
+public class ShadowDataSaverBackend {
+
+    private static boolean isEnabled = true;
+
+    @Implementation
+    public boolean isDataSaverEnabled() {
+        return isEnabled;
+    }
+
+    @Implementation
+    public void setDataSaverEnabled(boolean enabled) {
+        isEnabled = enabled;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageSummary.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageSummary.java
new file mode 100644
index 0000000000000000000000000000000000000000..c5fc601191ae1f7abf2e5bb6015ddb25449316f6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageSummary.java
@@ -0,0 +1,24 @@
+package com.android.settings.testutils.shadow;
+
+import android.content.Context;
+
+import com.android.settings.datausage.DataUsageSummary;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(DataUsageSummary.class)
+public class ShadowDataUsageSummary {
+
+    public static boolean IS_MOBILE_DATA_SUPPORTED = true;
+    public static boolean IS_WIFI_SUPPORTED = true;
+
+    @Implementation
+    public static boolean hasMobileData(Context context) {
+        return IS_MOBILE_DATA_SUPPORTED;
+    }
+
+    @Implementation
+    public static boolean hasWifiRadio(Context context) {
+        return IS_WIFI_SUPPORTED;
+    }
+}
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 724b9c05ec252c74dd3bfa8ce42bb43d5d7e0730..f8242970130d7de3db45129b38a5505b03551db7 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 @@ package com.android.settings.testutils.shadow;
 
 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/ShadowDoubleTwistPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..2f37ec8370e7ee94a997470f25a182bdcbdcfa22
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDoubleTwistPreferenceController.java
@@ -0,0 +1,28 @@
+package com.android.settings.testutils.shadow;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.gestures.DoubleTwistPreferenceController;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(DoubleTwistPreferenceController.class)
+public class ShadowDoubleTwistPreferenceController {
+    private static int sManagedProfileId = UserHandle.USER_NULL;
+    @Implementation
+    public static boolean isGestureAvailable(Context context) {
+        return true;
+    }
+
+    @Implementation
+    public static int getManagedProfileId(UserManager userManager) {
+        return sManagedProfileId;
+    }
+
+    public static void setManagedProfileId(int managedProfileId) {
+        sManagedProfileId = managedProfileId;
+    }
+}
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 0000000000000000000000000000000000000000..4ec48d35dd23fb97f930bcbd01c6001ef2065c60
--- /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 0000000000000000000000000000000000000000..0af9c304942195aaafa4418dedf4a068e31abb97
--- /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/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
index b1419ba8e39140d19152fb5008260f6b3617e0b9..3182a935d5de9cfe3420fb4192444b373bce78fc 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
@@ -16,15 +16,39 @@
 
 package com.android.settings.testutils.shadow;
 
+import android.app.admin.DevicePolicyManager;
+
 import com.android.internal.widget.LockPatternUtils;
+
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
 @Implements(LockPatternUtils.class)
 public class ShadowLockPatternUtils {
 
+    private int mPasswordQuality = 1;
     @Implementation
     public boolean isSecure(int id) {
         return true;
     }
+
+    @Implementation
+    public int getActivePasswordQuality(int userId) {
+        return DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+    }
+
+    @Implementation
+    public int getKeyguardStoredPasswordQuality(int userHandle) {
+        return mPasswordQuality;
+    }
+
+    // Non-Android accessor.
+    public int getPasswordQuality() {
+        return mPasswordQuality;
+    }
+
+    // Non-Android accessor.
+    public void setPasswordQuality(int passwordQuality) {
+        mPasswordQuality = passwordQuality;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java
new file mode 100644
index 0000000000000000000000000000000000000000..8d7606335d2dc169f5d3683eb3cfa9b3a25013da
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java
@@ -0,0 +1,28 @@
+package com.android.settings.testutils.shadow;
+
+import android.content.Context;
+import com.android.settings.network.MobileNetworkPreferenceController;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(MobileNetworkPreferenceController.class)
+public class ShadowMobileNetworkPreferenceController {
+    private static boolean mIsRestricted = false;
+
+    public void __constructor__(Context context) {
+    }
+
+    @Implementation
+    public boolean isAvailable() {
+        return mIsRestricted ? false : true;
+    }
+
+    @Implementation
+    public boolean isUserRestricted() {
+        return mIsRestricted;
+    }
+
+    public static void setRestricted(boolean restricted) {
+        mIsRestricted = restricted;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java
new file mode 100644
index 0000000000000000000000000000000000000000..4f156426b4758bb788232e2e49422d1c6c6d1161
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.Context;
+import android.content.pm.PackageManager;
+import android.support.annotation.NonNull;
+import android.support.v4.content.PermissionChecker;
+import android.text.TextUtils;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * This class provides shadow for API that is not supported in current roboletric
+ */
+@Implements(PermissionChecker.class)
+public class ShadowPermissionChecker {
+
+    private static Map<PermissionInfo, Integer> sPermissions = new HashMap<>();
+
+    public static void clear() {
+        sPermissions.clear();
+    }
+
+    public static void addPermission(String permission, int pid, int uid, String packageName,
+            int permissionValue) {
+        sPermissions.put(new PermissionInfo(permission, pid, uid, packageName), permissionValue);
+    }
+
+    @Implementation
+    public static int checkPermission(@NonNull Context context, @NonNull String permission,
+            int pid, int uid, String packageName) {
+        return sPermissions.getOrDefault(new PermissionInfo(permission, pid, uid, packageName),
+                PackageManager.PERMISSION_DENIED);
+    }
+
+    private static class PermissionInfo {
+        private final int mPid;
+        private final int mUid;
+        private final String mPackageName;
+        private final String mPermission;
+
+        public PermissionInfo(String permission, int pid, int uid, String packageName) {
+            mPid = pid;
+            mUid = uid;
+            mPackageName = packageName;
+            mPermission = permission;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj) {
+                return true;
+            }
+            if (!(obj instanceof PermissionInfo)) {
+                return false;
+            }
+
+            final PermissionInfo other = (PermissionInfo) obj;
+            return mPid == other.mPid
+                    && mUid == other.mUid
+                    && TextUtils.equals(mPackageName, other.mPackageName)
+                    && TextUtils.equals(mPermission, other.mPermission);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(mPid, mUid, mPackageName, mPermission);
+        }
+    }
+}
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 0000000000000000000000000000000000000000..7aa28fae00be42ea5f899687144b61c860cbe903
--- /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/ShadowRestrictedLockUtilsWrapper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java
new file mode 100644
index 0000000000000000000000000000000000000000..0e0adce7bffcda07f8467bbd4a3fe051f628201f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsWrapper.java
@@ -0,0 +1,25 @@
+package com.android.settings.testutils.shadow;
+
+import android.content.Context;
+import com.android.settings.network.RestrictedLockUtilsWrapper;
+import org.robolectric.annotation.Implements;
+
+/**
+ * Shadow for the wrapper around RestrictedLockUtils. Should be removed/updated once robolectric is
+ * updated to allow usage of new UserManager API's. see
+ * {@link com.android.settingslib.RestrictedLockUtils} and
+ * {@link com.android.settings.network.RestrictedLockUtilsWrapper}
+ */
+@Implements(RestrictedLockUtilsWrapper.class)
+public class ShadowRestrictedLockUtilsWrapper {
+
+    private boolean isRestricted;
+
+    public boolean hasBaseUserRestriction(Context context, String userRestriction, int userId) {
+        return isRestricted;
+    }
+
+    public void setRestricted(boolean restricted) {
+        isRestricted = restricted;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..f39f10f327be0e8163321acc15ca7332633a1df4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java
@@ -0,0 +1,24 @@
+package com.android.settings.testutils.shadow;
+
+import android.content.Context;
+import com.android.settings.bluetooth.RestrictionUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(RestrictionUtils.class)
+public class ShadowRestrictionUtils {
+    private static boolean isRestricted = false;
+
+    @Implementation
+    public EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) {
+        if (isRestricted) {
+            return new EnforcedAdmin();
+        }
+        return null;
+    }
+
+    public static void setRestricted(boolean restricted) {
+        isRestricted = restricted;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
index 64e188eccfde822df4b10c659d465b645de3ed49..ce397e447cd7e645a2a6863fc70ddc647f14649b 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSecureSettings.java
@@ -42,6 +42,13 @@ public class ShadowSecureSettings {
         return true;
     }
 
+    @Implementation
+    public static boolean putStringForUser(ContentResolver resolver, String name, String value,
+            int userHandle) {
+        mValueMap.put(name, value);
+        return true;
+    }
+
     @Implementation
     public static String getString(ContentResolver resolver, String name) {
         return (String) mValueMap.get(name);
@@ -69,6 +76,29 @@ public class ShadowSecureSettings {
         return value == null ? defaultValue : value;
     }
 
+    @Implementation
+    public static boolean putFloat(ContentResolver resolver, String name, float value) {
+        mValueMap.put(name, value);
+        return true;
+    }
+
+    @Implementation
+    public static boolean putFloatForUser(ContentResolver cr, String name, float value,
+            float userHandle) {
+        return putFloat(cr, name, value);
+    }
+
+    @Implementation
+    public static float getFloatForUser(ContentResolver cr, String name, float def, int userHandle) {
+        return getFloat(cr, name, def);
+    }
+
+    @Implementation
+    public static float getFloat(ContentResolver resolver, String name, float defaultValue) {
+        Float value = (Float) mValueMap.get(name);
+        return value == null ? defaultValue : value;
+    }
+
     public static void clear() {
         mValueMap.clear();
     }
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 0000000000000000000000000000000000000000..e50a7692f474ae3701f9a6de3103f69cc4fc45a1
--- /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/testutils/shadow/ShadowUserManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
index c67ad36f93c4d975b83ac99d1994e7d9e531f4df..860ee112a39b5f0fc5dd1b4c1dd097c84d949005 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
@@ -16,20 +16,54 @@
 
 package com.android.settings.testutils.shadow;
 
+import android.annotation.UserIdInt;
 import android.content.Context;
+import android.content.pm.UserInfo;
 import android.os.UserManager;
+import android.util.SparseArray;
 
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.internal.ShadowExtractor;
+
+import java.util.Collections;
+import java.util.List;
 
 /**
  * This class provides the API 24 implementation of UserManager.get(Context).
  */
 @Implements(UserManager.class)
-public class ShadowUserManager {
+public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager {
+
+    private SparseArray<UserInfo> mUserInfos = new SparseArray<>();
+
+    public void setUserInfo(int userHandle, UserInfo userInfo) {
+        mUserInfos.put(userHandle, userInfo);
+    }
+
+    @Implementation
+    public UserInfo getUserInfo(int userHandle) {
+        return mUserInfos.get(userHandle);
+    }
+
+    @Implementation
+    public List<UserInfo> getProfiles(@UserIdInt int userHandle) {
+        return Collections.emptyList();
+    }
+
+    @Implementation
+    public int getCredentialOwnerProfile(@UserIdInt int userHandle) {
+        return userHandle;
+    }
 
     @Implementation
     public static UserManager get(Context context) {
         return (UserManager) context.getSystemService(Context.USER_SERVICE);
     }
+
+    public static ShadowUserManager getShadow() {
+        return (ShadowUserManager) ShadowExtractor.extract(
+                RuntimeEnvironment.application.getSystemService(UserManager.class));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
index 208fae389c94367aa3c9f656962dd95c96744526..8d0df1772b7d84c9db7f795d1948ed32d8ca2880 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.testutils.shadow;
 
+import android.content.ComponentName;
 import android.content.Context;
 
 import com.android.settings.Utils;
@@ -28,7 +29,8 @@ import org.robolectric.annotation.Implements;
 public class ShadowUtils {
 
     private static IFingerprintManager sFingerprintManager = null;
-    private static boolean sIsCarrierDemoUser;
+    private static boolean sIsDemoUser;
+    private static ComponentName sDeviceOwnerComponentName;
 
     @Implementation
     public static int enforceSameOwner(Context context, int userId) {
@@ -46,7 +48,7 @@ public class ShadowUtils {
 
     public static void reset() {
         sFingerprintManager = null;
-        sIsCarrierDemoUser = false;
+        sIsDemoUser = false;
     }
 
     @Implementation
@@ -54,12 +56,21 @@ public class ShadowUtils {
         return true;
     }
 
-    public static void setIsCarrierDemoUser(boolean isCarrierDemoUser) {
-        sIsCarrierDemoUser = isCarrierDemoUser;
+    public static void setIsDemoUser(boolean isDemoUser) {
+        sIsDemoUser = isDemoUser;
     }
 
     @Implementation
-    public static boolean isCarrierDemoUser(Context context) {
-        return sIsCarrierDemoUser;
+    public static boolean isDemoUser(Context context) {
+        return sIsDemoUser;
+    }
+
+    public static void setDeviceOwnerComponent(ComponentName componentName) {
+        sDeviceOwnerComponentName = componentName;
+    }
+
+    @Implementation
+    public static ComponentName getDeviceOwnerComponent(Context context) {
+        return sDeviceOwnerComponentName;
     }
 }
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 4267ed18f8f8088871cc39c4b4f5fe2f4cc7ee96..0000000000000000000000000000000000000000
--- 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/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index cd40dbc98e0fff4064c263f7fa4deb81f08dc830..e5354456edbbb6df1384386d7e4d6988c159a312 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;
@@ -44,6 +30,8 @@ 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 org.robolectric.util.ReflectionHelpers;
 
 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 @@ public class WebViewAppPickerTest {
     @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 @@ public class WebViewAppPickerTest {
         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/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..be50d77eb8d36e2ec69b016d28d59ac6abc42f51
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.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.widget;
+
+
+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;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.List;
+
+@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;
+    private View mView;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mActivity.getActionBar()).thenReturn(mActionBar);
+        mView = new View(RuntimeEnvironment.application);
+        mLifecycle = new Lifecycle();
+    }
+
+    @Test
+    public void attachToRecyclerView_shouldAddScrollWatcherAndUpdateActionBar() {
+        when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
+
+        ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
+
+        verify(mActionBar).setElevation(ActionBarShadowController.ELEVATION_LOW);
+    }
+
+    @Test
+    public void attachToRecyclerView_customViewAsActionBar_shouldUpdateElevationOnScroll() {
+        // Setup
+        mView.setElevation(50);
+        when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
+        final ActionBarShadowController controller =
+                ActionBarShadowController.attachToRecyclerView(mView, mLifecycle, mRecyclerView);
+        assertThat(mView.getElevation()).isEqualTo(ActionBarShadowController.ELEVATION_LOW);
+
+        // Scroll
+        when(mRecyclerView.canScrollVertically(-1)).thenReturn(true);
+        controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
+        assertThat(mView.getElevation()).isEqualTo(ActionBarShadowController.ELEVATION_HIGH);
+    }
+
+    @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/applications/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
similarity index 54%
rename from tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
rename to tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index 26e462970a649b64c5c8c5ba92cd04bdc1e2a041..4294dcf11c588d05b86f791e1d09b58702a90432 100644
--- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -14,17 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.applications;
+package com.android.settings.widget;
 
 
-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;
@@ -40,9 +32,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import com.android.internal.logging.nano.MetricsProto;
 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.settings.testutils.SettingsRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -53,9 +48,17 @@ 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 AppHeaderControllerTest {
+public class EntityHeaderControllerTest {
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
@@ -67,13 +70,16 @@ public class AppHeaderControllerTest {
     private Context mShadowContext;
     private LayoutInflater mLayoutInflater;
     private PackageInfo mInfo;
-    private AppHeaderController mController;
-
+    private EntityHeaderController mController;
+    private FakeFeatureFactory mFeatureFactory;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mFeatureFactory = 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();
@@ -82,7 +88,7 @@ public class AppHeaderControllerTest {
 
     @Test
     public void testBuildView_constructedWithoutView_shouldCreateNewView() {
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
         View view = mController.done(mActivity);
 
         assertThat(view).isNotNull();
@@ -90,7 +96,7 @@ public class AppHeaderControllerTest {
 
     @Test
     public void testBuildView_withContext_shouldBuildPreference() {
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
         Preference preference = mController.done(mActivity, mShadowContext);
 
         assertThat(preference instanceof LayoutPreference).isTrue();
@@ -98,8 +104,8 @@ public class AppHeaderControllerTest {
 
     @Test
     public void testBuildView_constructedWithView_shouldReturnSameView() {
-        View inputView = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        mController = new AppHeaderController(mShadowContext, mFragment, inputView);
+        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);
@@ -108,11 +114,12 @@ public class AppHeaderControllerTest {
     @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);
+        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 = new AppHeaderController(mShadowContext, mFragment, appHeader);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
         mController.setLabel(testString);
         mController.setSummary(testString);
         mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
@@ -129,119 +136,150 @@ public class AppHeaderControllerTest {
         info.activityInfo.packageName = "123";
         info.activityInfo.name = "321";
         final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
+                .inflate(R.layout.settings_entity_header, null /* root */);
+        when(mActivity.getApplicationContext()).thenReturn(mContext);
         when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
                 .thenReturn(info);
 
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
         mController.setButtonActions(
-                AppHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                AppHeaderController.ActionType.ACTION_NONE);
+                EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
+                EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
                 .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
         try {
-            appLinks.findViewById(R.id.left_button).performClick();
+            appLinks.findViewById(android.R.id.button1).performClick();
         } catch (Exception e) {
             // Ignore exception because the launching intent is fake.
         }
+        verify(mFeatureFactory.metricsFeatureProvider).actionWithSource(mContext,
+                MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+                MetricsProto.MetricsEvent.ACTION_OPEN_APP_SETTING);
         verify(mFragment).startActivity(any(Intent.class));
     }
 
     @Test
     public void bindButton_noAppPref_shouldNotShowButton() {
         final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
+                .inflate(R.layout.settings_entity_header, null /* root */);
         when(mContext.getPackageManager().resolveActivity(any(Intent.class), anyInt()))
                 .thenReturn(null);
 
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
         mController.setButtonActions(
-                AppHeaderController.ActionType.ACTION_APP_PREFERENCE,
-                AppHeaderController.ActionType.ACTION_NONE);
+                EntityHeaderController.ActionType.ACTION_APP_PREFERENCE,
+                EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
                 .isEqualTo(View.GONE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
     }
 
     @Test
     public void bindButton_noAppInfo_shouldNotShowButton() {
         final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
+                .inflate(R.layout.settings_entity_header, null /* root */);
 
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
         mController.setPackageName(null)
                 .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NONE);
+                        EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
                 .isEqualTo(View.GONE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
     }
 
     @Test
     public void bindButton_hasAppInfo_shouldShowButton() {
         final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
+                .inflate(R.layout.settings_entity_header, null /* root */);
         when(mFragment.getActivity()).thenReturn(mock(Activity.class));
 
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
         mController.setPackageName("123")
                 .setUid(UserHandle.USER_SYSTEM)
                 .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
+                        EntityHeaderController.ActionType.ACTION_APP_INFO,
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
                 .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
     }
 
     @Test
     public void bindButton_hasAppInfo_shouldHaveContentDescription() {
         final View appLinks = mLayoutInflater
-                .inflate(R.layout.app_details, null /* root */);
+                .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 = new AppHeaderController(mContext, mFragment, appLinks);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
         mController.setPackageName("123")
                 .setUid(UserHandle.USER_SYSTEM)
                 .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_APP_INFO,
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE);
+                        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);
+    }
 
-        assertThat(appLinks.findViewById(R.id.left_button).getContentDescription())
-                .isEqualTo("App Info");
+    @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.app_details, null /* root */);
+                .inflate(R.layout.settings_entity_header, null /* root */);
 
-        mController = new AppHeaderController(mContext, mFragment, appLinks);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, appLinks);
         mController.setAppNotifPrefIntent(new Intent())
                 .setButtonActions(
-                        AppHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
-                        AppHeaderController.ActionType.ACTION_NONE);
+                        EntityHeaderController.ActionType.ACTION_NOTIF_PREFERENCE,
+                        EntityHeaderController.ActionType.ACTION_NONE);
         mController.done(mActivity);
 
-        assertThat(appLinks.findViewById(R.id.left_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button1).getVisibility())
                 .isEqualTo(View.VISIBLE);
-        assertThat(appLinks.findViewById(R.id.right_button).getVisibility())
+        assertThat(appLinks.findViewById(android.R.id.button2).getVisibility())
                 .isEqualTo(View.GONE);
     }
 
@@ -249,31 +287,35 @@ public class AppHeaderControllerTest {
     // 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);
+        final View header = mLayoutInflater.inflate(
+                R.layout.settings_entity_header, null /* root */);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, header);
         mController.done(mActivity);
-        assertThat(appHeader.findViewById(R.id.install_type).getVisibility())
+
+        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 appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */);
-        mController = new AppHeaderController(mContext, mFragment, appHeader);
+        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 = appHeader.findViewById(R.id.install_type);
+        TextView label = header.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())
+                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 = new AppHeaderController(mShadowContext, mFragment, null);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
         mController.styleActionBar(null);
 
         when(mActivity.getActionBar()).thenReturn(null);
@@ -286,7 +328,7 @@ public class AppHeaderControllerTest {
     public void styleActionBar_setElevationAndBackground() {
         final ActionBar actionBar = mActivity.getActionBar();
 
-        mController = new AppHeaderController(mShadowContext, mFragment, null);
+        mController = EntityHeaderController.newInstance(mActivity, mFragment, null);
         mController.styleActionBar(mActivity);
 
         verify(actionBar).setElevation(0);
@@ -297,7 +339,7 @@ public class AppHeaderControllerTest {
 
     @Test
     public void initAppHeaderController_appHeaderNull_useFragmentContext() {
-        mController = new AppHeaderController(mContext, mFragment, null);
+        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 0000000000000000000000000000000000000000..0d9a77bef5805e71c3ca9eab9f11ad70b70b6f2c
--- /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 058f16ceeee3ed82604b7d47cc922ebdb3d75f91..0000000000000000000000000000000000000000
--- 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.testutils.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 b944fe018d027f22b8ef95ef9c8b735b6291b5b2..0000000000000000000000000000000000000000
--- 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.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 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/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
index 98e5d607f79ca4c1e18eb8467442937aa0b693e3..e314ef362705fb7b0ecfd678b6ca944ea699a7b5 100644
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
@@ -16,12 +16,6 @@
 
 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;
@@ -30,7 +24,7 @@ import android.support.v7.preference.PreferenceScreen;
 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 org.robolectric.annotation.Config;
 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 @@ public class RadioButtonPickerFragmentTest {
     @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 class RadioButtonPickerFragmentTest {
     public void onAttach_userIsInitialized() {
         mFragment.onAttach((Context) mActivity);
 
-        verify(mActivity).getPackageManager();
         verify(mActivity).getSystemService(Context.USER_SERVICE);
     }
 
@@ -99,7 +99,7 @@ public class RadioButtonPickerFragmentTest {
         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/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5755015614299243367b3a4d05385b55027b2dc0
--- /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 c750573b04a028836c37906ab1ddebfa013484a3..2f42550b6e42951e985abe2b1e89a7a09235f229 100644
--- a/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SummaryUpdaterTest.java
@@ -24,7 +24,6 @@ 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;
@@ -33,7 +32,6 @@ import org.robolectric.annotation.Config;
 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/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
index eb6b8b7117028cdc7205b2159e34a801785dec06..b83a3e3f62884bd5d0e4694565742f0a451f6d25 100644
--- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
@@ -30,7 +30,7 @@ import android.support.v7.preference.Preference;
 
 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 6bd0d2980c526026e2be057676d6422f53ef3f9c..a76b82a1f148bbbe29846ce953b35e228d249372 100644
--- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
@@ -19,12 +19,12 @@ package com.android.settings.wifi;
 import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE;
 import static com.android.settings.wifi.UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY;
 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.verify;
 import static org.mockito.Mockito.when;
 
+import android.annotation.NonNull;
 import android.app.Activity;
 import android.app.Fragment;
 import android.content.ComponentName;
@@ -36,11 +36,13 @@ import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
+import com.android.settings.R;
+import com.android.settings.TestConfig;
 import com.android.settings.network.NetworkScoreManagerWrapper;
 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 com.google.common.collect.Lists;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,10 +53,14 @@ 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 UseOpenWifiPreferenceControllerTest {
-    private static ComponentName ENABLE_ACTIVITY_COMPONENT = new ComponentName("package", "activityClass");
+    private static ComponentName ENABLE_ACTIVITY_COMPONENT =
+            new ComponentName("package", "activityClass");
     private static NetworkScorerAppData APP_DATA =
             new NetworkScorerAppData(0, null, null, ENABLE_ACTIVITY_COMPONENT, null);
     private static NetworkScorerAppData APP_DATA_NO_ACTIVITY =
@@ -79,28 +85,45 @@ public class UseOpenWifiPreferenceControllerTest {
                 mContext, mFragment, mNetworkScoreManagerWrapper, mLifecycle);
     }
 
-    @Test
-    public void testIsAvailable_noScorer() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(null);
+    /**
+     * Sets the scorers.
+     * @param scorers list of scorers returned by {@link NetworkScoreManager#getAllValidScorers()}.
+     *                First scorer in the list is the active scorer.
+     */
+    private void setupScorers(@NonNull List<NetworkScorerAppData> scorers) {
+        when(mNetworkScoreManagerWrapper.getActiveScorerPackage()).thenReturn(
+                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+        when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(scorers);
+        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(scorers.get(0));
+    }
 
+    @Test
+    public void testIsAvailable_returnsFalseWhenNoScorerSet() {
         createController();
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
-    public void testIsAvailable_noEnableActivity() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA_NO_ACTIVITY);
-
+    public void testIsAvailable_returnsFalseWhenScorersNotSupported() {
+        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY));
         createController();
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
-    public void testIsAvailable_enableActivityExists() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
+    public void testIsAvailable_returnsTrueIfActiveScorerSupported() {
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        createController();
 
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testIsAvailable_returnsTrueIfNonActiveScorerSupported() {
+        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY, APP_DATA));
+        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA_NO_ACTIVITY);
         createController();
 
         assertThat(mController.isAvailable()).isTrue();
@@ -117,8 +140,6 @@ public class UseOpenWifiPreferenceControllerTest {
 
     @Test
     public void onPreferenceChange_notAvailable_shouldDoNothing() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA_NO_ACTIVITY);
-
         createController();
 
         final Preference pref = new Preference(mContext);
@@ -129,7 +150,7 @@ public class UseOpenWifiPreferenceControllerTest {
 
     @Test
     public void onPreferenceChange_matchingKeyAndAvailable_enableShouldStartEnableActivity() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         createController();
 
         final SwitchPreference pref = new SwitchPreference(mContext);
@@ -145,7 +166,7 @@ public class UseOpenWifiPreferenceControllerTest {
 
     @Test
     public void onPreferenceChange_matchingKeyAndAvailable_disableShouldUpdateSetting() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
                 ENABLE_ACTIVITY_COMPONENT.getPackageName());
 
@@ -161,6 +182,7 @@ public class UseOpenWifiPreferenceControllerTest {
 
     @Test
     public void onActivityResult_nonmatchingRequestCode_shouldDoNothing() {
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         createController();
 
         assertThat(mController.onActivityResult(234 /* requestCode */ , Activity.RESULT_OK))
@@ -171,6 +193,7 @@ public class UseOpenWifiPreferenceControllerTest {
 
     @Test
     public void onActivityResult_matchingRequestCode_nonOkResult_shouldDoNothing() {
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         createController();
 
         assertThat(mController
@@ -182,7 +205,7 @@ public class UseOpenWifiPreferenceControllerTest {
 
     @Test
     public void onActivityResult_matchingRequestCode_okResult_updatesSetting() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
         createController();
 
         assertThat(mController
@@ -193,8 +216,8 @@ public class UseOpenWifiPreferenceControllerTest {
     }
 
     @Test
-    public void updateState_preferenceSetCheckedAndSetVisibleWhenSettingsAreEnabled() {
-        when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(APP_DATA);
+    public void updateState_noEnableActivity_preferenceDisabled_summaryChanged() {
+        setupScorers(Lists.newArrayList(APP_DATA_NO_ACTIVITY));
         createController();
 
         final SwitchPreference preference = mock(SwitchPreference.class);
@@ -203,19 +226,39 @@ public class UseOpenWifiPreferenceControllerTest {
 
         mController.updateState(preference);
 
-        verify(preference).setVisible(true);
-        verify(preference).setChecked(true);
+        verify(preference).setChecked(false);
+        verify(preference).setSummary(
+                R.string.use_open_wifi_automatically_summary_scorer_unsupported_disabled);
     }
 
     @Test
-    public void updateState_preferenceSetCheckedAndSetVisibleWhenSettingsAreDisabled() {
-        final SwitchPreference preference = mock(SwitchPreference.class);
-        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE, "");
+    public void updateState_noScorer_preferenceDisabled_summaryChanged() {
+        when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(new ArrayList<>());
         createController();
 
+        final SwitchPreference preference = mock(SwitchPreference.class);
+        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
+                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+
         mController.updateState(preference);
 
-        verify(preference).setVisible(false);
         verify(preference).setChecked(false);
+        verify(preference).setSummary(
+                R.string.use_open_wifi_automatically_summary_scoring_disabled);
+    }
+
+    @Test
+    public void updateState_enableActivityExists_preferenceEnabled() {
+        setupScorers(Lists.newArrayList(APP_DATA, APP_DATA_NO_ACTIVITY));
+        createController();
+
+        final SwitchPreference preference = mock(SwitchPreference.class);
+        Settings.Global.putString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE,
+                ENABLE_ACTIVITY_COMPONENT.getPackageName());
+
+        mController.updateState(preference);
+
+        verify(preference).setChecked(true);
+        verify(preference).setSummary(R.string.use_open_wifi_automatically_summary);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index e7027b09d57bf068d3329c612dd2fcf99c64191c..b45ea1edaed943272668e931975aa22f31b47dfd 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -44,10 +44,14 @@ import static org.mockito.Mockito.when;
         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 @@ public class WifiConfigControllerTest {
         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 @@ public class WifiConfigControllerTest {
         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 @@ public class WifiConfigControllerTest {
         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/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
index 4ce4038c91163f625372f874aff0892c628db2d3..1650816188807312af376a681872cb4ebfb6d865 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
@@ -25,7 +25,7 @@ import android.support.v7.preference.PreferenceScreen;
 
 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 6148fd29ff1705da65e2526fb5f8ffd336a9ff6c..307cccbfd0ba14d7433f7176340c9aadef667810 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
@@ -41,7 +41,6 @@ import org.robolectric.annotation.Config;
 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/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 84942bfc2944bb4479bba29c62a39cbd3a0b7a0f..8be686e64ea2dc3f0fce07e64fa82384ec0db960 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
@@ -23,6 +23,7 @@ import static android.provider.Settings.Global.WIFI_WAKEUP_ENABLED;
 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;
 
 import android.content.Context;
 import android.provider.Settings;
@@ -30,15 +31,17 @@ import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.network.NetworkScoreManagerWrapper;
 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;
 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;
@@ -50,17 +53,23 @@ import org.robolectric.annotation.Config;
         shadows = { SettingsShadowResources.class })
 public class WifiWakeupPreferenceControllerTest {
 
+    private static final String TEST_SCORER_PACKAGE_NAME = "Test Scorer";
+
     private Context mContext;
+    @Mock
+    private NetworkScoreManagerWrapper mNetworkScorer;
     private WifiWakeupPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
-        mController = new WifiWakeupPreferenceController(mContext, mock(Lifecycle.class));
+        mController = new WifiWakeupPreferenceController(
+                mContext, mock(Lifecycle.class), mNetworkScorer);
         Settings.System.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1);
         SettingsShadowResources.overrideResource(
                 com.android.internal.R.integer.config_wifi_wakeup_available, 0);
+        when(mNetworkScorer.getActiveScorerPackage()).thenReturn(TEST_SCORER_PACKAGE_NAME);
     }
 
     @After
@@ -145,4 +154,18 @@ public class WifiWakeupPreferenceControllerTest {
         verify(preference).setEnabled(false);
         verify(preference).setSummary(R.string.wifi_wakeup_summary_scanning_disabled);
     }
+
+    @Test
+    public void updateState_preferenceSetUncheckedAndSetDisabledWhenScoringDisabled() {
+        final SwitchPreference preference = mock(SwitchPreference.class);
+        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
+        Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
+        when(mNetworkScorer.getActiveScorerPackage()).thenReturn(null);
+
+        mController.updateState(preference);
+
+        verify(preference).setChecked(true);
+        verify(preference).setEnabled(false);
+        verify(preference).setSummary(R.string.wifi_wakeup_summary_scoring_disabled);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
index e6a7b8c52836e40eedaf4fc6e815dfbe72768931..94cc46b946ff61d57063f3318d71cf95bdc2e40b 100644
--- a/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WpsPreferenceControllerTest.java
@@ -33,7 +33,7 @@ import android.support.v7.preference.PreferenceScreen;
 
 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/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index b731054e8b4061be47f15a7920cc70863f60a193..9c1e70c3de0dd25c6e5e0ab22e2770f6ba710d96 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,8 @@ package com.android.settings.wifi.details;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.inOrder;
@@ -51,16 +53,19 @@ import android.support.v7.preference.PreferenceScreen;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.ImageView;
 
 import com.android.internal.logging.nano.MetricsProto;
 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.core.instrumentation.MetricsFeatureProvider;
-import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
+import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.wifi.WifiDetailPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.wifi.AccessPoint;
 
 import org.junit.Before;
@@ -83,7 +88,8 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @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 WifiDetailPreferenceControllerTest {
 
     private static final int LEVEL = 1;
@@ -107,7 +113,12 @@ public class WifiDetailPreferenceControllerTest {
     @Mock private WifiManager mockWifiManager;
     @Mock private MetricsFeatureProvider mockMetricsFeatureProvider;
 
-    @Mock private Preference mockConnectionDetailPref;
+    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
+    private EntityHeaderController mockHeaderController;
+    @Mock (answer = Answers.RETURNS_DEEP_STUBS)
+    private LayoutPreference mockHeaderLayoutPreference;
+    @Mock private ImageView mockHeaderIcon;
+
     @Mock private LayoutPreference mockButtonsPref;
     @Mock private Button mockSignInButton;
     @Mock private WifiDetailPreference mockSignalStrengthPref;
@@ -199,7 +210,7 @@ public class WifiDetailPreferenceControllerTest {
         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);
@@ -213,6 +224,12 @@ public class WifiDetailPreferenceControllerTest {
 
         when(mockFragment.getActivity()).thenReturn(mockActivity);
 
+        ShadowEntityHeaderController.setUseMock(mockHeaderController);
+        // builder pattern
+        when(mockHeaderController.setRecyclerView(mockFragment.getListView(), mLifecycle))
+                .thenReturn(mockHeaderController);
+        when(mockHeaderController.setSummary(anyString())).thenReturn(mockHeaderController);
+
         setupMockedPreferenceScreen();
         mController = newWifiDetailPreferenceController();
     }
@@ -232,8 +249,11 @@ public class WifiDetailPreferenceControllerTest {
     private void setupMockedPreferenceScreen() {
         when(mockScreen.getPreferenceManager().getContext()).thenReturn(mContext);
 
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_CONNECTION_DETAIL_PREF))
-                .thenReturn(mockConnectionDetailPref);
+        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_HEADER))
+                .thenReturn(mockHeaderLayoutPreference);
+        when(mockHeaderLayoutPreference.findViewById(R.id.entity_header_icon))
+                .thenReturn(mockHeaderIcon);
+
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_BUTTONS_PREF))
                 .thenReturn(mockButtonsPref);
         when(mockButtonsPref.findViewById(R.id.forget_button))
@@ -302,7 +322,7 @@ public class WifiDetailPreferenceControllerTest {
         displayAndResume();
 
         verify(mockConnectivityManagerWrapper, times(1)).registerNetworkCallback(
-                any(NetworkRequest.class), mCallbackCaptor.capture(), any(Handler.class));
+                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
     }
 
     @Test
@@ -315,23 +335,33 @@ public class WifiDetailPreferenceControllerTest {
     }
 
     @Test
-    public void connectionDetailPref_shouldHaveIconSet() {
+    public void entityHeader_shouldHaveIconSet() {
         Drawable expectedIcon =
                 NetworkBadging.getWifiIcon(LEVEL, NetworkBadging.BADGING_NONE, mContext.getTheme());
 
         displayAndResume();
 
-        verify(mockConnectionDetailPref).setIcon(expectedIcon);
+        verify(mockHeaderController).setIcon(expectedIcon);
+    }
+
+    @Test
+    public void entityHeader_shouldHaveLabelSetToSsid() {
+        String label = "ssid";
+        when(mockAccessPoint.getSsidStr()).thenReturn(label);
+
+        displayAndResume();
+
+        verify(mockHeaderController).setLabel(label);
     }
 
     @Test
-    public void connectionDetailPref_shouldHaveTitleSet() {
+    public void entityHeader_shouldHaveSummarySet() {
         String summary = "summary";
         when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
 
         displayAndResume();
 
-        verify(mockConnectionDetailPref).setTitle(summary);
+        verify(mockHeaderController).setSummary(summary);
     }
 
     @Test
@@ -536,33 +566,33 @@ public class WifiDetailPreferenceControllerTest {
         String summary = "Connected, no Internet";
         when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
 
-        InOrder inOrder = inOrder(mockConnectionDetailPref);
+        InOrder inOrder = inOrder(mockHeaderController);
         displayAndResume();
-        inOrder.verify(mockConnectionDetailPref).setTitle(summary);
+        inOrder.verify(mockHeaderController).setSummary(summary);
 
         // Check that an irrelevant capability update does not update the access point summary, as
         // doing so could cause unnecessary jank...
         summary = "Connected";
         when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
         updateNetworkCapabilities(nc);
-        inOrder.verify(mockConnectionDetailPref, never()).setTitle(any());
+        inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
 
         // ... but that if the network validates, then we do refresh.
         nc.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
         updateNetworkCapabilities(nc);
-        inOrder.verify(mockConnectionDetailPref).setTitle(summary);
+        inOrder.verify(mockHeaderController).setSummary(summary);
 
         summary = "Connected, no Internet";
         when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
 
         // Another irrelevant update won't cause the UI to refresh...
         updateNetworkCapabilities(nc);
-        inOrder.verify(mockConnectionDetailPref, never()).setTitle(any());
+        inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
 
         // ... but if the network is no longer validated, then we display "connected, no Internet".
         nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
         updateNetworkCapabilities(nc);
-        inOrder.verify(mockConnectionDetailPref).setTitle(summary);
+        inOrder.verify(mockHeaderController).setSummary(summary);
     }
 
     @Test
@@ -719,6 +749,8 @@ public class WifiDetailPreferenceControllerTest {
         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 0000000000000000000000000000000000000000..dd2ef5259f24aded43664e88b3b4759759d0c021
--- /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 0000000000000000000000000000000000000000..62fd01f87751bd5bf31f3dd0cf4fcda956589e73
--- /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 ae4c246719119983681049f3e1c28eee5a99bca0..8946a5e1077711d34d15a21fde3b994c1be46702 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -32,7 +32,7 @@ import android.support.v7.preference.PreferenceScreen;
 
 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 80a5a7375954f9b666305e60a8ff5c086ddd84d2..b74c1e36ee589f8e59878c437bb3099c4ea07ee4 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/ChooseLockSettingsHelperTest.java b/tests/unit/src/com/android/settings/ChooseLockSettingsHelperTest.java
deleted file mode 100644
index 218a74ea7af56372f5d400b848d1ab1eca602e90..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/ChooseLockSettingsHelperTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.android.settings;
-
-
-import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.test.AndroidTestCase;
-
-import com.android.internal.widget.LockPatternUtils;
-
-import org.mockito.ArgumentCaptor;
-
-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";
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        System.setProperty(SYSTEM_PROPERTY_DEXMAKER_DEXCACHE, getContext().getCacheDir().getPath());
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        System.clearProperty(SYSTEM_PROPERTY_DEXMAKER_DEXCACHE);
-    }
-
-    public void testlaunchConfirmationActivityWithExternalAndChallenge() {
-
-        final int userId = UserHandle.myUserId();
-        final int request = 100;
-        final long challenge = 10000L;
-        {
-            // Test external == true
-            final boolean external = true;
-
-            final Activity mockActivity = getMockActivity();
-            ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(mockActivity);
-            helper.launchConfirmationActivityWithExternalAndChallenge(
-                    request, // request
-                    "title",
-                    "header",
-                    "description",
-                    external,
-                    challenge,
-                    userId
-            );
-            final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
-            verify(mockActivity, times(1)).startActivity(intentCaptor.capture());
-            Intent capturedIntent = getResultIntent(intentCaptor);
-
-            assertEquals(new ComponentName("com.android.settings",
-                            ConfirmLockPattern.InternalActivity.class.getName()),
-                    capturedIntent.getComponent());
-            assertFalse(capturedIntent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
-            assertTrue(capturedIntent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
-            assertEquals(challenge, capturedIntent.getLongExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
-            assertEquals(external,
-                    (capturedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
-            assertEquals(external, capturedIntent.getBooleanExtra(
-                    ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
-            assertEquals(external, capturedIntent.getBooleanExtra(
-                    ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
-            assertEquals(external, capturedIntent.getBooleanExtra(
-                    ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false));
-            assertEquals(external, capturedIntent.getBooleanExtra(
-                    ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false));
-        }
-
-        {
-            // Test external == false
-            final boolean external = false;
-
-            final Activity mockActivity = getMockActivity();
-            ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(mockActivity);
-            helper.launchConfirmationActivityWithExternalAndChallenge(
-                    request, // request
-                    "title",
-                    "header",
-                    "description",
-                    external,
-                    challenge,
-                    userId
-            );
-            final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
-            verify(mockActivity, times(1)).startActivityForResult(intentCaptor.capture(),
-                    eq(request));
-            Intent capturedIntent = getResultIntent(intentCaptor);
-
-
-            assertEquals(new ComponentName("com.android.settings",
-                            ConfirmLockPattern.InternalActivity.class.getName()),
-                    capturedIntent.getComponent());
-            assertFalse(capturedIntent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
-            assertTrue(capturedIntent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
-            assertEquals(challenge, capturedIntent.getLongExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
-            assertEquals(external,
-                    (capturedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
-            assertEquals(external, capturedIntent.getBooleanExtra(
-                    ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
-            assertEquals(external, capturedIntent.getBooleanExtra(
-                    ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
-            assertEquals(external, capturedIntent.getBooleanExtra(
-                    ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false));
-            assertEquals(external, capturedIntent.getBooleanExtra(
-                    ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, false));
-        }
-    }
-
-
-    private ChooseLockSettingsHelper getChooseLockSettingsHelper(Activity mockActivity) {
-        LockPatternUtils mockLockPatternUtils = mock(LockPatternUtils.class);
-        when(mockLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt()))
-                .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(mockActivity);
-        helper.mLockPatternUtils = mockLockPatternUtils;
-        return helper;
-    }
-
-    private Activity getMockActivity() {
-        Activity mockActivity = mock(Activity.class);
-        when(mockActivity.getSystemService(Context.USER_SERVICE))
-                .thenReturn(getContext().getSystemService(UserManager.class));
-        when(mockActivity.getContentResolver()).thenReturn(getContext().getContentResolver());
-        when(mockActivity.getIntent()).thenReturn(new Intent());
-        return mockActivity;
-    }
-
-
-
-    private static Intent getResultIntent(ArgumentCaptor<Intent> intentCaptor) {
-        List<Intent> capturedIntents = intentCaptor.getAllValues();
-        assertEquals(1, capturedIntents.size());
-        return capturedIntents.get(0);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java b/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
index 70087aea49fa863ca39340b3ca12ce62e9467f7a..b1d94d46a120de0566790d358762097b9c054762 100644
--- a/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
+++ b/tests/unit/src/com/android/settings/RegulatoryInfoDisplayActivityTest.java
@@ -16,35 +16,45 @@
 
 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.RootMatchers.isDialog;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static junit.framework.Assert.fail;
-
 import android.app.Instrumentation;
+import android.app.UiAutomation;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
+import android.graphics.Bitmap;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.RootMatchers.isDialog;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static junit.framework.Assert.fail;
+
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class RegulatoryInfoDisplayActivityTest {
+    private static final String TAG = "RegulatoryInfoTest";
 
     private Instrumentation mInstrumentation;
     private Intent mRegulatoryInfoIntent;
+    private UiAutomation mUiAutomation;
 
     @Before
     public void setUp() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         mRegulatoryInfoIntent = new Intent("android.settings.SHOW_REGULATORY_INFO")
                 .addCategory(Intent.CATEGORY_DEFAULT)
                 .setPackage(mInstrumentation.getTargetContext().getPackageName());
@@ -88,4 +98,55 @@ public class RegulatoryInfoDisplayActivityTest {
                 .check(matches(isDisplayed()));
     }
 
+    @Test
+    public void launchRegulatoryInfo_withInfoImage_shouldDisplay() throws IOException {
+        // TODO: Remove "setenforce 0" when selinux rules is updated to give read permission for
+        // regulatory info.
+        mUiAutomation.executeShellCommand("setenforce 0");
+
+        final boolean tempFileCreated = ensureRegulatoryInfoImageExists();
+        try {
+            final Context context = mInstrumentation.getTargetContext();
+            final boolean hasRegulatoryInfo = context.getResources()
+                    .getBoolean(R.bool.config_show_regulatory_info);
+
+            if (!hasRegulatoryInfo) {
+                return;
+            }
+            // Launch intent
+            mInstrumentation.startActivitySync(mRegulatoryInfoIntent);
+
+            onView(withId(R.id.regulatoryInfo))
+                    .inRoot(isDialog())
+                    .check(matches(isDisplayed()));
+        } finally {
+            if (tempFileCreated) {
+                final String filename =
+                        RegulatoryInfoDisplayActivity.getRegulatoryInfoImageFileName();
+                new File(filename).delete();
+                Log.d(TAG, "Deleting temp file " + filename);
+            }
+        }
+    }
+
+    /**
+     * Ensures regulatory label image exists on disk.
+     *
+     * @return true if a test image is created.
+     */
+    private boolean ensureRegulatoryInfoImageExists() throws IOException {
+        final String filename = RegulatoryInfoDisplayActivity.getRegulatoryInfoImageFileName();
+        if (new File(filename).exists()) {
+            return false;
+        }
+        Log.d(TAG, "Creating temp file " + filename);
+        final Bitmap bitmap = Bitmap.createBitmap(400 /* width */, 400 /* height */,
+                Bitmap.Config.ARGB_8888);
+        final FileOutputStream out = new FileOutputStream(filename);
+        bitmap.compress(Bitmap.CompressFormat.PNG, 100 /* quality */, out);
+        out.close();
+        return true;
+    }
+
+
 }
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 0000000000000000000000000000000000000000..5e5e143727fe8ff8c33dcdf240cc08497dbad9ab
--- /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 0000000000000000000000000000000000000000..e074966eecb0f71982fe08cbf6d0dc941ed5dad2
--- /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 83%
rename from tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
rename to tests/unit/src/com/android/settings/applications/ManageApplicationsUnitTest.java
index d20770155096c16385f39e7197e96c0b79bb77d8..ce8603bde9aa82fd8138a83c6a4ad3d188aecc68 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.ApplicationsState.CompoundFilter;
 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 =
@@ -112,4 +116,20 @@ public class ManageApplicationsTest {
 
         assertThat(composedFilter.filterApp(appEntry)).isTrue();
     }
+
+    @Test
+    public void getCompositeFilter_worksForLegacyPrivateSettings() throws Exception {
+        ApplicationsState.AppFilter filter =
+                ManageApplications.getCompositeFilter(
+                        ManageApplications.LIST_TYPE_STORAGE,
+                        ManageApplications.STORAGE_TYPE_LEGACY,
+                        "uuid");
+        final ApplicationInfo info = new ApplicationInfo();
+        info.volumeUuid = "uuid";
+        info.category = ApplicationInfo.CATEGORY_GAME;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = info;
+
+        assertThat(filter.filterApp(appEntry)).isTrue();
+    }
 }
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 96%
rename from tests/app/src/com/android/settings/dashboard/PreferenceThemeTest.java
rename to tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
index 22723a6b3e10c314a43c2e8458a521e438545568..16e309d1eb658232ce8c40bf760e8abec897d695 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 @@ public class PreferenceThemeTest {
     @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/dream/DreamSettingsLaunchTest.java b/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..497fa0a6d7a940f78d11528f9cca609039ae3f24
--- /dev/null
+++ b/tests/unit/src/com/android/settings/dream/DreamSettingsLaunchTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF 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.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.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class DreamSettingsLaunchTest {
+
+    @Test
+    public void launchFromIntent_doesNotCrash() {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        Intent intent = new Intent(Settings.ACTION_DREAM_SETTINGS);
+
+        context.startActivity(intent);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/unit/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
deleted file mode 100644
index 8afed185cb2791a7f5eb6bb9f8aa2d477a80887e..0000000000000000000000000000000000000000
--- a/tests/unit/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ /dev/null
@@ -1,109 +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.fingerprint;
-
-
-import static org.mockito.Mockito.doReturn;
-
-import android.app.KeyguardManager;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.test.ActivityUnitTestCase;
-import android.view.View;
-import android.widget.Button;
-
-import com.android.settings.R;
-
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-public class SetupFingerprintEnrollIntroductionTest
-        extends ActivityUnitTestCase<SetupFingerprintEnrollIntroduction> {
-
-    private TestContext mContext;
-
-    @Mock
-    private KeyguardManager mKeyguardManager;
-
-    private SetupFingerprintEnrollIntroduction mActivity;
-
-    public SetupFingerprintEnrollIntroductionTest() {
-        super(SetupFingerprintEnrollIntroduction.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        MockitoAnnotations.initMocks(this);
-        mContext = new TestContext(getInstrumentation().getTargetContext());
-        setActivityContext(mContext);
-
-        getInstrumentation().runOnMainSync(() -> {
-            final Intent intent = new Intent();
-            mActivity = startActivity(intent,
-                    null /* savedInstanceState */, null /* lastNonConfigurationInstance */);
-        });
-    }
-
-    public void testKeyguardNotSecure_shouldShowSkipDialog() {
-        doReturn(false).when(mKeyguardManager).isKeyguardSecure();
-
-        getInstrumentation().runOnMainSync(() -> {
-            getInstrumentation().callActivityOnCreate(mActivity, null);
-            getInstrumentation().callActivityOnResume(mActivity);
-
-            final Button skipButton =
-                    (Button) mActivity.findViewById(R.id.fingerprint_cancel_button);
-            assertEquals(View.VISIBLE, skipButton.getVisibility());
-            skipButton.performClick();
-        });
-
-        assertFalse(isFinishCalled());
-    }
-
-    public void testKeyguardSecure_shouldNotShowSkipDialog() {
-        doReturn(true).when(mKeyguardManager).isKeyguardSecure();
-
-        getInstrumentation().runOnMainSync(() -> {
-            getInstrumentation().callActivityOnCreate(mActivity, null);
-            getInstrumentation().callActivityOnResume(mActivity);
-
-            final Button skipButton =
-                    (Button) mActivity.findViewById(R.id.fingerprint_cancel_button);
-            assertEquals(View.VISIBLE, skipButton.getVisibility());
-            skipButton.performClick();
-        });
-
-        assertTrue(isFinishCalled());
-    }
-
-    public class TestContext extends ContextWrapper {
-
-        public TestContext(Context base) {
-            super(base);
-        }
-
-        @Override
-        public Object getSystemService(String name) {
-            if (Context.KEYGUARD_SERVICE.equals(name)) {
-                return mKeyguardManager;
-            }
-            return super.getSystemService(name);
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java b/tests/unit/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..8be3320a88d773a0a99e6c64d4337236a931d7c1
--- /dev/null
+++ b/tests/unit/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckActionTest.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.fuelgauge.anomaly.action;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import com.android.settings.fuelgauge.anomaly.Anomaly;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class LocationCheckActionTest {
+    private static final String PACKAGE_NAME = "com.android.chrome";
+
+    private Context mContext;
+    private LocationCheckAction mLocationCheckAction;
+    private Anomaly mAnomaly;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mLocationCheckAction = new LocationCheckAction(mContext);
+
+        mAnomaly = new Anomaly.Builder()
+                .setUid(getPackageUid(mContext, PACKAGE_NAME))
+                .setPackageName(PACKAGE_NAME)
+                .build();
+    }
+
+    @Test
+    public void testRevokeAndCheck() {
+        mLocationCheckAction.handlePositiveAction(mAnomaly, 0 /* metric key */);
+
+        assertThat(mLocationCheckAction.isActionActive(mAnomaly)).isFalse();
+    }
+
+    private int getPackageUid(Context context, String packageName) {
+        try {
+            return context.getPackageManager().getPackageUid(packageName,
+                    PackageManager.GET_META_DATA);
+        } catch (PackageManager.NameNotFoundException e) {
+            return -1;
+        }
+    }
+}
+
+
+
+
diff --git a/tests/unit/src/com/android/settings/search/SearchActivityTest.java b/tests/unit/src/com/android/settings/search/SearchActivityTest.java
index 26b097e72097a9b75515f9f8c64649ded9c71a80..8a7e3fef81db15cd5541a997048514901809b4cb 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.filters.SmallTest;
 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 3c464a764947414e3c786b6b5eec8e9eed5dedf5..cbd9546c2293df27ca42b040d8c249e0eff25b68 100644
--- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
+++ b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
@@ -22,6 +22,7 @@ import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -43,12 +44,14 @@ import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiSsid;
+import android.provider.Settings;
 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.TestAccessPointBuilder;
 import com.android.settingslib.wifi.WifiTracker;
 import com.android.settingslib.wifi.WifiTracker.WifiListener;
 import com.android.settingslib.wifi.WifiTrackerFactory;
@@ -66,26 +69,29 @@ import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
 public class WifiSettingsUiTest {
-
-    // TODO(b/37714546): Investigate why resource ids are not resolving correctly in the test apk,
-    // then remove this manual string entry
-    /** R.string.wifi_configure_settings_preference_title */
-    private static final String WIFI_PREFERENCES = "Wi\u2011Fi preferences";
-    /** R.string.wifi_saved_access_points_label */
-    private static final String SAVED_NETWORKS = "Saved networks";
-    /** R.string.wifi_empty_list_wifi_off */
-    private static final String WIFI_OFF_MESSAGE = "To see available networks, turn Wi\u2011Fi on.";
-    /** R.string.wifi_display_status_connected */
-    private static final String CONNECTED = "Connected";
-
     private static final String TEST_SSID = "\"Test Ssid\"";
     private static final String TEST_UNQUOTED_SSID = "Test Ssid";
     private static final String TEST_BSSID = "0a:08:5c:67:89:00";
     private static final int TEST_RSSI = 123;
     private static final int TEST_NETWORK_ID = 1;
 
-    @Mock private WifiTracker mWifiTracker;
-    @Mock private WifiManager mWifiManager;
+    // Keys used to lookup resources by name (see the resourceId/resourceString helper methods).
+    private static final String ID = "id";
+    private static final String STRING = "string";
+    private static final String WIFI_CONFIGURE_SETTINGS_PREFERENCE_TITLE =
+            "wifi_configure_settings_preference_title";
+    private static final String WIFI_SAVED_ACCESS_POINTS_LABEL = "wifi_saved_access_points_label";
+    private static final String WIFI_EMPTY_LIST_WIFI_OFF = "wifi_empty_list_wifi_off";
+    private static final String WIFI_DISPLAY_STATUS_CONNECTED = "wifi_display_status_connected";
+    private static final String WIFI_PASSWORD = "wifi_password";
+    private static final String WIFI_SHOW_PASSWORD = "wifi_show_password";
+    private static final String PASSWORD_LAYOUT = "password_layout";
+    private static final String PASSWORD = "password";
+
+    @Mock
+    private WifiTracker mWifiTracker;
+    @Mock
+    private WifiManager mWifiManager;
     private Context mContext;
     private WifiListener mWifiListener;
 
@@ -101,6 +107,21 @@ public class WifiSettingsUiTest {
         when(mWifiTracker.getManager()).thenReturn(mWifiManager);
     }
 
+    /**
+     * Helper to get around the problem that directly accessing settings resource id's from
+     * com.android.settings.R via R.(type).(name) (eg R.id.password or
+     * R.string.wifi_configure_settings_preference_title) may not work due to mismatched resource
+     * ids. See b/37714546 and b/63546650.
+     */
+    private int resourceId(String type, String name) {
+        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
+    }
+
+    /** Similar to {@link #resourceId}, but for accessing R.string.<name> values. */
+    private String resourceString(String name) {
+        return mContext.getResources().getString(resourceId(STRING, name));
+    }
+
     private void setupConnectedAccessPoint() {
         WifiConfiguration config = new WifiConfiguration();
         config.SSID = TEST_SSID;
@@ -120,14 +141,20 @@ public class WifiSettingsUiTest {
         assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
         assertThat(accessPoint.getNetworkInfo()).isNotNull();
         assertThat(accessPoint.isActive()).isTrue();
-        assertThat(accessPoint.getSettingsSummary()).isEqualTo(CONNECTED);
+        assertThat(accessPoint.getSettingsSummary()).isEqualTo(
+                resourceString(WIFI_DISPLAY_STATUS_CONNECTED));
 
         when(mWifiTracker.getAccessPoints()).thenReturn(
                 Lists.asList(accessPoint, new AccessPoint[]{}));
     }
 
-    private void launchActivity() {
-        mActivityRule.launchActivity(new Intent("android.settings.WIFI_SETTINGS"));
+    /** Launch the activity via an Intent with a String extra. */
+    private void launchActivity(String extraName, String extraValue) {
+        Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
+        if (extraName != null && extraValue != null) {
+            intent.putExtra(extraName, extraValue);
+        }
+        mActivityRule.launchActivity(intent);
 
         verify(mWifiTracker).getManager();
 
@@ -137,6 +164,11 @@ public class WifiSettingsUiTest {
         assertThat(mWifiListener).isNotNull();
     }
 
+    /** Helper to launch the activity with no extra. */
+    private void launchActivity() {
+        launchActivity(null, null);
+    }
+
     private void setWifiState(int wifiState) {
         when(mWifiManager.getWifiState()).thenReturn(wifiState);
         when(mWifiManager.isWifiEnabled()).thenReturn(wifiState == WifiManager.WIFI_STATE_ENABLED);
@@ -144,7 +176,7 @@ public class WifiSettingsUiTest {
 
     private void callOnWifiStateChanged(int state) {
         mActivityRule.getActivity().getMainThreadHandler()
-                .post( () -> mWifiListener.onWifiStateChanged(state) );
+                .post(() -> mWifiListener.onWifiStateChanged(state));
     }
 
     @Test
@@ -156,17 +188,30 @@ public class WifiSettingsUiTest {
     public void shouldShowWifiPreferences() {
         launchActivity();
 
-        onView(withText(WIFI_PREFERENCES)).check(matches(isDisplayed()));
+        onView(withText(resourceId(STRING, WIFI_CONFIGURE_SETTINGS_PREFERENCE_TITLE))).check(
+                matches(isDisplayed()));
     }
 
     @Test
-    public void noSavedNetworks_shouldNotShowSavedNetworksButton() {
+    public void noSavedNetworks_wifiEnabled_shouldNotShowSavedNetworksButton() {
         setWifiState(WifiManager.WIFI_STATE_ENABLED);
         when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
 
         launchActivity();
 
-        onView(withText(SAVED_NETWORKS)).check(matches(not(isDisplayed())));
+        onView(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL))).check(
+                matches(not(isDisplayed())));
+    }
+
+    @Test
+    public void noSavedNetworks_wifiDisabled_shouldNotShowSavedNetworksButton() {
+        setWifiState(WifiManager.WIFI_STATE_DISABLED);
+        when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
+
+        launchActivity();
+
+        onView(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL))).check(
+                doesNotExist());
     }
 
     @Test
@@ -176,7 +221,7 @@ public class WifiSettingsUiTest {
 
         launchActivity();
 
-        onView(allOf(withText(SAVED_NETWORKS),
+        onView(allOf(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL)),
                 withEffectiveVisibility(VISIBLE))).check(matches(isDisplayed()));
     }
 
@@ -187,7 +232,8 @@ public class WifiSettingsUiTest {
         launchActivity();
         callOnWifiStateChanged(WifiManager.WIFI_STATE_DISABLED);
 
-        onView(withText(startsWith(WIFI_OFF_MESSAGE))).check(matches(isDisplayed()));
+        onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
+                matches(isDisplayed()));
     }
 
     @Test
@@ -197,7 +243,8 @@ public class WifiSettingsUiTest {
         launchActivity();
         callOnWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
 
-        onView(withText(startsWith(WIFI_OFF_MESSAGE))).check(doesNotExist());
+        onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
+                doesNotExist());
     }
 
     @Test
@@ -208,7 +255,8 @@ public class WifiSettingsUiTest {
 
         launchActivity();
 
-        onView(withText(CONNECTED)).check(matches(isDisplayed()));
+        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
+                matches(isDisplayed()));
     }
 
     @Test
@@ -219,7 +267,8 @@ public class WifiSettingsUiTest {
 
         launchActivity();
 
-        onView(withText(CONNECTED)).check(matches(isDisplayed()));
+        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
+                matches(isDisplayed()));
         verify(mWifiTracker).forceUpdate();
 
         Activity activity = mActivityRule.getActivity();
@@ -229,4 +278,85 @@ public class WifiSettingsUiTest {
         getInstrumentation().callActivityOnStart(activity);
         verify(mWifiTracker, atMost(1)).forceUpdate();
     }
+
+    @Test
+    public void changingSecurityStateOnApShouldNotCauseMultipleListItems() {
+        setWifiState(WifiManager.WIFI_STATE_ENABLED);
+        TestAccessPointBuilder builder = new TestAccessPointBuilder(mContext)
+                .setSsid(TEST_SSID)
+                .setSecurity(AccessPoint.SECURITY_NONE)
+                .setRssi(TEST_RSSI);
+        AccessPoint open = builder.build();
+
+        builder.setSecurity(AccessPoint.SECURITY_EAP);
+        AccessPoint eap = builder.build();
+
+        builder.setSecurity(AccessPoint.SECURITY_WEP);
+        AccessPoint wep = builder.build();
+
+        // Return a different security state each time getAccessPoints is invoked
+        when(mWifiTracker.getAccessPoints())
+                .thenReturn(Lists.newArrayList(open))
+                .thenReturn(Lists.newArrayList(eap))
+                .thenReturn(Lists.newArrayList(wep));
+
+        launchActivity();
+
+        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
+
+        mWifiListener.onAccessPointsChanged();
+        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
+
+        mWifiListener.onAccessPointsChanged();
+        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void wrongPasswordSavedNetwork() {
+        setWifiState(WifiManager.WIFI_STATE_ENABLED);
+
+        // Set up an AccessPoint that is disabled due to incorrect password.
+        WifiConfiguration config = new WifiConfiguration();
+        config.SSID = TEST_SSID;
+        config.BSSID = TEST_BSSID;
+        config.networkId = TEST_NETWORK_ID;
+        config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
+
+        WifiConfiguration.NetworkSelectionStatus selectionStatus =
+                new WifiConfiguration.NetworkSelectionStatus();
+        selectionStatus.setNetworkSelectionDisableReason(
+                WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);
+        selectionStatus.setNetworkSelectionStatus(
+                WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_TEMPORARY_DISABLED);
+        config.setNetworkSelectionStatus(selectionStatus);
+
+        WifiInfo wifiInfo = new WifiInfo();
+        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_UNQUOTED_SSID));
+        wifiInfo.setBSSID(TEST_BSSID);
+        wifiInfo.setRssi(TEST_RSSI);
+        wifiInfo.setNetworkId(TEST_NETWORK_ID);
+        AccessPoint accessPoint = new AccessPoint(mContext, config);
+        accessPoint.update(config, wifiInfo, null);
+
+        // Make sure we've set up our access point correctly.
+        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
+        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
+        assertThat(accessPoint.isActive()).isFalse();
+        assertThat(accessPoint.getConfig()).isNotNull();
+        WifiConfiguration.NetworkSelectionStatus networkStatus =
+                accessPoint.getConfig().getNetworkSelectionStatus();
+        assertThat(networkStatus).isNotNull();
+        assertThat(networkStatus.isNetworkEnabled()).isFalse();
+        assertThat(networkStatus.getNetworkSelectionDisableReason()).isEqualTo(
+                WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);
+
+        when(mWifiTracker.getAccessPoints()).thenReturn(Lists.newArrayList(accessPoint));
+        launchActivity(WifiSettings.EXTRA_START_CONNECT_SSID, accessPoint.getSsidStr());
+
+        // Make sure that the password dialog is visible.
+        onView(withText(resourceId(STRING, WIFI_PASSWORD))).check(matches(isDisplayed()));
+        onView(withText(resourceId(STRING, WIFI_SHOW_PASSWORD))).check(matches(isDisplayed()));
+        onView(withId(resourceId(ID, PASSWORD_LAYOUT))).check(matches(isDisplayed()));
+        onView(withId(resourceId(ID, PASSWORD))).check(matches(isDisplayed()));
+    }
 }